Mercurial > gub

changeset 2505:b59a6e64f612

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Check for and ignore vc_branch for lilypond only.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Wed, 25 Oct 2006 07:14:40 +0100
parents 118f345daf44
children 26438226e986
files lib/gup.py
diffstat 1 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/lib/gup.py	Wed Oct 25 07:14:10 2006 +0100
+++ b/lib/gup.py	Wed Oct 25 07:14:40 2006 +0100
@@ -198,15 +198,12 @@
         str = open (package_hdr).read ()
 
         d = pickle.loads (str)
-        # Huh, what's the idea here?  We're comparing LILYPOND_BRANCH
-        # with a package's branch ie, `lilypond_2_8' != ghostscript's
-        # `HEAD'.  Yes, that fails.
-        if (d['vc_branch']
+        if (d['basename'] == 'lilypond'
             and branch != d['vc_branch']):
             vc_branch = d['vc_branch']
-            print 'NOT ignoring header: ' + package_hdr
+            print 'ignoring header: ' + package_hdr
             print 'branch: %(branch)s, vc_branch: %(vc_branch)s' % locals ()
-            #return
+            return
 
         name = d['split_name']
         if self._package_dict_db.has_key (name):