[kernel] r8382 - people/waldi/scripts/snapshot

[Bastian Blank]

Author: waldi
Date: Thu Mar 22 11:19:28 2007
New Revision: 8382

Modified:
   people/waldi/scripts/snapshot/package.py
Log:
snapshot/package.py: Don't expect to be called within base.


Modified: people/waldi/scripts/snapshot/package.py
==============================================================================
--- people/waldi/scripts/snapshot/package.py	(original)
+++ people/waldi/scripts/snapshot/package.py	Thu Mar 22 11:19:28 2007
@@ -144,13 +144,16 @@
     native = entry.get('native', False)
 
     checkout_dir = os.path.join(base, "checkout-" + path.replace('/', '_'))
+    gen_dir = os.path.join(base, 'gen')
+    out_dir = os.path.join(base, 'out')
     last_file = os.path.join(base, "last-" + path.replace('/', '_'))
+
     checkout_storage = repository_svn(checkout_dir, "%s/%s" % (entry['repository'], path))
     changelog_entry = debian_linux.Changelog(checkout_dir)[0]
     package_name = changelog_entry.source
     package_version = changelog_entry.version.upstream
     package = "%s-%s" % (package_name, package_version)
-    package_dir = "gen/%s" % package
+    package_dir = os.path.join(gen_dir, package)
     package_orig = "%s_%s.orig.tar.gz" % (package_name, package_version)
     package_orig_source = "%s/%s" % (entry['orig'], package_orig)
 
@@ -160,6 +163,7 @@
 
     last_revision = 0
     last_upstream = None
+    print last_file
     if os.path.exists(last_file):
         i = file(last_file).read().strip()
         last_revision, last_upstream = i.split()
@@ -168,8 +172,8 @@
     if revision <= last_revision:
         return
 
-    if not os.path.exists("out"):
-        os.makedirs("out" , 0755)
+    if not os.path.exists(out_dir):
+        os.makedirs(out_dir , 0755)
 
     version_upstream = changelog_entry.version.upstream
     version_debian = changelog_entry.version.debian
@@ -186,13 +190,13 @@
 
     if not native:
         try:
-            os.unlink("gen/%s" % package_orig)
+            os.unlink(os.path.join(gen_dir, package_orig))
         except OSError: pass
         try:
-            os.unlink("out/%s" % package_orig)
+            os.unlink(os.path.join(out_dir, package_orig))
         except OSError: pass
-        os.symlink(package_orig_source, "gen/%s" % package_orig)
-        os.symlink(package_orig_source, "out/%s" % package_orig)
+        os.symlink(package_orig_source, os.path.join(gen_dir, package_orig))
+        os.symlink(package_orig_source, os.path.join(out_dir, package_orig))
 
     changelog = "%s/debian/changelog" % package_dir
     changelog_text = file(changelog).read()
@@ -238,14 +242,16 @@
 
     for suffix in suffixes:
         prefix = '%s_%s-%s' % (package_name, package_version, version_debian)
-        os.link("gen/%s%s" % (prefix, suffix), "out/%s%s" % (prefix, suffix))
-        os.unlink("gen/%s%s" % (prefix, suffix))
+        gen = os.path.join(gen_dir, "%s%s" % (prefix, suffix))
+        out = os.path.join(out_dir, "%s%s" % (prefix, suffix))
+        os.link(gen, out)
+        os.unlink(gen)
 
     file(last_file, 'w').write("%d %s\n" % (revision, version_upstream))
 
     package_storage.remove()
 
-    spawnv_chdir(os.P_WAIT, 'dput', ['dput', entry['upload'], '%s_%s-%s_source.changes' % (package_name, package_version, version_debian)], "out")
+    spawnv_chdir(os.P_WAIT, 'dput', ['dput', entry['upload'], '%s_%s-%s_source.changes' % (package_name, package_version, version_debian)], out_dir)
 
 def main():
     config = Config(sys.argv[1])