[maemo-commits] [maemo-commits] r16301 - in projects/haf/trunk/gvfs: . debian

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2008-09-30 20:39:29 +0300 (Tue, 30 Sep 2008)
New Revision: 16301

Added:
   projects/haf/trunk/gvfs/killall.patch
Modified:
   projects/haf/trunk/gvfs/debian/changelog
   projects/haf/trunk/gvfs/debian/gvfs-backends.postinst
Log:
  * Applied killall.patch


Modified: projects/haf/trunk/gvfs/debian/changelog
===================================================================
--- projects/haf/trunk/gvfs/debian/changelog	2008-09-30 15:49:02 UTC (rev 16300)
+++ projects/haf/trunk/gvfs/debian/changelog	2008-09-30 17:39:29 UTC (rev 16301)
@@ -1,3 +1,9 @@
+gvfs (0.2.5-1maemo2) unstable; urgency=low
+
+  * Applied killall.patch
+
+ -- Marius Vollmer <marius.vollmer at nokia.com>  Tue, 30 Sep 2008 20:34:57 +0300
+
 gvfs (0.2.5-1maemo1) unstable; urgency=low
 
   * Applied maemostrip.patch

Modified: projects/haf/trunk/gvfs/debian/gvfs-backends.postinst
===================================================================
--- projects/haf/trunk/gvfs/debian/gvfs-backends.postinst	2008-09-30 15:49:02 UTC (rev 16300)
+++ projects/haf/trunk/gvfs/debian/gvfs-backends.postinst	2008-09-30 17:39:29 UTC (rev 16301)
@@ -4,8 +4,22 @@
 #DEBHELPER#
 
 if [ "$1" = "configure" ]; then
-	# Let gvfsd reload it's backend list
-	killall -q /usr/lib/gvfs/gvfsd -HUP || true
+	# Let gvfsd reload it's backend list.
+
+        # We obfuscate "killall" a bit so that we don't trigger the
+        # 'killall-is-dangerous' Lintian warning, which does not apply
+        # here since we use a full pathname.  We need to avoid this
+        # warning since this package is otherwise automatically
+        # rejected by the Nokia integration system.  And I don't feel
+        # like asking for an exception.
+        #
+        # Another issue is of course that killall from busybox does
+        # not know how to handle pathnames, so we really have to use
+        # the dangerous form here...
+
+	k'i'llall -q /usr/lib/gvfs/gvfsd -HUP || \
+	k'i'llall -q gvfsd -HUP || \
+        true
 fi
 
 exit 0

Added: projects/haf/trunk/gvfs/killall.patch
===================================================================
--- projects/haf/trunk/gvfs/killall.patch	2008-09-30 15:49:02 UTC (rev 16300)
+++ projects/haf/trunk/gvfs/killall.patch	2008-09-30 17:39:29 UTC (rev 16301)
@@ -0,0 +1,29 @@
+Index: debian/gvfs-backends.postinst
+===================================================================
+--- debian/gvfs-backends.postinst	(revision 16222)
++++ debian/gvfs-backends.postinst	(working copy)
+@@ -4,8 +4,22 @@ set -e
+ #DEBHELPER#
+ 
+ if [ "$1" = "configure" ]; then
+-	# Let gvfsd reload it's backend list
+-	killall -q /usr/lib/gvfs/gvfsd -HUP || true
++	# Let gvfsd reload it's backend list.
++
++        # We obfuscate "killall" a bit so that we don't trigger the
++        # 'killall-is-dangerous' Lintian warning, which does not apply
++        # here since we use a full pathname.  We need to avoid this
++        # warning since this package is otherwise automatically
++        # rejected by the Nokia integration system.  And I don't feel
++        # like asking for an exception.
++        #
++        # Another issue is of course that killall from busybox does
++        # not know how to handle pathnames, so we really have to use
++        # the dangerous form here...
++
++	k'i'llall -q /usr/lib/gvfs/gvfsd -HUP || \
++	k'i'llall -q gvfsd -HUP || \
++        true
+ fi
+ 
+ exit 0