[Fai-commit] r5483 - in trunk: bin debian

[Thomas Lange]

Author: lange
Date: 2009-07-24 08:50:35 +0000 (Fri, 24 Jul 2009)
New Revision: 5483

Modified:
   trunk/bin/install_packages
   trunk/debian/changelog
Log:
install_packages: do not call AptPkg function when -N was given

Modified: trunk/bin/install_packages
===================================================================
--- trunk/bin/install_packages	2009-07-23 16:29:52 UTC (rev 5482)
+++ trunk/bin/install_packages	2009-07-24 08:50:35 UTC (rev 5483)
@@ -6,7 +6,7 @@
 # install_packages -- read package config and install packages via apt-get
 #
 # This script is part of FAI (Fully Automatic Installation)
-# (c) 2000-2008, Thomas Lange, lange at informatik.uni-koeln.de
+# (c) 2000-2009, Thomas Lange, lange at informatik.uni-koeln.de
 # (c) 2003-2004, Henning Glawe, glaweh at physik.fu-berlin.de
 # (c) 2004     , Jonas Hoffmann, jhoffman at physik.fu-berlin.de
 #
@@ -27,7 +27,7 @@
 # MA 02111-1307, USA.
 #*********************************************************************
 
-my $version = "Version 4.1.6, 27-oct-2008";
+my $version = "Version 4.1.7, 24-july-2009";
 $0=~ s#.+/##; # remove path from program name
 
 # import variables: $verbose, $MAXPACKAGES, $classes, $FAI, $FAI_ROOT
@@ -383,6 +383,12 @@
     return;
   }
 
+  # no package name checking when -N was given
+  if ($opt_N) {
+    @known=@complete;
+    return;
+  }
+
   # ignore packages ending with - when using -d
   @complete = grep {!/-$/} @complete if $opt_d;
 

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-07-23 16:29:52 UTC (rev 5482)
+++ trunk/debian/changelog	2009-07-24 08:50:35 UTC (rev 5483)
@@ -1,4 +1,4 @@
-fai (3.2.23~beta6) unstable; urgency=low
+fai (3.2.23~beta7) unstable; urgency=low
 
   [ Thomas Lange ]
   * subroutines-linux: fix log message
@@ -48,6 +48,7 @@
   * LAST/50-misc: use ainsl instead of echo
   * 20-hwdetect.source, DEMO/10-misc,10-conffiles: apply patch from
     Michael, that skip somme commands on softupdate
+  * install_packages: do not call AptPkg function when -N was given
   
   [ Michael Tautschnig ]
   * setup-storage/Parser.pm: Set the boot flag on partition mounted at /, if
@@ -82,7 +83,7 @@
     debugging this).  (closes: #532321)
   * Bumped setup-storage version number to 1.1.
   
- -- Thomas Lange <lange at debian.org>  Thu, 23 Jul 2009 12:58:43 +0200
+ -- Thomas Lange <lange at debian.org>  Fri, 24 Jul 2009 10:49:59 +0200
 
 fai (3.2.20) unstable; urgency=low