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

[John Wright]

Author: jsw
Date: 2008-02-15 04:47:03 +0000 (Fri, 15 Feb 2008)
New Revision: 130

Modified:
   trunk/debian/changelog
   trunk/piuparts.py
Log:
* piuparts.py:
  - Implement Chroot.create_temp_tgz_file() (since it's used in the VirtServ
    subclass)
  - Fix a typo -- chroot.create_temp_tgz() was being called instead of
    chroot.create_temp_tgz_file() (Closes: #465416)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-02-02 15:37:41 UTC (rev 129)
+++ trunk/debian/changelog	2008-02-15 04:47:03 UTC (rev 130)
@@ -1,9 +1,12 @@
 piuparts (0.30) UNRELEASED; urgency=low
 
-  [ Lars Wirzenius ]
-  * Started new changelog for new changes.
+  * piuparts.py:
+    - Implement Chroot.create_temp_tgz_file() (since it's used in the VirtServ
+      subclass)
+    - Fix a typo -- chroot.create_temp_tgz() was being called instead of
+      chroot.create_temp_tgz_file() (Closes: #465416)
 
- -- Lars Wirzenius <liw at iki.fi>  Fri, 01 Feb 2008 17:46:11 +0200
+ -- John Wright <jsw at debian.org>  Thu, 14 Feb 2008 20:32:35 -0700
 
 piuparts (0.29) unstable; urgency=low
 

Modified: trunk/piuparts.py
===================================================================
--- trunk/piuparts.py	2008-02-02 15:37:41 UTC (rev 129)
+++ trunk/piuparts.py	2008-02-15 04:47:03 UTC (rev 130)
@@ -552,6 +552,13 @@
             shutil.rmtree(self.name)
             logging.debug("Removed directory tree at %s" % self.name)
 
+    def create_temp_tgz_file(self):
+        """Return the path to a file to be used as a temporary tgz file"""
+        # Yes, create_temp_file() would work just as well, but putting it in
+        # the interface for Chroot allows the VirtServ hack to work.
+        (fd, temp_tgz) = create_temp_file()
+        return temp_tgz
+
     def pack_into_tgz(self, result):
         """Tar and compress all files in the chroot."""
         logging.debug("Saving %s to %s." % (self.name, result))
@@ -1508,7 +1515,7 @@
     if settings.basetgz:
         root_tgz = settings.basetgz
     else:
-        root_tgz = chroot.create_temp_tgz()
+        root_tgz = chroot.create_temp_tgz_file()
         chroot.pack_into_tgz(root_tgz)
         
     if settings.endmeta: