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

[Bastian Blank]

Author: waldi
Date: Wed Jul  4 09:47:41 2007
New Revision: 9055

Log:
scripts/snapshot/package.py
- Adopt linux-2.6 changes.
- Use epoch correctly.


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

Modified: people/waldi/scripts/snapshot/package.py
==============================================================================
--- people/waldi/scripts/snapshot/package.py	(original)
+++ people/waldi/scripts/snapshot/package.py	Wed Jul  4 09:47:41 2007
@@ -17,24 +17,23 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 import os.path, shutil, sys, time
-import debian_linux.config
+import debian_linux.config, debian_linux.debian
 
 class Config(dict):
-    schema_item_boolean = debian_linux.config.schema_item_boolean
-    schema_item_list = debian_linux.config.schema_item_list
+    SchemaItemBoolean = debian_linux.config.SchemaItemBoolean
 
-    class schema_item_path(object):
+    class SchemaItemPath(object):
         def __call__(self, i):
             return os.path.expanduser(i.strip())
 
     schema = {  
-        'base': schema_item_path(),
-        'native': schema_item_boolean(),
-        'orig': schema_item_path(),
+        'base': SchemaItemPath(),
+        'native': SchemaItemBoolean(),
+        'orig': SchemaItemPath(),
     }   
 
     def __init__(self, config):
-        parser = debian_linux.config.config_parser(self.schema, [config])
+        parser = debian_linux.config.ConfigParser(self.schema, [config])
         for section in iter(parser):
             # TODO: don't split sections in parser
             self[section[0]] = parser[section]
@@ -149,7 +148,7 @@
     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]
+    changelog_entry = debian_linux.debian.Changelog(checkout_dir)[0]
     package_name = changelog_entry.source
     package_version = changelog_entry.version.upstream
     package = "%s-%s" % (package_name, package_version)
@@ -175,8 +174,7 @@
     if not os.path.exists(out_dir):
         os.makedirs(out_dir , 0755)
 
-    version_upstream = changelog_entry.version.upstream
-    version_debian = changelog_entry.version.debian
+    version = changelog_entry.version
     if changelog_entry.distribution in ('stable', 'testing', 'unstable', 'experimental'):
         version_debian_delemiter = ''
     elif changelog_entry.distribution in ('UNRELEASED',):
@@ -184,7 +182,7 @@
     else:
         raise "Unknown distribution"
 
-    version_debian += "%ssnapshot.%d" % (version_debian_delemiter, revision)
+    version.debian += "%ssnapshot.%d" % (version_debian_delemiter, revision)
 
     package_storage = checkout_storage.copy(package_dir, storage)
 
@@ -203,14 +201,14 @@
     os.unlink(changelog)
     f = file(changelog, "w")
     f.write("""\
-%s (%s-%s) %s; urgency=low
+%s (%s) %s; urgency=low
 
   * %s
 
  -- %s  %s
 
 """ % (
-        package_name, package_version, version_debian, entry['dist'],
+        package_name, version, entry['dist'],
         entry['changelog_text'], entry['changelog_maintainer'],
         time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()),
     )
@@ -228,7 +226,7 @@
     if sign:
         list.append('-k%s' % sign)
     if not native:
-        if version_upstream != last_upstream:
+        if version.upstream != last_upstream:
             list.append('-sa')
         else:
             list.append('-sd')
@@ -241,17 +239,17 @@
         suffixes.append('.diff.gz')
 
     for suffix in suffixes:
-        prefix = '%s_%s-%s' % (package_name, package_version, version_debian)
+        prefix = '%s_%s' % (package_name, version)
         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))
+    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_dir)
+    spawnv_chdir(os.P_WAIT, 'dput', ['dput', entry['upload'], '%s_%s_source.changes' % (package_name, version)], out_dir)
 
 def main():
     config = Config(sys.argv[1])