[Fai-commit] r3032 - in people/Mrfai/2.8.4-sarge-fixes: debian scripts

[fai-repository at svn.debian.org]

Author: lange
Date: 2005-11-10 23:27:01 +0000 (Thu, 10 Nov 2005)
New Revision: 3032

Modified:
   people/Mrfai/2.8.4-sarge-fixes/debian/changelog
   people/Mrfai/2.8.4-sarge-fixes/scripts/install_packages
Log:
merge /people/lazyboy/bugfixes/334333


Modified: people/Mrfai/2.8.4-sarge-fixes/debian/changelog
===================================================================
--- people/Mrfai/2.8.4-sarge-fixes/debian/changelog	2005-11-10 23:10:43 UTC (rev 3031)
+++ people/Mrfai/2.8.4-sarge-fixes/debian/changelog	2005-11-10 23:27:01 UTC (rev 3032)
@@ -1,10 +1,13 @@
 fai (2.8.4sarge1) sarge-proposed-updates; urgency=low
 
-   * fixed fai-cd hardcoded sources.list for the install client to be
-    generated, code by Michael Tautschnig (closes: #320024) and at least
-    partially #329547
+   */debian/rules: ignore .svn directories
+   * fai-cd: fixed 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>  Thu, 10 Nov 2005 23:58:47 +0100
+ -- Thomas Lange <lange at debian.org>  Fri, 11 Nov 2005 00:25:25 +0100
 
 fai (2.8.4) unstable; urgency=high
 

Modified: people/Mrfai/2.8.4-sarge-fixes/scripts/install_packages
===================================================================
--- people/Mrfai/2.8.4-sarge-fixes/scripts/install_packages	2005-11-10 23:10:43 UTC (rev 3031)
+++ people/Mrfai/2.8.4-sarge-fixes/scripts/install_packages	2005-11-10 23:27:01 UTC (rev 3032)
@@ -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)) {