[debian-edu-commits] r81497 - in branches/wheezy/debian-edu-config: debian sbin

[pere at alioth.debian.org]

Author: pere
Date: 2013-07-09 13:08:20 +0000 (Tue, 09 Jul 2013)
New Revision: 81497

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/sbin/debian-edu-hwsetup
Log:
Adjust auto-addfirmware and debian-edu-hwsetup 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 12:44:55 UTC (rev 81496)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-07-09 13:08:20 UTC (rev 81497)
@@ -1,9 +1,9 @@
 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.
+  * Adjust auto-addfirmware and debian-edu-hwsetup 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
 

Modified: branches/wheezy/debian-edu-config/sbin/debian-edu-hwsetup
===================================================================
--- branches/wheezy/debian-edu-config/sbin/debian-edu-hwsetup	2013-07-09 12:44:55 UTC (rev 81496)
+++ branches/wheezy/debian-edu-config/sbin/debian-edu-hwsetup	2013-07-09 13:08:20 UTC (rev 81497)
@@ -31,7 +31,8 @@
     pkg="$1"
     codename=$(lsb_release -sc)
     info "Installing non-free package $pkg from $codename."
-    if ! apt-cache show $pkg > /dev/null 2>&1 ; then
+    if ! LC_ALL=C apt-cache show $binpkg 2>&1 | \
+               grep -q 'E: No packages found' ; then
 	echo deb http://http.debian.net/debian $codename non-free \
 	    > /etc/apt/sources.list.d/$pkg.list
 	chmod a+r /etc/apt/sources.list.d/$pkg.list