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

[pere at alioth.debian.org]

Author: pere
Date: 2013-07-02 12:23:06 +0000 (Tue, 02 Jul 2013)
New Revision: 81314

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/debian-edu-config/tools/auto-addfirmware
Log:
Adjusted auto-addfirmware to only add contrib and non-free APT
sources if it can't find the package it want to install.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-07-02 12:17:06 UTC (rev 81313)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-07-02 12:23:06 UTC (rev 81314)
@@ -2,6 +2,8 @@
 
   [ Petter Reinholdtsen ]
   * Disable debug code in auto-addfirmware.
+  * Adjusted auto-addfirmware to only add contrib and non-free APT
+    sources if it can't find the package it want to install.
 
  -- Petter Reinholdtsen <pere at debian.org>  Tue, 02 Jul 2013 13:56:17 +0200
 

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-02 12:17:06 UTC (rev 81313)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/tools/auto-addfirmware	2013-07-02 12:23:06 UTC (rev 81314)
@@ -72,7 +72,9 @@
     echo $binpkginfo |  while IFS=/ read section srcpkg binpkg ; do
         echo $binpkg
 # Enable the non-free section if it is needed
-	if [ non-free = "$section" ] ; then
+	if ! apt-cache show $binpkg >/dev/null 2>&1 \
+           && ( [ non-free = "$section" ] \
+               || [ contrib = "$section" ] ) ; then 
 	    add_contrib_nonfree
 	fi
     done