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

[fai-repository at svn.debian.org]

Author: lange
Date: 2005-12-06 21:08:26 +0000 (Tue, 06 Dec 2005)
New Revision: 3155

Modified:
   trunk/bin/install_packages
   trunk/debian/changelog
Log:
add more warnings


Modified: trunk/bin/install_packages
===================================================================
--- trunk/bin/install_packages	2005-12-05 23:12:59 UTC (rev 3154)
+++ trunk/bin/install_packages	2005-12-06 21:08:26 UTC (rev 3155)
@@ -25,7 +25,7 @@
 # MA 02111-1307, USA.
 #*********************************************************************
 
-my $version = "Version 2.17, 29-nov-2005";
+my $version = "Version 2.18, 6-dec-2005";
 $0=~ s#.+/##; # remove path from program name
 
 # import variables: $verbose, $MAXPACKAGES, $classes, $FAI, $FAI_ROOT
@@ -218,11 +218,12 @@
 
     if (/^PACKAGES\s+(\S+)\s*/) {
       ($type,$cllist) = ($1,$');
+      warn "WARNING: Unknow action $type after PACKAGES\n." unless defined $command{$type};
       # by default no classes are listed after this command so doit
       $doit = 1;
       if ($cllist) {
 	# no classes specified after PACKAGES command
-      # so add all packages listed
+        # so add all packages listed
 	# use packages on for a list of classes
 	$doit = 0; # assume no class is defined
 	@oclasses = split(/\s+/,$cllist);
@@ -232,7 +233,9 @@
       next;
     }
 
-    warn "PACKAGES .. line missing in $filename\n",next unless $type;
+    # warning if uppercase letters are found (package are always lowercase)
+    warn "WARNING: Uppercase character found in package name in line $_\n" if $_ =~ /[A-Z]/;
+    warn "ERROR: PACKAGES .. line missing in $filename\n",next unless $type;
     push @{$list{$type}}, split if $doit;
   }
 }

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-12-05 23:12:59 UTC (rev 3154)
+++ trunk/debian/changelog	2005-12-06 21:08:26 UTC (rev 3155)
@@ -14,7 +14,8 @@
     or amd64 (closes: #339098), check if $FAI_CONFIGDIR is valid
   * install_packages: ignore packages ending with - when using -d
     (closes: #334333), remove backtick evaluation (closes: #322157), add
-    -R to default aptitude call, add aptitude-r for download only mode
+    -R to default aptitude call, add aptitude-r for download only mode,
+    add more warnings
   * lib/create_ramdisk: make /etc/network/run/ifstate writable
     (closes: #312128) 
   * fai-mirror: add -i to egrep (closes: #312508), add option