~matsubara/maas/remove-network-config-hack

« back to all changes in this revision

Viewing changes to utils.py

  • Committer: Raphael Badin
  • Date: 2014-02-07 16:31:45 UTC
  • mfrom: (232.1.1 qa-minus-dfsg)
  • Revision ID: raphael.badin@canonical.com-20140207163145-mmq35l5oz0w92nxm
[r=matsubara][bug=][author=rvb] '+dfsg' is optional. The new package version doesn't contain '+dfsg' anymore.

Show diffs side-by-side

added added

removed removed

Lines of Context:
160
160
    # Try to match all the known formats in sequence.
161
161
    versions_re = [
162
162
        # Daily ppa format (format 1).
163
 
        '\d*\+bzr\d*\+dfsg-0\+(\d*)\+',
 
163
        '\d*\+bzr\d*\[+dfsg]?-0\+(\d*)\+',
164
164
        # Daily ppa format (format 2).
165
 
        '\d*\+bzr\d*\+dfsg\+(\d*)\+',
 
165
        '\d*\+bzr\d*\[+dfsg]?\+(\d*)\+',
166
166
        # Release format.
167
 
        '\d*\+bzr(\d*)\+dfsg',
 
167
        '\d*\+bzr(\d*)\[+dfsg]?',
168
168
    ]
169
169
    for version_re in versions_re:
170
170
        match = re.search(version_re, version)