bk commit into 4.1 tree (lenz:1.2114)

[lenz]

Below is the list of changes that have just been committed into a local
4.1 repository of lenz. When lenz does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2114 05/03/15 12:27:44 lenz@stripped +1 -0
  - Build fix for Do-solaris-pkg: fixed package name matching regex to be satisfied with 
    "mysql-pro-gpl-cert" packages as well (thanks to Kent for the suggestion)

  Build-tools/Do-solaris-pkg
    1.5 05/03/15 12:27:40 lenz@stripped +1 -1
    - fixed package name matching regex to be satisfied with "mysql-pro-gpl-cert" packages as well
      (thanks to Kent for the suggestion)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	lenz
# Host:	metis.lenznet
# Root:	/space/my/mysql-4.1-build

--- 1.4/Build-tools/Do-solaris-pkg	2005-03-11 02:40:39 +01:00
+++ 1.5/Build-tools/Do-solaris-pkg	2005-03-15 12:27:40 +01:00
@@ -57,7 +57,7 @@
 # First get some info
 $fullname =~ s,/+$,,;             # Remove ending slash if any
 
-$fullname =~ /^((mysql)-\w+-?\w+?)-([\d\.]+\w?)-.+$/
+$fullname =~ /^((mysql)(?:-\w+){1,3})-([\d\.]+\w?)-.+$/
   or die "This name is not what I expected - \"$fullname\"";
 
 $default{"name"}= $2;