[prev in list] [next in list] [prev in thread] [next in thread] 

List:       hurd-commit
Subject:    [SCM] Debian GNU Hurd packaging branch, master, updated. debian/20120520-1-2-g514f6fd
From:       "Samuel Thibault" <samuel.thibault () ens-lyon ! org>
Date:       2012-05-23 21:55:47
Message-ID: E1SXJX1-00047G-DD () vasks ! debian ! org
[Download RAW message or body]

The following commit has been merged in the master branch:
commit 514f6fdc3afe872a9c643b123a24adeec040b944
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Wed May 23 23:55:42 2012 +0200

    hurd.postinst: Drop error messages while fetching pfinet options.

diff --git a/debian/changelog b/debian/changelog
index 36b6f51..af3b87e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 hurd (20120520-2) UNRELEASED; urgency=low
 
-  * Do not make hurd-udeb depend on netdde-udeb, it leads to configure
+  * control: Do not make hurd-udeb depend on netdde-udeb, it leads to configure
     recursion, and is not actually needed.
+  * hurd.postinst: Drop error messages while fetching pfinet options.
 
  -- Samuel Thibault <sthibault@debian.org>  Tue, 22 May 2012 00:07:09 +0000
 
diff --git a/debian/hurd.postinst b/debian/hurd.postinst
index a8a5c08..eb079b7 100644
--- a/debian/hurd.postinst
+++ b/debian/hurd.postinst
@@ -77,16 +77,16 @@ if [ "$1" = configure ] && [ "$2" ]; then
 	/usr/lib/hurd/setup-translators -K
 
 	# upgrade pfinet into using DDE node
-	if PFINET="`showtrans /servers/socket/2`"
+	if PFINET=`showtrans /servers/socket/2` 2> /dev/null
 	then
-		PFINET=$(echo "$PFINET" | sed 's_ eth_ /dev/eth_')
-		PFINET=$(echo "$PFINET" | sed 's_=eth_=/dev/eth_')
+		PFINET=`echo "$PFINET" | sed 's_ eth_ /dev/eth_'`
+		PFINET=`echo "$PFINET" | sed 's_=eth_=/dev/eth_'`
 		settrans -pk /servers/socket/2 $PFINET
 	fi
-	if PFINET6=`showtrans /servers/socket/26`
+	if PFINET6="`showtrans /servers/socket/26`" 2> /dev/null
 	then
-		PFINET6=$(echo "$PFINET6" | sed 's_ eth_ /dev/eth_')
-		PFINET6=$(echo "$PFINET6" | sed 's_=eth_=/dev/eth_')
+		PFINET6=`echo "$PFINET6" | sed 's_ eth_ /dev/eth_'`
+		PFINET6=`echo "$PFINET6" | sed 's_=eth_=/dev/eth_'`
 		settrans -pk /servers/socket/26 $PFINET6
 	fi
 fi

-- 
Debian GNU Hurd packaging

[prev in list] [next in list] [prev in thread] [next in thread]