[Piuparts-commits] [SCM] piuparts git repository branch, master, updated. 0.49-194-g6f9dd07

Andreas Beckmann anbe at debian.org
Fri Mar 15 22:52:51 UTC 2013


The following commit has been merged in the master branch:
commit 4d7458b37154146fa237f412c13071b8065ac1ee
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sun Mar 10 01:40:27 2013 +0100

    *.postrm: silence rmdir
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/debian/piuparts-master.postrm b/debian/piuparts-master.postrm
index 0c0a8d2..d6ec0f9 100644
--- a/debian/piuparts-master.postrm
+++ b/debian/piuparts-master.postrm
@@ -19,13 +19,9 @@ if [ "$1" = "purge" ] ; then
         rm -rf /var/lib/piuparts/master
     fi
 
-    if [ -d /var/lib/piuparts ] ; then
-        rmdir /var/lib/piuparts || true
-    fi
+    rmdir /var/lib/piuparts 2>/dev/null || true
 
-    if [ -d /etc/piuparts ] ; then
-        rmdir /etc/piuparts || true
-    fi
+    rmdir /etc/piuparts 2>/dev/null || true
 
 fi
 
diff --git a/debian/piuparts-slave.postrm b/debian/piuparts-slave.postrm
index f735025..cc42d59 100644
--- a/debian/piuparts-slave.postrm
+++ b/debian/piuparts-slave.postrm
@@ -11,13 +11,9 @@ if [ "$1" = "purge" ] ; then
         rm -rf /var/lib/piuparts/slave
     fi
 
-    if [ -d /var/lib/piuparts ] ; then
-        rmdir /var/lib/piuparts || true
-    fi
+    rmdir /var/lib/piuparts 2>/dev/null || true
 
-    if [ -d /etc/piuparts ] ; then
-        rmdir /etc/piuparts || true
-    fi
+    rmdir /etc/piuparts 2>/dev/null || true
 
     rm -rf /var/cache/piuparts/basetgz/*.log
     rm -rf /var/cache/piuparts/basetgz/*.tar.gz
diff --git a/debian/piuparts.postrm b/debian/piuparts.postrm
index a2c416f..92bf6ff 100644
--- a/debian/piuparts.postrm
+++ b/debian/piuparts.postrm
@@ -4,9 +4,7 @@ set -e
 if [ "$1" = "purge" ] ; then
 
     # may be left over from a previous version
-    if [ -d /etc/piuparts ] ; then
-        rmdir /etc/piuparts || true
-    fi
+    rmdir /etc/piuparts 2>/dev/null || true
 
 fi
 

-- 
piuparts git repository



More information about the Piuparts-commits mailing list