[Piuparts-commits] [SCM] piuparts git repository branch, master, updated. eda668423fa87898c59d1075118693714aa5a053

[Andreas Beckmann]

The following commit has been merged in the master branch:
commit 965085566e6225bb6f515b2bb719b93b3dd2c39a
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Fri Nov 11 12:11:02 2011 +0100

    remove pre_upgrade_ hook scripts
    
    remove the pre_upgrade_ scripts, they can be replaced by
    pre_install_ scripts that check for PIUPARTS_PHASE=upgrade
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/README.txt b/README.txt
index 2f2b243..66e8327 100644
--- a/README.txt
+++ b/README.txt
@@ -187,10 +187,6 @@ to distinguish the cases.
 
 'post_purge_' - after *purging* your package.
 
-'pre_upgrade_' - before *upgrading* your package, once the
-current version in the archive has been installed (this is done
-in the second test, "Installation, upgrade and purging test").
-
 'pre_distupgrade_' - before *upgrading* the chroot to the *next
 distribution*. The next distribution is available in the variable
 PIUPARTS_DISTRIBUTION_NEXT.
diff --git a/piuparts.py b/piuparts.py
index f3855ae..3125cb6 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -1948,8 +1948,6 @@ def install_upgrade_test(chroot, root_info, selections, package_files, packages)
     os.environ["PIUPARTS_PHASE"] = "install"
     chroot.install_packages_by_name(packages)
 
-    chroot.run_scripts("pre_upgrade")
-
     chroot.check_for_no_processes()
     chroot.check_for_broken_symlinks()
 
@@ -2060,8 +2058,6 @@ def install_and_upgrade_between_distros(package_files, packages):
 
     chroot.install_packages_by_name(packages)
 
-    chroot.run_scripts("pre_upgrade")
-
     chroot.check_for_no_processes()
 
     os.environ["PIUPARTS_PHASE"] = "distupgrade"

-- 
piuparts git repository