Control: tags -1 patch

The following patch should only restart apache2/lighttpd if they are installed.

live well,
  vagrant

debdiff gosa_2.7.4-4.1.dsc gosa_2.7.4-4.2.dsc
dpkg-source: warning: extracting unsigned source package 
(/srv/src/gosa_2.7.4-4.2.dsc)
diff -Nru gosa-2.7.4/debian/changelog gosa-2.7.4/debian/changelog
--- gosa-2.7.4/debian/changelog 2013-01-27 06:15:25.000000000 -0800
+++ gosa-2.7.4/debian/changelog 2013-02-03 10:49:10.000000000 -0800
@@ -1,3 +1,11 @@
+gosa (2.7.4-4.2) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * debian/gosa.postinst, debian/gosa.postrm: Only restart apache2 or lighttpd
+    when binary is present. (Closes: #699616)
+
+ -- Vagrant Cascadian <[email protected]>  Sun, 03 Feb 2013 10:47:43 -0800
+
 gosa (2.7.4-4.1) unstable; urgency=low

   * Non-maintainer upload.
diff -Nru gosa-2.7.4/debian/gosa.postinst gosa-2.7.4/debian/gosa.postinst
--- gosa-2.7.4/debian/gosa.postinst     2013-01-27 04:28:42.000000000 -0800
+++ gosa-2.7.4/debian/gosa.postinst     2013-02-03 11:26:22.000000000 -0800
@@ -59,11 +59,13 @@
   fi

   # Finally restart servers
+  if [ -x /usr/sbin/apache2 ]; then
   if [ -x /usr/sbin/invoke-rc.d ]; then
     invoke-rc.d apache2 reload
   else
     /etc/init.d/apache2 reload
   fi
+  fi
 fi

 if [ -d /etc/lighttpd/conf-available ]; then
@@ -85,11 +87,13 @@
   fi

   # Finally restart servers
+  if [ -x /usr/sbin/lighttpd ]; then
   if [ -x /usr/sbin/invoke-rc.d ]; then
     invoke-rc.d lighttpd reload
   else
     /etc/init.d/lighttpd reload
   fi
+  fi

 fi

diff -Nru gosa-2.7.4/debian/gosa.postrm gosa-2.7.4/debian/gosa.postrm
--- gosa-2.7.4/debian/gosa.postrm       2012-06-18 23:47:42.000000000 -0700
+++ gosa-2.7.4/debian/gosa.postrm       2013-02-03 10:50:58.000000000 -0800
@@ -27,11 +27,13 @@
           [ -L /etc/apache2/conf.d/gosa.conf ] && rm -f 
/etc/apache2/conf.d/gosa.conf

           # Restart servers
+          if [ -x /usr/sbin/apache2 ]; then
           if [ -x /usr/sbin/invoke-rc.d ]; then
             invoke-rc.d apache2 restart
           else
             /etc/init.d/apache2 restart
           fi
+          fi
         fi

         if [ -d /etc/lighttpd/conf-available ]; then
@@ -39,11 +41,13 @@
           [ -L /etc/lighttpd/conf-enabled/99gosa-lighttpd.conf ] && rm -f 
/etc/lighttpd/conf-enabled/99gosa-lighttpd.conf

           # Restart servers
+          if [ -x /usr/sbin/lighttpd ]; then
           if [ -x /usr/sbin/invoke-rc.d ]; then
             invoke-rc.d lighttpd restart
           else
             /etc/init.d/lighttpd restart
           fi
+          fi
         fi

         ;;


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to