---
TS
http://southofheaven.org
Chaos is the beginning and end, try dealing with the rest.
On 30-Dec-03, at 11:21 AM, Max Horn wrote:
Update of /cvsroot/fink/fink/perlmod/Fink In directory sc8-pr-cvs1:/tmp/cvs-serv23107
Modified Files: Bootstrap.pm ChangeLog Command.pm Engine.pm NetAccess.pm PkgVersion.pm SelfUpdate.pm Services.pm Validation.pm Log Message: whitespace fixes
Index: Bootstrap.pm =================================================================== RCS file: /cvsroot/fink/fink/perlmod/Fink/Bootstrap.pm,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- Bootstrap.pm 24 Dec 2003 06:59:04 -0000 1.48 +++ Bootstrap.pm 30 Dec 2003 18:21:07 -0000 1.49 @@ -277,204 +277,203 @@
sub get_packageversion {
- my ($packageversion, $packagerevision); - - chomp($packageversion = `cat VERSION`); - if ($packageversion =~ /cvs/) { + my ($packageversion, $packagerevision); + + chomp($packageversion = `cat VERSION`); + if ($packageversion =~ /cvs/) { my @now = gmtime(time); - $packagerevision = sprintf("%04d%02d%02d.%02d%02d", - $now[5]+1900, $now[4]+1, $now[3], - $now[2], $now[1]); - } else { - $packagerevision = "1"; - } - return ($packageversion, $packagerevision); + $packagerevision = sprintf("%04d%02d%02d.%02d%02d", + $now[5]+1900, $now[4]+1, $now[3], + $now[2], $now[1]); + } else { + $packagerevision = "1"; + } + return ($packageversion, $packagerevision); }
sub create_tarball { - -my $bpath = shift; -my $package = shift; -my $packageversion = shift; -my $packagefiles = shift; - -my ($cmd, $script); - -print "Creating $package tarball...\n"; - -$script = ""; -if (not -d "$bpath/src") { - $script .= "mkdir -p $bpath/src\n"; -} - -$script .= - "tar -cf $bpath/src/$package-$packageversion.tar ". - "$packagefiles\n"; - -my $result = 0; - -foreach $cmd (split(/\n/,$script)) { - next unless $cmd; # skip empty lines - - if (&execute($cmd)) { - print "ERROR: Can't create tarball.\n"; - $result = 1; - } -} -return $result; + + my $bpath = shift; + my $package = shift; + my $packageversion = shift; + my $packagefiles = shift; + + my ($cmd, $script); + + print "Creating $package tarball...\n"; + + $script = ""; + if (not -d "$bpath/src") { + $script .= "mkdir -p $bpath/src\n"; + } + + $script .= + "tar -cf $bpath/src/$package-$packageversion.tar $packagefiles\n"; + + my $result = 0; + + foreach $cmd (split(/\n/,$script)) { + next unless $cmd; # skip empty lines + + if (&execute($cmd)) { + print "ERROR: Can't create tarball.\n"; + $result = 1; + } + } + return $result; }
sub copy_description {
-
-my $script = shift;
-my $bpath = shift;
-my $package = shift;
-my $packageversion = shift;
-my $packagerevision = shift;
-
-my ($cmd);
-
-print "Copying package description(s)...\n";
-
-if (not -d "$bpath/fink/debs") {
- $script .= "mkdir -p $bpath/fink/debs\n";
-}
-if (not -d "$bpath/fink/dists/local/bootstrap/finkinfo") {
- $script .= "mkdir -p $bpath/fink/dists/local/bootstrap/finkinfo\n";
-}
-my $md5 = &file_MD5_checksum("$bpath/src/$package-$packageversion.tar");
-$script .= "/usr/bin/sed -e 's/[EMAIL PROTECTED]@/$packageversion/' -e 's/[EMAIL PROTECTED]@/$packagerevision/' -e 's/[EMAIL PROTECTED]@/$md5/' <$package.info.in >$bpath/fink/dists/local/bootstrap/finkinfo/$package- $packageversion.info\n";
-$script .= "/bin/chmod 644 $bpath/fink/dists/local/bootstrap/finkinfo/*.*\n";
-
-my $result = 0;
-
-foreach $cmd (split(/\n/,$script)) {
- next unless $cmd; # skip empty lines
-
- if (&execute($cmd)) {
- print "ERROR: Can't copy package description(s).\n";
- $result = 1;
- }
-}
-return $result;
+
+ my $script = shift;
+ my $bpath = shift;
+ my $package = shift;
+ my $packageversion = shift;
+ my $packagerevision = shift;
+
+ my ($cmd);
+
+ print "Copying package description(s)...\n";
+
+ if (not -d "$bpath/fink/debs") {
+ $script .= "mkdir -p $bpath/fink/debs\n";
+ }
+ if (not -d "$bpath/fink/dists/local/bootstrap/finkinfo") {
+ $script .= "mkdir -p $bpath/fink/dists/local/bootstrap/finkinfo\n";
+ }
+ my $md5 = &file_MD5_checksum("$bpath/src/$package-$packageversion.tar");
+ $script .= "/usr/bin/sed -e 's/[EMAIL PROTECTED]@/$packageversion/' -e 's/[EMAIL PROTECTED]@/$packagerevision/' -e 's/[EMAIL PROTECTED]@/$md5/' <$package.info.in >$bpath/fink/dists/local/bootstrap/finkinfo/$package- $packageversion.info\n";
+ $script .= "/bin/chmod 644 $bpath/fink/dists/local/bootstrap/finkinfo/*.*\n";
+
+ my $result = 0;
+
+ foreach $cmd (split(/\n/,$script)) {
+ next unless $cmd; # skip empty lines
+
+ if (&execute($cmd)) {
+ print "ERROR: Can't copy package description(s).\n";
+ $result = 1;
+ }
+ }
+ return $result;
}
sub inject_package {
-
-import Fink::Services qw(&read_config);
-require Fink::Config;
-
-my $package = shift;
-my $packagefiles = shift;
-my $info_script = shift;
-
-### locate Fink installation
-
-my $param = shift;
-
-my ($guessed, $path, $bpath);
-
-$guessed = "";
-
-if (defined $param) {
- $bpath = $param;
-} else {
- $bpath = undef;
- if (exists $ENV{PATH}) {
- foreach $path (split(/:/, $ENV{PATH})) {
- if (substr($path,-1) eq "/") {
- $path = substr($path,0,-1);
- }
- if (-f "$path/init.sh" and -f "$path/fink") {
- $path =~ /^(.+)\/[^\/]+$/;
- $bpath = $1;
- last;
- }
- }
- }
- if (not defined $bpath or $bpath eq "") {
- $bpath = "/sw";
- }
- $guessed = " (guessed)";
-}
-unless (-f "$bpath/bin/fink" and
- -f "$bpath/bin/init.sh" and
- -f "$bpath/etc/fink.conf" and
- -d "$bpath/fink/dists") {
- &print_breaking("The directory '$bpath'$guessed does not contain a ".
- "Fink installation. Please provide the correct path ".
- "as a parameter to this script.");
- return 1;
-}
-
-### get version
-
-my ($packageversion, $packagerevision) = &get_packageversion();
-
-### load configuration
-
-my $config = &read_config("$bpath/etc/fink.conf",
- { Basepath => $bpath });
-
-### parse config file for root method
-
-# TODO: use setting from config
-# for now, we just use sudo...
-
-if ($> != 0) {
- exit &execute("sudo ./inject.pl $bpath");
-}
-umask oct("022");
-
-### check that local/bootstrap is in the Trees list
-
-my $trees = $config->param("Trees");
-if ($trees =~ /^\s*$/) {
- print "Adding a Trees line to fink.conf...\n";
- $config->set_param("Trees", "local/main stable/main stable/crypto local/bootstrap");
- $config->save();
-} else {
- if (grep({$_ eq "local/bootstrap"} split(/\s+/, $trees)) < 1) {
- print "Adding local/bootstrap to the Trees line in fink.conf...\n";
- $config->set_param("Trees", "$trees local/bootstrap");
- $config->save();
- }
-}
-
-### create tarball for the package
-
-my $result = &create_tarball($bpath, $package, $packageversion, $packagefiles);
-if ($result == 1 ) {
- return $result;
-}
-
-### create and copy description file
-
-$result = ©_description($info_script, $bpath, $package, $packageversion, $packagerevision);
-if ($result == 1 ) {
- return $result;
-}
-
-### install the package
-
-print "Installing package...\n";
-print "\n";
-
-if (&execute("$bpath/bin/fink install $package")) {
- print "\n";
- &print_breaking("Installing the new $package package failed. ".
+
+ import Fink::Services qw(&read_config);
+ require Fink::Config;
+
+ my $package = shift;
+ my $packagefiles = shift;
+ my $info_script = shift;
+
+ ### locate Fink installation
+
+ my $param = shift;
+
+ my ($guessed, $path, $bpath);
+
+ $guessed = "";
+
+ if (defined $param) {
+ $bpath = $param;
+ } else {
+ $bpath = undef;
+ if (exists $ENV{PATH}) {
+ foreach $path (split(/:/, $ENV{PATH})) {
+ if (substr($path,-1) eq "/") {
+ $path = substr($path,0,-1);
+ }
+ if (-f "$path/init.sh" and -f "$path/fink") {
+ $path =~ /^(.+)\/[^\/]+$/;
+ $bpath = $1;
+ last;
+ }
+ }
+ }
+ if (not defined $bpath or $bpath eq "") {
+ $bpath = "/sw";
+ }
+ $guessed = " (guessed)";
+ }
+ unless (-f "$bpath/bin/fink" and
+ -f "$bpath/bin/init.sh" and
+ -f "$bpath/etc/fink.conf" and
+ -d "$bpath/fink/dists") {
+ &print_breaking("The directory '$bpath'$guessed does not contain a ".
+ "Fink installation. Please provide the correct path ".
+ "as a parameter to this script.");
+ return 1;
+ }
+
+ ### get version
+
+ my ($packageversion, $packagerevision) = &get_packageversion();
+
+ ### load configuration
+
+ my $config = &read_config("$bpath/etc/fink.conf",
+ { Basepath => $bpath });
+
+ ### parse config file for root method
+
+ # TODO: use setting from config
+ # for now, we just use sudo...
+
+ if ($> != 0) {
+ exit &execute("sudo ./inject.pl $bpath");
+ }
+ umask oct("022");
+
+ ### check that local/bootstrap is in the Trees list
+
+ my $trees = $config->param("Trees");
+ if ($trees =~ /^\s*$/) {
+ print "Adding a Trees line to fink.conf...\n";
+ $config->set_param("Trees", "local/main stable/main stable/crypto local/bootstrap");
+ $config->save();
+ } else {
+ if (grep({$_ eq "local/bootstrap"} split(/\s+/, $trees)) < 1) {
+ print "Adding local/bootstrap to the Trees line in fink.conf...\n";
+ $config->set_param("Trees", "$trees local/bootstrap");
+ $config->save();
+ }
+ }
+
+ ### create tarball for the package
+
+ my $result = &create_tarball($bpath, $package, $packageversion, $packagefiles);
+ if ($result == 1 ) {
+ return $result;
+ }
+
+ ### create and copy description file
+
+ $result = ©_description($info_script, $bpath, $package, $packageversion, $packagerevision);
+ if ($result == 1 ) {
+ return $result;
+ }
+
+ ### install the package
+
+ print "Installing package...\n";
+ print "\n";
+
+ if (&execute("$bpath/bin/fink install $package")) {
+ print "\n";
+ &print_breaking("Installing the new $package package failed. ".
"The description and the tarball were installed, though. ".
"You can retry at a later time by issuing the ".
"appropriate fink commands.");
-} else {
- print "\n";
- &print_breaking("Your Fink installation in '$bpath' was updated with ".
+ } else {
+ print "\n";
+ &print_breaking("Your Fink installation in '$bpath' was updated with ".
"a new $package package.");
-}
-print "\n";
-
-return 0;
+ }
+ print "\n";
+
+ return 0;
}
### EOF
Index: ChangeLog =================================================================== RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v retrieving revision 1.494 retrieving revision 1.495 diff -u -d -r1.494 -r1.495 --- ChangeLog 30 Dec 2003 11:18:00 -0000 1.494 +++ ChangeLog 30 Dec 2003 18:21:07 -0000 1.495 @@ -14,7 +14,7 @@ 2003-12-28 Daniel Macks <[EMAIL PROTECTED]>
- * PkgVersion.pm: Type:splitoff is redundant: switch to checkiing + * PkgVersion.pm: Type:splitoff is redundant: switch to checking for presence of parent link. Now okay to use Type in splitoffs (else inherits from parent). Added Type:none to clear. * Validation.pm: Allow Type:none. Allow Type and UpdatePOD in @@ -36,9 +36,9 @@
2003-12-24 Dave Morrison <[EMAIL PROTECTED]>
- * Services.pm: export "read_properties_lines"
- * Mirror.pm: set a default value for Master mirror, if config file
- not present
+ * Services.pm: export "read_properties_lines"
+ * Mirror.pm: set a default value for Master mirror, if config file
+ not present
2003-12-23 Dave Morrison <[EMAIL PROTECTED]>
@@ -61,19 +61,19 @@
2003-12-23 Daniel Macks <[EMAIL PROTECTED]>
- * PkgVersion.pm: Support %lV and %lv as raw and punctionation-free
+ * PkgVersion.pm: Support %lV and %lv as raw and punctionation-free
values of Type version string (if provided).
* Package.pm: Support %lv in Package.
* Validation.pm: Allow %lv in Package (for info filename check).
2003-12-23 Daniel Macks <[EMAIL PROTECTED]>
- * Validation.pm: Added support for Type java (version mandatory).
+ * Validation.pm: Added support for Type java (version mandatory).
2003-12-22 Daniel Macks <[EMAIL PROTECTED]>
- * Validation.pm: Added support for Type python, guile, ruby - (version optional, except mandatory for python). + * Validation.pm: Added support for Type python, guile, ruby + (version optional, except mandatory for python).
2003-12-22 Dave Morrison <[EMAIL PROTECTED]>
@@ -335,9 +335,9 @@ vs. logically true). Changed it back.
2003-11-20 Michael G Schwern <[EMAIL PROTECTED]>
-
+
* FinkVersion.pm.in: Removing hard coded @[EMAIL PROTECTED] Using Fink::Config
- instead.
+ instead.
2003-11-20 Michael G Schwern <[EMAIL PROTECTED]>
@@ -1733,7 +1733,7 @@
* PkgVersion.pm (add_splitoff): Removed annoying debug output ("Found a
splitoff")
-
+
* Services.pm (read_properties_lines): Handle nested heredocs
correctly, and if errors are encountered, once more output the
affected filename.
Index: Command.pm =================================================================== RCS file: /cvsroot/fink/fink/perlmod/Fink/Command.pm,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Command.pm 4 Dec 2003 22:47:45 -0000 1.6 +++ Command.pm 30 Dec 2003 18:21:07 -0000 1.7 @@ -216,7 +216,7 @@ return !$nok; } - +
=item touch
Index: Engine.pm =================================================================== RCS file: /cvsroot/fink/fink/perlmod/Fink/Engine.pm,v retrieving revision 1.146 retrieving revision 1.147 diff -u -d -r1.146 -r1.147 --- Engine.pm 30 Dec 2003 11:18:00 -0000 1.146 +++ Engine.pm 30 Dec 2003 18:21:07 -0000 1.147 @@ -1179,18 +1179,18 @@ foreach $dname (@candidates) { if ( $dname =~ $matchstr ) { push(@matched, $dname); - } else { - push(@notmatched, $dname); + } else { + push(@notmatched, $dname); } } if (1 == @matched ) { - # we have exactly one match, use it + # we have exactly one match, use it $dname = pop(@matched); $found = 1; } elsif (@matched > 1) { - # we have multiple matches - # reorder list so that matched ones are at the top - @candidates = (@matched, @notmatched); + # we have multiple matches + # reorder list so that matched ones are at the top + @candidates = (@matched, @notmatched); } } }
Index: NetAccess.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/NetAccess.pm,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- NetAccess.pm 30 Dec 2003 11:18:00 -0000 1.25
+++ NetAccess.pm 30 Dec 2003 18:21:07 -0000 1.26
@@ -184,7 +184,7 @@
if(defined $mirror_list[0]) {
$url = $mirror_list[0]->get_site();
}
-
+
### if the file already exists, ask user what to do
if (-f $file && !$cont && !$dryrun) {
$result = &prompt_selection_new("The file \"$file\" already exists, how do you want to proceed?",
@@ -216,8 +216,8 @@
$url .= $masterpath . $file; # SourceRenamed tarball name
} else {
$url .= $path . $basename;
- }
-
+ }
+
### fetch $url to $file
if (!$dryrun && -f $file) {
Index: PkgVersion.pm =================================================================== RCS file: /cvsroot/fink/fink/perlmod/Fink/PkgVersion.pm,v retrieving revision 1.195 retrieving revision 1.196 diff -u -d -r1.195 -r1.196 --- PkgVersion.pm 30 Dec 2003 11:18:00 -0000 1.195 +++ PkgVersion.pm 30 Dec 2003 18:21:07 -0000 1.196 @@ -222,7 +222,7 @@ $self->{'maintainer'} = $parent->{'maintainer'}; } if ($parent->has_param('essential')) { - $self->{'_parentessential'} = $parent->{'essential'}; + $self->{'_parentessential'} = $parent->{'essential'}; }
# handle inherited fields
@@ -759,21 +759,21 @@
@altspec = split(/\s*\|\s*/, $altspecs);
$loopcount = 0;
$found = 0;
- BUILDDEPENDSLOOP: foreach $depspec (@altspec) {
+ BUILDDEPENDSLOOP: foreach $depspec (@altspec) {
$loopcount++;
if ($depspec =~ /^\s*([0-9a-zA-Z.\+-]+)\s*\((.+)\)\s*$/) {
- $depname = $1;
- $versionspec = $2;
+ $depname = $1;
+ $versionspec = $2;
} elsif ($depspec =~ /^\s*([0-9a-zA-Z.\+-]+)\s*$/) {
- $depname = $1;
- $versionspec = "";
+ $depname = $1;
+ $versionspec = "";
} else {
- die "Illegal spec format: $depspec\n";
+ die "Illegal spec format: $depspec\n";
}
$package = Fink::Package->package_by_name($depname);
$found = 1 if defined $package;
if ((Fink::Config::verbosity_level() > 2 && not defined $package) || ($forceoff && ($loopcount >= scalar(@altspec) && $found == 0))) {
- print "WARNING: While resolving $oper \"$depspec\" for package \"".$self->get_fullname()."\", package \"$depname\" was not found.\n";
+ print "WARNING: While resolving $oper \"$depspec\" for package \"".$self->get_fullname()."\", package \"$depname\" was not found.\n";
}
if (not defined $package) {
next BUILDDEPENDSLOOP;
@@ -782,16 +782,16 @@
$currentpackage = $self->get_name();
@dependslist = $package->get_all_providers();
foreach $dependent (@dependslist) {
- $dependentname = $dependent->get_name();
- if ($dependent->param_boolean("BuildDependsOnly") && lc($field) eq "depends") {
- if ($dependentname eq $depname) {
- print "\nWARNING: The package $currentpackage Depends on $depname,\n\t but $depname only allows things to BuildDepend on it.\n\n";
- } else {
- print "\nWARNING: The package $currentpackage Depends on $depname\n\t (which is provided by $dependentname),\n\t but $dependentname only allows things to BuildDepend on it.\n\n";
+ $dependentname = $dependent->get_name();
+ if ($dependent->param_boolean("BuildDependsOnly") && lc($field) eq "depends") {
+ if ($dependentname eq $depname) {
+ print "\nWARNING: The package $currentpackage Depends on $depname,\n\t but $depname only allows things to BuildDepend on it.\n\n";
+ } else {
+ print "\nWARNING: The package $currentpackage Depends on $depname\n\t (which is provided by $dependentname),\n\t but $dependentname only allows things to BuildDepend on it.\n\n";
+ }
}
- }
}
- }
+ }
}
}
# now we continue to assemble the larger @speclist
@@ -806,8 +806,8 @@
$split_idx = @speclist;
unless (lc($field) eq "conflicts") {
foreach $splitoff (@{$self->{_splitoffs}}) {
- push @speclist,
- split(/\s*\,\s*/, $splitoff->param_default($field, ""));
+ push @speclist,
+ split(/\s*\,\s*/, $splitoff->param_default($field, ""));
}
}
}
@@ -1241,7 +1241,7 @@
# Determine unpack command
$unpack_cmd = "cp $found_archive .";
if ($archive =~ /[\.\-]tar\.(gz|z|Z)$/ or $archive =~ /\.tgz$/) {
- $unpack_cmd = "$gzip -dc $found_archive | $tarcommand $renamelist";
+ $unpack_cmd = "$gzip -dc $found_archive | $tarcommand $renamelist";
} elsif ($archive =~ /[\.\-]tar\.bz2$/) {
$unpack_cmd = "$bzip2 -dc $found_archive | $tarcommand $renamelist";
} elsif ($archive =~ /[\.\-]tar$/) {
@@ -1249,7 +1249,7 @@
} elsif ($archive =~ /\.zip$/) {
$unpack_cmd = "$unzip -o $found_archive";
}
-
+
# calculate destination directory
$destdir = "$buildpath/$bdir";
if ($i > 1) {
@@ -1405,7 +1405,7 @@
$compile_script = $self->param("CompileScript");
} else {
if ($self->param("_type") eq "perl") {
- my ($perldirectory, $perlarchdir, $perlcmd) = $self->get_perl_dir_arch();
+ my ($perldirectory, $perlarchdir, $perlcmd) = $self->get_perl_dir_arch();
$compile_script =
"$perlcmd Makefile.PL \%c\n".
"make\n";
@@ -1692,16 +1692,16 @@
my ($dummy, $darwin_version, $darwin_major_version);
($dummy,$dummy,$darwin_version) = uname();
if ($darwin_version =~ /(\d+)/) {
- $darwin_major_version = $1;
+ $darwin_major_version = $1;
} else {
- die "No major version number for darwin!";
+ die "No major version number for darwin!";
}
if (not $depline =~ /\bdarwin\b/) { - if (not $depline eq '') { - $depline = $depline . ", "; - } - $depline = $depline . "darwin (>= $darwin_major_version-1)"; + if (not $depline eq '') { + $depline = $depline . ", "; + } + $depline = $depline . "darwin (>= $darwin_major_version-1)"; }
# FIXME: make sure there are no linebreaks in the following fields @@ -2220,7 +2220,7 @@ if ($self->has_param("_typeversion_raw")) { $perlversion = $self->param("_typeversion_raw"); $perldirectory = "/" . $perlversion; - } + } ### PERL= needs a full path or you end up with ### perlmods trying to run ../perl$perlversion my $perlcmd = get_path('perl'.$perlversion); @@ -2254,7 +2254,7 @@ $package = $package->{parent}; }
- if ($include_parent) { + if ($include_parent) { $pkg = $package->param('package'); unless ($name eq $pkg && not $include_self) { push(@splits, $pkg); @@ -2266,9 +2266,9 @@ unless ($name eq $pkg && not $include_self) { push(@splits, $pkg); } - } + }
- return @splits; + return @splits; }
### EOF
Index: SelfUpdate.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/SelfUpdate.pm,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- SelfUpdate.pm 30 Dec 2003 11:18:01 -0000 1.58
+++ SelfUpdate.pm 30 Dec 2003 18:21:07 -0000 1.59
@@ -72,7 +72,7 @@
$answer = "rsync";
}
else {
- $answer = "point";
+ $answer = "point";
}
&print_breaking("fink is setting your default update method to $answer \n");
$config->set_param("SelfUpdateMethod", $answer);
@@ -90,7 +90,7 @@
"Stick to point releases" => "point" ) );
$config->set_param("SelfUpdateMethod", $answer);
$config->save();
- }
+ }
# By now the config param SelfUpdateMethod should be set.
if (($config->param("SelfUpdateMethod") eq "cvs") and $useopt != 2){
@@ -122,13 +122,13 @@
"to rsync?",1);
if (! $answer) {
return;
- }
+ }
$config->set_param("SelfUpdateMethod", "rsync");
$config->save();
&do_direct_rsync();
&do_finish();
return;
- }
+ }
if (($selfupdatemethod ne "cvs") and $useopt == 1) {
$answer =
&prompt_boolean("The current selfupdate method is $selfupdatemethod. "
Index: Services.pm =================================================================== RCS file: /cvsroot/fink/fink/perlmod/Fink/Services.pm,v retrieving revision 1.85 retrieving revision 1.86 diff -u -d -r1.85 -r1.86 --- Services.pm 30 Dec 2003 11:18:01 -0000 1.85 +++ Services.pm 30 Dec 2003 18:21:07 -0000 1.86 @@ -353,7 +353,7 @@ $lastindex = 0;
foreach (@lines) { - chomp; + chomp; next if /^\s*\#/; # skip comments if (/^([0-9A-Za-z_.\-]+)\:\s*(\S.*?)\s*$/) { $lastkey = $notLC ? $1 : lc $1; @@ -370,7 +370,7 @@ }
return $hash; - } +}
=item execute
Index: Validation.pm =================================================================== RCS file: /cvsroot/fink/fink/perlmod/Fink/Validation.pm,v retrieving revision 1.87 retrieving revision 1.88 diff -u -d -r1.87 -r1.88 --- Validation.pm 28 Dec 2003 22:55:56 -0000 1.87 +++ Validation.pm 30 Dec 2003 18:21:07 -0000 1.88 @@ -132,7 +132,7 @@ # dependencies: 'depends', 'builddepends', - # need documentation for buildconflicts + # need documentation for buildconflicts 'buildconflicts', 'provides', 'conflicts', @@ -146,16 +146,16 @@ # unpack phase: 'custommirror', 'source', - #sourceN + #sourceN 'sourcedirectory', 'nosourcedirectory', - #sourceNextractdir + #sourceNextractdir 'sourcerename', - #sourceNRename + #sourceNRename 'source-md5', - #sourceN-md5 + #sourceN-md5 'tarfilesrename', - #tarNfilesrename + #tarNfilesrename # patch phase: 'updateconfigguess', 'updateconfigguessindirs', @@ -181,8 +181,8 @@ 'shlibs', 'runtimevars', 'splitoff', - #splitoffN - #files + #splitoffN + #files # build phase: 'preinstscript', 'postinstscript', @@ -207,7 +207,7 @@ ( # initial data: 'package', - #documentation is ambiguous about license + #documentation is ambiguous about license 'type', 'license', # dependencies: @@ -221,11 +221,11 @@ 'suggests', 'enhances', 'pre-depends', - #documentation seems incorrect about essential + #documentation seems incorrect about essential 'essential', 'builddependsonly', # install phase: - 'updatepod', + 'updatepod', 'installscript', 'jarfiles', 'docfiles',
-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
Free Linux Tutorials. Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
PGP.sig
Description: This is a digitally signed message part
