Update of /cvsroot/fink/fink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv30872
Modified Files:
ChangeLog bootstrap
Log Message:
code cleanup, diagnostics fixes
Index: bootstrap
===================================================================
RCS file: /cvsroot/fink/fink/bootstrap,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- bootstrap 15 Jun 2006 19:37:36 -0000 1.2
+++ bootstrap 15 Jun 2006 19:44:43 -0000 1.3
@@ -33,26 +33,6 @@
my ($answer);
my ($script, $cmd);
-### check the perl version
-
-# acceptable perl versions: "$] value" => "human-readable version string"
-my %ok_perl_versions = (
- "5.008001" => "5.8.1",
- "5.008002" => "5.8.2",
- "5.008006" => "5.8.6"
-);
-
-if (exists $ok_perl_versions{"$]"}) {
- print "Found perl version $].\n";
-} else {
- die "\nSorry, your /usr/bin/perl is version $], but Fink can only use" . (
- join "", map {
- ( $ok_perl_versions{$_} =~ /0$/ ? "\n " : ", " ) .
- "$ok_perl_versions{$_} ($_)"
- } sort keys %ok_perl_versions
- )."\n\n";
-}
-
### patch FinkVersion.pm.in ###
my ($homebase, $file);
@@ -61,17 +41,16 @@
my $output = "$FindBin::RealBin/perlmod/Fink/FinkVersion.pm";
my $outputhandle = IO::Handle->new();
-my $input = "$output" . ".in";
+my $input = $output . '.in';
my $inputhandle = IO::Handle->new();
chomp(my $version = `cat VERSION`);
-open($inputhandle, "<$input") or die ("cannot open $input for reading");
-open($outputhandle, ">$output") or die ("cannot open $output for writing");
+open($inputhandle, '<', $input ) or die "ERROR: Cannot open $input for
reading: $!\n";
+open($outputhandle, '>', $output) or die "ERROR: Cannot open $output for
writing: $!\n";
-while (defined ($_=<$inputhandle>))
-{
+while (defined ($_=<$inputhandle>)) {
s/[EMAIL PROTECTED]@/$version/g;
- print $outputhandle "$_";
+ print $outputhandle $_;
}
close $inputhandle;
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/ChangeLog,v
retrieving revision 1.423
retrieving revision 1.424
diff -u -d -r1.423 -r1.424
--- ChangeLog 15 Jun 2006 19:37:36 -0000 1.423
+++ ChangeLog 15 Jun 2006 19:44:43 -0000 1.424
@@ -1,6 +1,7 @@
2006-06-15 Daniel Macks <[EMAIL PROTECTED]>
- * bootstrap: clarify order of function calls.
+ * bootstrap: Clarify order of function calls. Cleaner quoting,
+ improved diagnostics during FinkVersion.pm.in->FinkVersion.pm
2006-06-15 Chris Zubrzycki <[EMAIL PROTECTED]>
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
