[Fai-commit] r2972 - in people/lazyboy/r-2_8_4-fai-cd_sarge_fixes: debian scripts

[fai-repository at svn.debian.org]

Author: lazyboy-guest
Date: 2005-10-20 23:01:54 +0000 (Thu, 20 Oct 2005)
New Revision: 2972

Modified:
   people/lazyboy/r-2_8_4-fai-cd_sarge_fixes/debian/changelog
   people/lazyboy/r-2_8_4-fai-cd_sarge_fixes/scripts/install_packages
Log:
merging /tags/r-2_8_4 at 2910 /people/lazyboy/bugfixes/334333 at 2968 in here - fai-cd works out of the box here

Modified: people/lazyboy/r-2_8_4-fai-cd_sarge_fixes/debian/changelog
===================================================================
--- people/lazyboy/r-2_8_4-fai-cd_sarge_fixes/debian/changelog	2005-10-20 20:53:54 UTC (rev 2971)
+++ people/lazyboy/r-2_8_4-fai-cd_sarge_fixes/debian/changelog	2005-10-20 23:01:54 UTC (rev 2972)
@@ -1,22 +1,12 @@
-fai (2.8.4.lazyboy.bugfix.320024.09) unstable; urgency=low
+fai (2.8.4.lazyboy.fai-cd-fixes.01) unstable; urgency=low
 
-  * add small fix from Michael 
-
- -- Henning Sprang <henning at sprang.de>  Thu, 20 Oct 2005 16:37:54 +0200
-
-fai (2.8.4.lazyboy.bugfix.320024.08) unstable; urgency=low
   * fixed fai-cd hardcoded sources.list for the install client to be generated
     more flexible -fixes #320024 and at least party #329547.
     Code by Michael Tautschnig
+  * Testing possible fix for 33433
 
- -- Henning Sprang <henning at sprang.de>  Sun, 16 Oct 2005 21:36:28 +0200
+ -- Henning Sprang <henning at sprang.de>  Tue, 18 Oct 2005 20:34:37 +0200
 
-fai (2.8.4.lazyboy.bugfix.320024.01) unstable; urgency=low
-
-  *  fixing fai-cd bug - changed string testing to stable in fai-cd script
-
- -- Henning Sprang <henning at sprang.de>  Sat, 15 Oct 2005 21:50:34 +0200
-
 fai (2.8.4) unstable; urgency=high
 
   * fix important bug: remove non-US entry (closes: #310392)

Modified: people/lazyboy/r-2_8_4-fai-cd_sarge_fixes/scripts/install_packages
===================================================================
--- people/lazyboy/r-2_8_4-fai-cd_sarge_fixes/scripts/install_packages	2005-10-20 20:53:54 UTC (rev 2971)
+++ people/lazyboy/r-2_8_4-fai-cd_sarge_fixes/scripts/install_packages	2005-10-20 23:01:54 UTC (rev 2972)
@@ -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)) {