[debian-edu-commits] r81488 - in branches/wheezy/debian-edu-config: debian share/debian-edu-config/tools

[pere at alioth.debian.org]

Author: pere
Date: 2013-07-09 11:45:19 +0000 (Tue, 09 Jul 2013)
New Revision: 81488

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/debian-edu-config/tools/auto-addfirmware
Log:
Adjust auto-addfirmware to cope with the fact that apt-cache do not
return an error code if a package is missing but listed as a virtual
package.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-07-09 11:36:32 UTC (rev 81487)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-07-09 11:45:19 UTC (rev 81488)
@@ -1,3 +1,12 @@
+debian-edu-config (1.709~svn81488) UNRELEASED; urgency=low
+
+  [ Petter Reinholdtsen ]
+  * Adjust auto-addfirmware to cope with the fact that apt-cache do not
+    return an error code if a package is missing but listed as a virtual
+    package.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Tue, 09 Jul 2013 13:44:58 +0200
+
 debian-edu-config (1.709~svn81487) wheezy-test; urgency=low
 
   [ Petter Reinholdtsen ]

Modified: branches/wheezy/debian-edu-config/share/debian-edu-config/tools/auto-addfirmware
===================================================================
--- branches/wheezy/debian-edu-config/share/debian-edu-config/tools/auto-addfirmware	2013-07-09 11:36:32 UTC (rev 81487)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/tools/auto-addfirmware	2013-07-09 11:45:19 UTC (rev 81488)
@@ -72,7 +72,8 @@
     echo $binpkginfo |  while IFS=/ read section srcpkg binpkg ; do
         echo $binpkg
 # Enable the non-free section if it is needed
-	if ! apt-cache show $binpkg >/dev/null 2>&1 \
+	if ! LC_ALL=C apt-cache show $binpkg 2>&1 | \
+               grep -q 'E: No packages found' \
            && ( [ non-free = "$section" ] \
                || [ contrib = "$section" ] ) ; then 
 	    add_contrib_nonfree