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

[Bastian Blank]

Author: waldi
Date: Wed Jul  4 10:00:40 2007
New Revision: 9057

Log:
snapshot/package.py: Update.


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 10:00:40 2007
@@ -138,6 +138,20 @@
     def exec_svn(self, args):
         self._exec("/usr/bin/svn", args)
 
+class LastFile(object):
+    revision = 0
+    upstream = None
+
+    def __init__(self, filename):
+        self.filename = filename
+        if os.path.exists(filename):
+            i = file(filename).read().strip().split()
+            self.revision = int(i[0])
+            self.upstream = i[1]
+
+    def write(self):
+        file(self.filename, 'w').write("%d %s\n" % (self.revision, self.upstream))
+
 class Package(object):
     def __init__(self, path, entry):
         base = entry['base']
@@ -161,15 +175,9 @@
             if line.startswith('Last Changed Rev: '):
                 revision = int(line.split()[-1])
 
-        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()
-            last_revision = int(last_revision)
+        last = LastFile(last_file)
 
-        if revision <= last_revision:
+        if revision <= last.revision:
             return
 
         if not os.path.exists(out_dir):
@@ -227,7 +235,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')
@@ -246,12 +254,14 @@
             os.link(gen, out)
             os.unlink(gen)
 
-        file(last_file, 'w').write("%d %s\n" % (revision, version.upstream))
+        spawnv_chdir(os.P_WAIT, 'dput', ['dput', entry['upload'], '%s_%s_source.changes' % (package_name, version)], out_dir)
+
+        last.revision = revision
+        last.upstream = version.upstream
+        last.write()
 
         package_storage.remove()
 
-        spawnv_chdir(os.P_WAIT, 'dput', ['dput', entry['upload'], '%s_%s_source.changes' % (package_name, version)], out_dir)
-
 if __name__ == '__main__':
     config = Config(sys.argv[1])
     if len(sys.argv) > 2: