[Treepkg-commits] r325 - trunk/treepkg

[scm-commit@wald.intevation.org]

Author: bricks
Date: 2010-06-01 17:11:30 +0200 (Tue, 01 Jun 2010)
New Revision: 325

Modified:
   trunk/treepkg/subversion.py
Log:
used full path (baseurl + subdir) for tag detection not only the first subdir
don't think there exists any disadvantages in this approach for current packagers


Modified: trunk/treepkg/subversion.py
===================================================================
--- trunk/treepkg/subversion.py	2010-05-31 12:16:04 UTC (rev 324)
+++ trunk/treepkg/subversion.py	2010-06-01 15:11:30 UTC (rev 325)
@@ -308,16 +308,7 @@
     which part of the tag is meant.
 
     The subdir also determines which SVN directory's revision number is
-    used.  Normally, just appending the subdir to the tag URL would be
-    enough for this, but the situation is more complex for
-    kdebase_workspace and kdebase_runtime, whose code comes from
-    different subdirectories of the kdebase-4.X-branch subdirectory (for
-    enterprise4 tags).  Here the revision number must be taken from
-    kdebase-4.X-branch, but the URL to use when exporting the sources,
-    must refer to e.g. kdebase-4.1-branch/kdebase_workspace.  To achieve
-    that, subdir may contain slashes to indicate subdirectories of
-    subdirectories, but only the first part of subdir (up to the first
-    slash) is used when determining the revision number.
+    used.
     """
 
     def __init__(self, url, pattern, subdir):
@@ -347,7 +338,7 @@
 
     def determine_revision(self, baseurl, subdir):
         urlrev = (None, None)
-        revision_url = baseurl + "/" + subdir.split("/")[0]
+        revision_url = baseurl + "/" + subdir
         try:
             revision = last_changed_revision(revision_url)
             urlrev = (baseurl + "/" + subdir, revision)