[Piuparts-commits] [piuparts] 01/01: post_distupgrade_zz_backports: improve systemd/udev handling for jessie2bpo

[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 139b59718cd3be5ea72d522f1c0e123f585238a7
Author: Andreas Beckmann <anbe at debian.org>
Date:   Wed Mar 22 16:49:14 2017 +0100

    post_distupgrade_zz_backports: improve systemd/udev handling for jessie2bpo
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 custom-scripts/scripts/post_distupgrade_zz_backports | 1 +
 custom-scripts/scripts/post_setup_zz_backports       | 2 ++
 debian/changelog                                     | 5 +++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/custom-scripts/scripts/post_distupgrade_zz_backports b/custom-scripts/scripts/post_distupgrade_zz_backports
new file mode 120000
index 0000000..e65e375
--- /dev/null
+++ b/custom-scripts/scripts/post_distupgrade_zz_backports
@@ -0,0 +1 @@
+post_setup_zz_backports
\ No newline at end of file
diff --git a/custom-scripts/scripts/post_setup_zz_backports b/custom-scripts/scripts/post_setup_zz_backports
index 00872e6..bc266b7 100755
--- a/custom-scripts/scripts/post_setup_zz_backports
+++ b/custom-scripts/scripts/post_setup_zz_backports
@@ -14,6 +14,8 @@ is_installed()
 PKGS=""
 
 if [ "$PIUPARTS_DISTRIBUTION" = "jessie-backports" ]; then
+	# downgrading them from jessie-backports to jessie during removal
+	# is problematic due to triggers
 	! is_installed systemd || PKGS="${PKGS} systemd"
 	! is_installed udev || PKGS="${PKGS} udev"
 fi
diff --git a/debian/changelog b/debian/changelog
index 273e703..7fab06a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,8 +30,9 @@ piuparts (0.77) UNRELEASED; urgency=medium
       once per month.
   * custom-scripts: Check for dummy package "TARBALL" to detect tarball
     creation phase.
-  * scripts/post_setup_zz_backports: Avoid downgrading systemd/udev from
-    jessie-backports to jessie during removal phase.  (Closes: #856845)
+  * scripts/post_{setup,distupgrade}_zz_backports: Avoid downgrading
+    systemd/udev from jessie-backports to jessie during removal phase.
+    (Closes: #856845)
   * master-bin/detect_archive_issues:
     - Look at failed logs older than 24 hours (48 hours previously).
     - Mark logfiles for immediate recycling upon first appearance.

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