[Collab-qa-commits] r2318 - udd/udd

[Andreas Tille]

Author: tille
Date: 2012-05-12 17:35:36 +0000 (Sat, 12 May 2012)
New Revision: 2318

Modified:
   udd/udd/blends_prospective_gatherer.py
Log:
Be tolerant if trunk/ dir is ommited in Vcs fields


Modified: udd/udd/blends_prospective_gatherer.py
===================================================================
--- udd/udd/blends_prospective_gatherer.py	2012-05-12 17:22:30 UTC (rev 2317)
+++ udd/udd/blends_prospective_gatherer.py	2012-05-12 17:35:36 UTC (rev 2318)
@@ -255,7 +255,9 @@
     	          if tmp_src == sprosp['vcs_browser']:
     	            self.log.error("%s - Wrong Vcs-Browser: Use 'http:' instead of 'git:' in '%s' ('%s')." % (source, src['Vcs-Browser'], sprosp['vcs_browser']))
     	          else:
-                    self.log.warning("%s - Differing Vcs-Browser:  Obtained from Vcs-Browser='%s' <-> control has '%s'." % (source, sprosp['vcs_browser'], src['Vcs-Browser']))
+                    tmp_prosp = re.sub('/trunk$', '', tmp_prosp) # sometimes the trailing trunk/ is forgotten which is no real problem
+    	            if tmp_prosp != tmp_src:
+                      self.log.warning("%s - Differing Vcs-Browser:  Obtained from Vcs-Browser='%s' <-> control has '%s'." % (source, sprosp['vcs_browser'], src['Vcs-Browser']))
             else:
     	      self.log.debug("Control file for source '%s' is lacking Vcs-Browser field" % (source))