[Piuparts-commits] [piuparts] 03/04: p: rename --upgrade-before-distupgrade to --upgrade-before-dist-upgrade

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch develop
in repository piuparts.

commit 22261487c1661cd304164c32b23bb51bc81715c8
Author: Andreas Beckmann <anbe at debian.org>
Date:   Mon Jun 12 16:40:01 2017 +0200

    p: rename --upgrade-before-distupgrade to --upgrade-before-dist-upgrade
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 TODO             |  3 +++
 debian/changelog |  2 +-
 piuparts.1.txt   |  2 +-
 piuparts.py      | 10 +++++-----
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/TODO b/TODO
index a68471b..43f0fdf 100644
--- a/TODO
+++ b/TODO
@@ -94,6 +94,9 @@ for 0.7x, during the buster development cycle:
 
 - p-s: report age of the basetgz being used
 
+- solve the discrepancies between "dist-upgrade" (apt) and "distupgrade"
+  (piuparts), adopting apt's naming
+
 
 for 0.8x and later:
 
diff --git a/debian/changelog b/debian/changelog
index b46e340..626e6d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,7 +15,7 @@ piuparts (0.78) UNRELEASED; urgency=medium
     - Arguments to the --ignore/--ignore-regexp options (and internal
       ignored_files/ignored_patterns settings) that are prefixed with a ':'
       will verbosely log the ignored files if matched.
-    - New option --upgrade-before-distupgrade for 2-stage upgrades:
+    - New option --upgrade-before-dist-upgrade for 2-stage upgrades:
       'apt-get upgrade && apt-get dist-upgrade'.
   * piuparts.conf:
     - Use more aliases for mapping between releases and codenames to reduce
diff --git a/piuparts.1.txt b/piuparts.1.txt
index a0c34f8..6be9286 100644
--- a/piuparts.1.txt
+++ b/piuparts.1.txt
@@ -281,7 +281,7 @@ Note that file: addresses works if the directories are made accessible from with
 +
 Note: the temporary directory must *not* be mounted with the _nodev_ or _nosuid_ mount option.
 
-*--upgrade-before-distupgrade*::
+*--upgrade-before-dist-upgrade*::
   Perform two-stage upgrades: 'apt-get upgrade && apt-get dist-upgrade'.
 
 *-v*, *--verbose*::
diff --git a/piuparts.py b/piuparts.py
index 4ce802f..260eb76 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -195,7 +195,7 @@ class Settings:
         # tests and checks
         self.no_install_purge_test = False
         self.no_upgrade_test = False
-        self.upgrade_before_distupgrade = False
+        self.upgrade_before_dist_upgrade = False
         self.distupgrade_to_testdebs = False
         self.install_remove_install = False
         self.install_purge_install = False
@@ -2754,12 +2754,12 @@ def install_and_upgrade_between_distros(package_files, packages_qualified):
 
     os.environ["PIUPARTS_PHASE"] = "distupgrade"
 
-    chroot.upgrade_to_distros(settings.debian_distros[1:-1], distupgrade_packages, settings.upgrade_before_distupgrade)
+    chroot.upgrade_to_distros(settings.debian_distros[1:-1], distupgrade_packages, settings.upgrade_before_dist_upgrade)
 
     if settings.distupgrade_to_testdebs:
         chroot.enable_testdebs_repo(update=False)
 
-    chroot.upgrade_to_distros(settings.debian_distros[-1:], distupgrade_packages, settings.upgrade_before_distupgrade)
+    chroot.upgrade_to_distros(settings.debian_distros[-1:], distupgrade_packages, settings.upgrade_before_dist_upgrade)
 
     chroot.check_for_no_processes()
 
@@ -2999,7 +2999,7 @@ def parse_command_line():
                       default=False,
                       help="Don't check for broken symlinks.")
 
-    parser.add_option("--upgrade-before-distupgrade",
+    parser.add_option("--upgrade-before-dist-upgrade",
                       action="store_true", default=False,
                       help="Perform two-stage upgrades: 'apt-get upgrade && apt-get dist-upgrade'")
 
@@ -3192,7 +3192,7 @@ def parse_command_line():
     # tests and checks
     settings.no_install_purge_test = opts.no_install_purge_test
     settings.no_upgrade_test = opts.no_upgrade_test
-    settings.upgrade_before_distupgrade = opts.upgrade_before_distupgrade
+    settings.upgrade_before_dist_upgrade = opts.upgrade_before_dist_upgrade
     settings.distupgrade_to_testdebs = opts.distupgrade_to_testdebs
     settings.install_purge_install = opts.install_purge_install
     settings.install_remove_install = opts.install_remove_install

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git