[Treepkg-commits] r206 - trunk/recipes/kde_enterprise_3_5

[scm-commit@wald.intevation.org]

Author: bh
Date: 2009-08-03 20:57:27 +0200 (Mon, 03 Aug 2009)
New Revision: 206

Modified:
   trunk/recipes/kde_enterprise_3_5/base.py
Log:
When building a tagged revision, make sure to explicitly use the
revision number when exporting the sources to avoid a race.  The
repository might change between detection of the tag and the export.


Modified: trunk/recipes/kde_enterprise_3_5/base.py
===================================================================
--- trunk/recipes/kde_enterprise_3_5/base.py	2009-05-07 18:44:36 UTC (rev 205)
+++ trunk/recipes/kde_enterprise_3_5/base.py	2009-08-03 18:57:27 UTC (rev 206)
@@ -68,6 +68,7 @@
                 logging.info("Revision %s has not been packaged yet",
                              revision)
                 self.tag_url = tag_url
+                self.tag_revision = tag_revision
                 return self.revision_packager_cls(self, tag=tag_url, *revision)
             else:
                 logging.info("Revision %s has already been packaged.",
@@ -77,11 +78,11 @@
 
     def export_sources(self, to_dir):
         if self.tag_url is not None:
-            self.export_tag(self.tag_url, to_dir)
+            self.export_tag(self.tag_url, to_dir, revision=self.tag_revision)
         else:
             super(BasePackageTrack, self).export_sources(to_dir)
 
-    def export_tag(self, tag_url, to_dir):
+    def export_tag(self, tag_url, to_dir, revision=None):
         logging.info("Exporting sources from %s to %r",
                      tag_url, to_dir)
-        treepkg.subversion.export(tag_url, to_dir)
+        treepkg.subversion.export(tag_url, to_dir, revision=revision)