[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.49-147-g5e9a5c3

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 5c3169adc342f5982a2d7912f56210df34313630
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sun Mar 3 19:06:12 2013 +0100

    p: call 'apt-get -t <target-release>' if needed
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/debian/changelog b/debian/changelog
index d65eb47..b547f9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ piuparts (0.50) UNRELEASED; urgency=low
     - piuparts.deb: Add Depends: piuparts-common for piupartslib.
     - Use distros.conf to generate mirror configuration. This enables more
       complex scenarios involving partial distributions and dist-upgrades.
+    - Use apt-get -t <target-release> if set in distros.conf.
   * piuparts.conf:
     - New global settings:
       + proxy
diff --git a/piuparts.py b/piuparts.py
index 81f49e2..2041135 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -1145,18 +1145,22 @@ class Chroot:
             if with_scripts:
                 self.run_scripts("pre_install")
 
+            apt_get_install = ["apt-get", "-yf"]
+            apt_get_install.extend(settings.distro_config.get_target_flags(
+                os.environ["PIUPARTS_DISTRIBUTION"]))
+            apt_get_install.append("install")
             if settings.list_installed_files:
                 pre_info = self.save_meta_data()
 
                 self.run(["dpkg", "-i"] + tmp_files, ignore_errors=True)
                 self.list_installed_files (pre_info, self.save_meta_data())
 
-                self.run(["apt-get", "-yf", "install"])
+                self.run(apt_get_install)
                 self.list_installed_files (pre_info, self.save_meta_data())
 
             else:
                 self.run(["dpkg", "-i"] + tmp_files, ignore_errors=True)
-                self.run(["apt-get", "-yf", "install"])
+                self.run(apt_get_install)
 
             logging.info ("Installation of %s ok", tmp_files)
 
@@ -1173,12 +1177,17 @@ class Chroot:
             self.run(["apt-cache", "policy"])
             self.run(["apt-cache", "policy"] + [p.split("=", 1)[0].strip() for p in packages])
 
+            apt_get_install = ["apt-get", "-y"]
+            apt_get_install.extend(settings.distro_config.get_target_flags(
+                os.environ["PIUPARTS_DISTRIBUTION"]))
+            apt_get_install.append("install")
+            apt_get_install.extend(packages)
             if settings.list_installed_files:
                 pre_info = self.save_meta_data()
-                self.run(["apt-get", "-y", "install"] + packages)
+                self.run(apt_get_install)
                 self.list_installed_files (pre_info, self.save_meta_data())
             else:
-                self.run(["apt-get", "-y", "install"] + packages)
+                self.run(apt_get_install)
 
             if with_scripts:
                 self.run_scripts("post_install")

-- 
piuparts git repository