This is the mail archive of the cygwin-apps mailing list for the Cygwin project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

two small patches for genini


Hi,

I am trying to create a local setup server with a 
custom package for selection of locally required packages.

I stumbled upon an error produced by genini:

./genini: unrecognized input at line file ./release/_update-info-dir,
line 4.

In the end, I found the offending line in 

./release/_obsolete/XFree86-xwinclip/setup.ini. 

Indeed line 4, which reads:

requires:

I'd like to suggest a small patch to genini, which would 
produce a more accurate error message in this case:

--- genini-cvs/genini	2007-02-13 17:41:27.000000000 +0100
+++ ./genini	2007-02-13 03:43:24.000000000 +0100
@@ -139,7 +139,7 @@
 	    $what = $_ . "\n";
 	    next;
 	};
-	die "$0: unrecognized input at line file $ARGV[0], line $.\n";
+	die "$0: unrecognized input at file $f, line $.\n";
     }
 }
 
Because there are 3 more setup.hint files that have a 
"requires:" line with no packages after the colon, I 
also applied the following patch to make that syntax
acceptable:

--- genini-cvs/genini	2007-02-13 17:41:27.000000000 +0100
+++ genini	2007-02-13 04:14:58.000000000 +0100
@@ -120,7 +120,7 @@
 	    $what = '';
 	    next;
 	};
-	/^([^:]+):\s+(.*)$/ and do {
+	/^([^:]+):\s*(.*)$/ and do {
 	    my $key = $1;
 	    my $val = $2;
 	    if ($key !~ /^(?:prev|curr|test)/) {

Cheers,
Servaas.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]