[Piuparts-commits] rev 844 - in trunk: . debian

[Holger Levsen]

Author: holger
Date: 2010-12-28 19:06:46 +0000 (Tue, 28 Dec 2010)
New Revision: 844

Modified:
   trunk/debian/changelog
   trunk/piuparts.py
Log:
fix parsing of the options --end-meta and --save-end-meta.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-12-28 14:46:05 UTC (rev 843)
+++ trunk/debian/changelog	2010-12-28 19:06:46 UTC (rev 844)
@@ -77,6 +77,7 @@
     - don't panic if package is not known by apt-get, this probably just means
       someone is testing a package not yet in the archive. (Closes: #566672)
       Thanks to Cleto Martin Angelina for the patch!
+    - fix parsing of the options --end-meta and --save-end-meta.
   * piuparts.1.txt: 
     - update the pointer to custom-scripts.txt to point to README.txt, as
       those two files have been merged. Thanks to Gregor Hermann for 

Modified: trunk/piuparts.py
===================================================================
--- trunk/piuparts.py	2010-12-28 14:46:05 UTC (rev 843)
+++ trunk/piuparts.py	2010-12-28 19:06:46 UTC (rev 844)
@@ -142,8 +142,8 @@
         self.basetgz = None
         self.lvm_volume = None
         self.savetgz = None
-        self.endmeta = None
-        self.saveendmeta = None
+        self.end_meta = None
+        self.save_end_meta = None
         self.warn_on_others = False
         self.warn_on_leftovers_after_purge = False
         self.keep_sources_list = False
@@ -1781,8 +1781,8 @@
         root_tgz = chroot.create_temp_tgz_file()
         chroot.pack_into_tgz(root_tgz)
         
-    if settings.endmeta:
-        root_info, selections = load_meta_data(settings.endmeta)
+    if settings.end_meta:
+        root_info, selections = load_meta_data(settings.end_meta)
     else:
         chroot.upgrade_to_distros(settings.debian_distros[1:], [])
         chroot.run(["apt-get", "clean"])
@@ -1790,8 +1790,8 @@
         root_info = chroot.save_meta_data()
         selections = chroot.get_selections()
         
-        if settings.saveendmeta:
-            save_meta_data(settings.saveendmeta, root_info, selections)
+        if settings.save_end_meta:
+            save_meta_data(settings.save_end_meta, root_info, selections)
     
         chroot.remove()
         dont_do_on_panic(id)