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

[Bastian Blank]

Author: waldi
Date: Wed Jan 17 22:16:02 2007
New Revision: 8197

Modified:
   people/waldi/scripts/snapshot/package.py
Log:
snapshot/package.py: Update.


Modified: people/waldi/scripts/snapshot/package.py
==============================================================================
--- people/waldi/scripts/snapshot/package.py	(original)
+++ people/waldi/scripts/snapshot/package.py	Wed Jan 17 22:16:02 2007
@@ -131,22 +131,17 @@
     def exec_svn(self, args):
         self._exec("/usr/bin/svn", args)
 
-def package(path, dist, native = False, package_orig_expect = None):
+def package(path, dist, native = False):
     checkout_dir = "checkout-" + path.replace('/', '_')
     last_file = "last-" + path.replace('/', '_')
     checkout_storage = repository_svn(checkout_dir, path)
     changelog_entry = debian_linux.read_changelog(checkout_dir)[0]
     package_name = changelog_entry['Source']
-    package_version = changelog_entry['Version']['source_upstream']
+    package_version = changelog_entry['Version']['upstream']
     package = "%s-%s" % (package_name, package_version)
     package_dir = "gen/%s" % package
-    if package_orig_expect is not None:
-        package_orig = '%s-%s' % (package_orig_expect, package_version)
-    else:
-        package_orig = package
-    package_orig_tar = "%s_%s.orig.tar.gz" % (package_name, package_version)
+    package_orig = "%s_%s.orig.tar.gz" % (package_name, package_version)
     package_orig_source = "%s/%s" % (orig_base, package_orig)
-    package_orig_source_tar = "%s/%s" % (orig_base, package_orig_tar)
 
     for line in os.popen("svn info %s" % checkout_dir, 'r').read().split('\n'):
         if line.startswith('Last Changed Rev: '):
@@ -179,19 +174,14 @@
     package_storage = checkout_storage.copy(package_dir, storage)
 
     if not native:
-        package_storage._mk("gen/orig")
-        try:
-            os.unlink("gen/orig/%s" % package_orig)
-        except OSError: pass
         try:
-            os.unlink("gen/%s" % package_orig_tar)
+            os.unlink("gen//%s" % package_orig)
         except OSError: pass
         try:
             os.unlink("out/%s" % package_orig_tar)
         except OSError: pass
-        os.symlink(package_orig_source, "gen/orig/%s" % package_orig)
-        os.symlink(package_orig_source_tar, "gen/%s" % package_orig_tar)
-        os.symlink(package_orig_source_tar, "out/%s" % package_orig_tar)
+        os.symlink(package_orig_source, "gen/%s" % package_orig)
+        os.symlink(package_orig_source, "out/%s" % package_orig)
 
     changelog = "%s/debian/changelog" % package_dir
     changelog_text = file(changelog).read()
@@ -246,7 +236,6 @@
 def main():
     maps = {
         "dists/sid/linux-2.6": {'dist': "kernel-dists-sid"},
-        "dists/sid/linux-2.6.16": {'dist': "kernel-dists-sid", 'package_orig_expect':'linux-2.6'},
         "dists/trunk/linux-2.6": {'dist': "kernel-dists-trunk"},
         "dists/trunk/linux-kbuild-2.6": {'dist': "kernel-dists-trunk"},
         "dists/trunk/linux-modules-extra-2.6": {'dist': "kernel-dists-trunk", 'native': True},