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

[fai-repository at svn.debian.org]

Author: lange
Date: 2005-11-10 23:33:15 +0000 (Thu, 10 Nov 2005)
New Revision: 3034

Modified:
   trunk/bin/install_packages
   trunk/debian/changelog
Log:
merge people/lazyboy/bugfixes/334333


Modified: trunk/bin/install_packages
===================================================================
--- trunk/bin/install_packages	2005-11-10 23:28:59 UTC (rev 3033)
+++ trunk/bin/install_packages	2005-11-10 23:33:15 UTC (rev 3034)
@@ -25,7 +25,7 @@
 # MA 02111-1307, USA.
 #*********************************************************************
 
-my $version = "Version 2.14, 28-apr-2005";
+my $version = "Version 2.15, 11-nov-2005";
 $0=~ s#.+/##; # remove path from program name
 
 # import variables: $verbose, $MAXPACKAGES, $classes, $FAI, $FAI_ROOT
@@ -313,6 +313,9 @@
   # @unknown contains the unknown packages
   # @known contains the known packages
 
+  # ignore packages ending with - when using -d
+  @complete = grep {!/-$/} @complete if $opt_d; 
+
   foreach (reverse @complete) {
     my $pack;
     if ( /^(.*)[_=+-]$/ and $1 and $cache->exists($1)) {

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-11-10 23:28:59 UTC (rev 3033)
+++ trunk/debian/changelog	2005-11-10 23:33:15 UTC (rev 3034)
@@ -10,8 +10,10 @@
   * fixed fai-cd hardcoded sources.list for the install client to be
     generated, code by Michael Tautschnig (closes: #320024) and at least
     partially #329547
+  * install_packages: ignore packages ending with - when using -d
+    (closes: #334333)
 
- -- Thomas Lange <lange at debian.org>  Fri, 11 Nov 2005 00:07:40 +0100
+ -- Thomas Lange <lange at debian.org>  Fri, 11 Nov 2005 00:32:57 +0100
 
 fai (2.8.4) unstable; urgency=high