Changeset 187 in tailor

Timestamp:

12/27/04 21:30:08 (8 years ago)

Author:

lele@…

Hash name:

20041227203008-97f81-114a1e6d6d5ee122b2e6389e2ea9b18ef7df39ab

Message:

Save also the subdir in the tailor.info file

Files:

• vcpx/tailor.py (modified) (2 diffs)
• README (modified) (1 diff)

vcpx/tailor.py

@@ -210 +210 @@
         print >>f, self.upstream_repos
         print >>f, self.upstream_revision
+        print >>f, self.subdir
         f.close()
 
@@ -227 +228 @@
         statusfilename = join(self.root, STATUS_FILENAME)
         f = open(statusfilename)
-        (srck, dstk,
-         module, upstream_repos, upstream_revision) = f.readlines()
-        self.source_kind = srck[:-1]
-        self.target_kind = dstk[:-1]
-        self.module = module[:-1]
-        self.subdir = split(self.module)[1]
-        self.upstream_repos = upstream_repos[:-1]
-        self.upstream_revision = upstream_revision[:-1]
+        self.source_kind = f.readline()[:-1]
+        self.target_kind = f.readline()[:-1]
+        self.module = f.readline()[:-1]
+        self.upstream_repos = f.readline()[:-1]
+        self.upstream_revision = f.readline()[:-1]
+        subdir = f.readline()
+        if subdir:
+            self.subdir = subdir[:-1]
+        else:
+            self.subdir = split(self.module)[1]            
         f.close()
 

README

@@ -86 +86 @@
 4. The URL of the upstream repository (that may not be an URL, for cvs...)
 5. The current revision, from the upstream point of view, of the sources
+6. The subdirectory that contains the checked out upstream tree,
+   either that given with with the `--subdir` option or computed
+   taking the last part of the module name. 
 
 This is everything tailor needs, to be able to keep going from where it