Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28923/perlmod/Fink
Modified Files:
Bootstrap.pm ChangeLog Finally.pm
Log Message:
Finally fix and injecting fix
Index: Bootstrap.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Bootstrap.pm,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- Bootstrap.pm 17 Mar 2006 06:42:07 -0000 1.136
+++ Bootstrap.pm 22 Mar 2006 22:46:53 -0000 1.137
@@ -41,7 +41,7 @@
$VERSION = 1.00;
@ISA = qw(Exporter);
@EXPORT = qw();
- @EXPORT_OK = qw(&bootstrap &get_bsbase &check_host &check_files
&fink_packagefiles &locate_Fink &get_packageversion &find_rootmethod
&create_tarball ©_description &inject_package &modify_description
&get_version_revision &read_version_revision &additional_packages);
+ @EXPORT_OK = qw(&bootstrap &get_bsbase &check_host &check_files
&fink_packagefiles &locate_Fink &find_rootmethod &create_tarball
©_description &inject_package &modify_description &get_version_revision
&read_version_revision &additional_packages);
%EXPORT_TAGS = ( ); # eg: TAG => [ qw!name1 name2!
],
}
our @EXPORT_OK;
@@ -67,12 +67,11 @@
my $packagefiles = fink_packagefiles();
my ($notlocated, $basepath) = locate_Fink();
my ($notlocated, $basepath) = locate_Fink($param);
- my ($version, $revision) = get_packageversion();
find_rootmethod($bpath);
my $result = create_tarball($bpath, $package, $packageversion,
$packagefiles);
my $result = copy_description($script, $bpath, $package,
$packageversion, $packagerevision);
my $result = copy_description($script, $bpath, $package,
$packageversion, $packagerevision, $destination);
- my $result =
modify_description($original,$target,$tarball,$package_source,$source_location,$distribution,$coda);
+ my $result =
modify_description($original,$target,$tarball,$package_source,$source_location,$distribution,$coda,$version,$revision);
my ($version, $revisions) = read_version_revision($package_source);
my ($version, $revision) =
get_version_revision($package_source,$distribution);
@@ -302,7 +301,6 @@
### get version
-# my ($packageversion, $packagerevision) = &get_packageversion();
my ($packageversion, $packagerevision) =
&get_version_revision(".",$distribution);
### load configuration
@@ -612,34 +610,6 @@
return (0,$bpath);
}
-=item get_packageversion
-
- my ($version, $revision) = get_packageversion();
-
-Finds the current version (by examining the VERSION file) and the current
-revision (which defaults to 1 or a cvs timestamp) of the package being
-compiled.
-
-Formerly called by bootstrap.pl and inject_package(); now obsolete.
-
-=cut
-
-sub get_packageversion {
-
- 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);
-}
-
=item find_rootmethod
find_rootmethod($bpath);
@@ -784,7 +754,7 @@
my $coda = "NoSourceDirectory: true\n";
- if
(modify_description("$package.info.in","$bpath/fink/dists/$destination/$package.info","$bpath/src/$package-$packageversion.tar",".","%n-%v.tar",$distribution,$coda))
{
+ if
(modify_description("$package.info.in","$bpath/fink/dists/$destination/$package.info","$bpath/src/$package-$packageversion.tar",".","%n-%v.tar",$distribution,$coda,
$packageversion, $packagerevision)) {
print "ERROR: Can't copy package description(s).\n";
$result = 1;
} elsif (&execute("/bin/chmod 644
$bpath/fink/dists/$destination/*.*")) {
@@ -797,7 +767,7 @@
=item modify_description
- my $result =
modify_description($original,$target,$tarball,$package_source,$source_location,$distribution,$coda);
+ my $result =
modify_description($original,$target,$tarball,$package_source,$source_location,$distribution,$coda,$version,$revision);
Copy the file $original to $target, supplying the correct version and
revision (from get_version_revision($package_source,$distribution)) and
@@ -821,8 +791,9 @@
my $source_location = shift;
my $distribution = shift;
my $coda = shift;
+ my $version = shift;
+ my $revision = shift;
- my ($version, $revision) =
get_version_revision($package_source,$distribution);
print "Modifying package description...\n";
my $md5obj = Fink::Checksum->new('MD5');
my $md5 = $md5obj->get_checksum($tarball);
Index: Finally.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Finally.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Finally.pm 22 Mar 2006 18:17:01 -0000 1.2
+++ Finally.pm 22 Mar 2006 22:46:53 -0000 1.3
@@ -90,8 +90,13 @@
if $self->{_primed} && $$ != $self->{_pid}; # Don't run in forks
return unless $self->{_primed};
+ # Preserve exit status
+ my $status = $?;
+
&{$self->{_code}}();
delete $self->{_primed};
+
+ $? = $status;
}
sub DESTROY {
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1295
retrieving revision 1.1296
diff -u -d -r1.1295 -r1.1296
--- ChangeLog 22 Mar 2006 21:26:44 -0000 1.1295
+++ ChangeLog 22 Mar 2006 22:46:53 -0000 1.1296
@@ -1,3 +1,9 @@
+2006-03-22 Dave Vasilevsky <[EMAIL PROTECTED]>
+
+ * Finally.pm: Don't change the exit status!
+ * Bootstrap.pm: Fix intermitting inability to inject. Remove obsolete
+ function get_packageversion.
+
2006-03-22 Daniel Macks <[EMAIL PROTECTED]>
* SelfUpdate.pm: Engine doesn't export, so don't import its functions
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
