[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#858180: unblock: diaspora-installer/0.6.3.0+debian2



Control: retitle -1 unblock: diaspora-installer/0.6.3.0+debian3
On Tuesday 21 March 2017 06:14 PM, Pirate Praveen wrote:
> Attaching debdiff.

piuparts found another regression (I was testing only diaspora-installer
extensively, but missed testing diaspora-common).
diff -Nru diaspora-installer-0.6.3.0+debian3/debian/changelog diaspora-installer-0.6.3.0+debian4/debian/changelog
--- diaspora-installer-0.6.3.0+debian3/debian/changelog	2017-03-20 18:45:32.000000000 +0530
+++ diaspora-installer-0.6.3.0+debian4/debian/changelog	2017-03-23 13:57:10.000000000 +0530
@@ -1,3 +1,9 @@
+diaspora-installer (0.6.3.0+debian4) unstable; urgency=medium
+
+  * Fix regression in diaspora-common.postrm which removes /bin by mistake
+
+ -- Pirate Praveen <praveen@debian.org>  Thu, 23 Mar 2017 13:57:10 +0530
+
 diaspora-installer (0.6.3.0+debian3) unstable; urgency=medium
 
   * Remove data during purge after user confirmation
diff -Nru diaspora-installer-0.6.3.0+debian3/debian/diaspora-common.postrm diaspora-installer-0.6.3.0+debian4/debian/diaspora-common.postrm
--- diaspora-installer-0.6.3.0+debian3/debian/diaspora-common.postrm	2017-03-20 18:45:32.000000000 +0530
+++ diaspora-installer-0.6.3.0+debian4/debian/diaspora-common.postrm	2017-03-23 13:57:10.000000000 +0530
@@ -52,15 +52,18 @@
 	    ucf --purge /etc/dbconfig-common/diaspora-common.conf
 	    ucfr --purge diaspora-common /etc/dbconfig-common/diaspora-common.conf
 	fi
-        rm -rf ${diaspora_user_home}/public
-        rm -rf ${diaspora_user_home}/app-assets
-        rm -rf ${diaspora_user_home}/Gemfile.lock
-        rm -rf ${diaspora_user_home}/.bundle
-        rm -rf ${diaspora_user_home}/vendor
-        rm -rf ${diaspora_home}/app/assets
-        rm -rf ${diaspora_home}/db
-        rm -rf ${diaspora_home}/bin
-        rm -rf /var/cache/diaspora /var/log/diaspora
+        diaspora_user_home=/var/lib/diaspora
+        if [ -d ${diaspora_user_home} ]; then
+          for i in  public app-assets Gemfile.lock .bundle vendor; do
+            test -e ${diaspora_user_home}/$i && rm -rf ${diaspora_user_home}/$i
+          done
+        fi
+        diaspora_home=/usr/share/diaspora
+        if [ -d ${diaspora_home} ]; then
+          for i in db bin app/assets; do
+            test -e ${diaspora_home}/$i && rm -rf ${diaspora_home}/$i
+          done
+        fi
         echo "Removing user: diaspora"
         id -u diaspora && userdel -r diaspora
       fi

Attachment: signature.asc
Description: OpenPGP digital signature


Reply to: