Changeset 19799

Show
Ignore:
Timestamp:
02/06/07 10:38:34 (2 years ago)
Author:
patrick
Message:

Fixed a bug where the current branch identifiers for the version strings
were not parsed correctly.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/branches/2.0/buildwin32.py

    r19794 r19799  
    423423 
    424424      version_re      = re.compile(r'((\d+)\.(\d+)\.(\d+)-(\d+))\s') 
    425       branch_re       = re.compile(r'BRANCH\s*=\s*([\w\d-]+)') 
     425      branch_re       = re.compile(r'BRANCH\s*=\s*(.+)') 
    426426      canon_name_re   = re.compile(r'CANON_NAME\s*=\s*(\S.+)') 
    427427      vernum_re       = re.compile(r'@VER_NUMBER@')