[Python-apps-commits] r11659 - in packages/pyicqt/trunk/debian (3 files)

[nijel at users.alioth.debian.org]

    Date: Tuesday, December 30, 2014 @ 10:50:54
  Author: nijel
Revision: 11659

Fix bashism in munin helper scripts (Closes: #772358).

Added:
  packages/pyicqt/trunk/debian/patches/bashism.patch
Modified:
  packages/pyicqt/trunk/debian/changelog
  packages/pyicqt/trunk/debian/patches/series

Modified: packages/pyicqt/trunk/debian/changelog
===================================================================
--- packages/pyicqt/trunk/debian/changelog	2014-12-30 01:12:15 UTC (rev 11658)
+++ packages/pyicqt/trunk/debian/changelog	2014-12-30 10:50:54 UTC (rev 11659)
@@ -2,6 +2,7 @@
 
   * NOT RELEASED YET
   * Bump standards to 3.9.6.
+  * Fix bashism in munin helper scripts (Closes: #772358).
 
  -- Michal ÄŒihaÅ™ <nijel at debian.org>  Mon, 11 Aug 2014 13:25:58 +0200
 

Added: packages/pyicqt/trunk/debian/patches/bashism.patch
===================================================================
--- packages/pyicqt/trunk/debian/patches/bashism.patch	                        (rev 0)
+++ packages/pyicqt/trunk/debian/patches/bashism.patch	2014-12-30 10:50:54 UTC (rev 11659)
@@ -0,0 +1,31 @@
+Subject: Fix bashism (negative exit value) in munin scripts
+From: Michal ÄŒihaÅ™ <nijel at debian.org>
+--- a/tools/memory_
++++ b/tools/memory_
+@@ -49,7 +49,7 @@
+ 
+ if [ ! -r /var/run/$TRANSPORT/$TRANSPORT.pid ] ; then
+      echo Cannot read /var/run/$TRANSPORT/$TRANSPORT.pid >&2
+-     exit -1
++     exit 1
+ fi 
+ 
+ pid=`cat /var/run/$TRANSPORT/$TRANSPORT.pid`
+--- a/tools/threads_
++++ b/tools/threads_
+@@ -36,7 +36,7 @@
+ 
+ if [ ! -r /var/run/$TRANSPORT/$TRANSPORT.pid ] ; then
+      echo Cannot read /var/run/$TRANSPORT/$TRANSPORT.pid >&2
+-     exit -1
++     exit 1
+ fi 
+ 
+ pid=`cat /var/run/$TRANSPORT/$TRANSPORT.pid`
+@@ -44,4 +44,4 @@
+ threads=`cat /proc/$pid/status | grep Threads`
+ threads=`echo $threads | cut -f2 -d ' '`
+ echo -n 'threads.value '
+-echo $threads # threads count
+\ No newline at end of file
++echo $threads # threads count

Modified: packages/pyicqt/trunk/debian/patches/series
===================================================================
--- packages/pyicqt/trunk/debian/patches/series	2014-12-30 01:12:15 UTC (rev 11658)
+++ packages/pyicqt/trunk/debian/patches/series	2014-12-30 10:50:54 UTC (rev 11659)
@@ -1,3 +1,4 @@
 header-dont-use-env.patch
 adapt-default-config-options.patch
 no_error.patch
+bashism.patch