← Back to branch summary

~keithsalisbury/mixxx/mixxx

« back to all changes in this revision

Viewing changes to mixxx/build/util.py

  • Committer: Keith Salisbury
  • Date: 2012-05-06 13:44:20 UTC
  • mfrom: (2994.1.100 mixxx-trunk)
  • Revision ID: keithsalisbury@gmail.com-20120506134420-8k1dqq10aqmx0ecq
merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
mixxx/build/util.py
12
12
    output_lines = os.popen("bzr info").read().splitlines()
13
13
 
14
14
    parent_matcher = re.compile(
15
 
        r'\s*parent branch: (bzr\+ssh|http)://bazaar.launchpad.net/(?P<owner>.*?)/(?P<project>.*?)/(?P<branch_name>.*?)/$')
 
15
        r'\s*parent branch: (bzr\+ssh|http)://bazaar.launchpad.net/(?P<owner>.*?)/(?P<project>.*?)/((?P<branch_name>.*?)/)?$')
16
16
    checkout_matcher = re.compile(
17
17
        r'\s*checkout of branch: (bzr\+ssh|http)://bazaar.launchpad.net/(?P<owner>.*?)/(?P<project>.*?)/((?P<branch_name>.*?)/)?$')
18
18