[Piuparts-commits] [SCM] piuparts git repository branch, master, updated. 0.48-79-gdf94975

[Andreas Beckmann]

The following commit has been merged in the master branch:
commit 363e87ed28ddc9626cf6aa174f5e46321075ca4c
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Tue Nov 6 11:11:51 2012 +0100

    p: do not try to install disappeared packages after distupgrade
    
    they have a version qualification of "None"
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/debian/changelog b/debian/changelog
index be3f742..dbc7a07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ piuparts (0.49) UNRELEASED; urgency=low
 
   [ Andreas Beckmann ]
   * piuparts.py:
+    - Do not try to install unavailable packages (pseudo-version None) after
+      dist-upgrade.
   * piuparts.conf:
   * piuparts-master.py:
   * piuparts-slave.py:
diff --git a/piuparts.py b/piuparts.py
index ded14e3..749cacf 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -2327,7 +2327,7 @@ def install_and_upgrade_between_distros(package_files, packages_qualified):
 
     os.environ["PIUPARTS_PHASE"] = "upgrade"
 
-    chroot.install_packages(package_files, packages_qualified)
+    chroot.install_packages(package_files, [p for p in packages_qualified if not p.endswith("=None")])
 
     chroot.check_for_no_processes()
 

-- 
piuparts git repository