[Pkg-ceph-commits] [ceph] 01/02: Use dpkg-backup as dpkg-old confuses dpkg on subsequent purges

[James Downing Page]

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

jamespage pushed a commit to branch ubuntu-yakkety
in repository ceph.

commit e4cd9147f0855a8e575cfbd2564f4545c0ff35c3
Author: James Page <james.page at ubuntu.com>
Date:   Mon Jun 13 11:43:47 2016 +0100

    Use dpkg-backup as dpkg-old confuses dpkg on subsequent purges
    
    (cherry picked from commit c6d3435a7aa0a69e145bbc0c873e74b38ca9a005)
---
 debian/ceph-common.postinst | 6 +++---
 debian/ceph-common.postrm   | 4 ++--
 debian/ceph-common.preinst  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/ceph-common.postinst b/debian/ceph-common.postinst
index 246249d..96de79e 100644
--- a/debian/ceph-common.postinst
+++ b/debian/ceph-common.postinst
@@ -37,9 +37,9 @@ set -e
 # Custom dpkg-maintscript-helper type function to deal with
 # nested /etc/default/ceph/ceph
 finish_mv_ceph_defaults() {
-    rm -rf "/etc/default/ceph.dpkg-old/ceph.dpkg-remove"
+    rm -rf "/etc/default/ceph.dpkg-backup/ceph.dpkg-remove"
 
-    [ -e "/etc/default/ceph.dpkg-old/ceph" ] || return 0
+    [ -e "/etc/default/ceph.dpkg-backup/ceph" ] || return 0
 
     echo "Preserving user changes to /etc/default/ceph (renamed from /etc/default/ceph/ceph)..."
     if [ -f "/etc/default/ceph" ]; then
@@ -47,7 +47,7 @@ finish_mv_ceph_defaults() {
     fi
     # Preserve /etc/default/ceph directory just in case users
     # have added additional files to it.
-    mv -f "/etc/default/ceph.dpkg-old/ceph" "/etc/default/ceph"
+    mv -f "/etc/default/ceph.dpkg-backup/ceph" "/etc/default/ceph"
 }
 
 case "$1" in
diff --git a/debian/ceph-common.postrm b/debian/ceph-common.postrm
index 3277de6..ce55264 100644
--- a/debian/ceph-common.postrm
+++ b/debian/ceph-common.postrm
@@ -22,9 +22,9 @@ set -e
 # Custom dpkg-maintscript-helper type function to deal with
 # nested /etc/default/ceph/ceph
 abort_mv_ceph_defaults() {
-    if [ -e "/etc/default/ceph.dpkg-old/ceph.dpkg-remove" ]; then
+    if [ -e "/etc/default/ceph.dpkg-backup/ceph.dpkg-remove" ]; then
         echo "Reinstalling /etc/default/ceph/ceph that was moved away"
-        mv "/etc/default/ceph.dpkg-old" "/etc/default/ceph"
+        mv "/etc/default/ceph.dpkg-backup" "/etc/default/ceph"
         mv "/etc/default/ceph/ceph.dpkg-remove" "/etc/default/ceph/ceph"
     fi
 }
diff --git a/debian/ceph-common.preinst b/debian/ceph-common.preinst
index 51e3800..ef14f1e 100644
--- a/debian/ceph-common.preinst
+++ b/debian/ceph-common.preinst
@@ -11,7 +11,7 @@ prepare_mv_ceph_defaults() {
         sed -n -e "\'^ /etc/default/ceph/ceph ' { s/ obsolete$//; s/.* //; p }")"
     if [ "$md5sum" = "$old_md5sum" ]; then
         mv -f "/etc/default/ceph/ceph" "/etc/default/ceph/ceph.dpkg-remove"
-        mv -f "/etc/default/ceph" "/etc/default/ceph.dpkg-old"
+        mv -f "/etc/default/ceph" "/etc/default/ceph.dpkg-backup"
     fi
 }
 

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