Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15434
Modified Files:
ChangeLog PkgVersion.pm
Log Message:
Unbreak downlaod continuation (from overzealous unpack-crash patch)
Index: PkgVersion.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/PkgVersion.pm,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -d -r1.429 -r1.430
--- PkgVersion.pm 16 Jul 2005 05:53:49 -0000 1.429
+++ PkgVersion.pm 17 Jul 2005 23:17:28 -0000 1.430
@@ -2153,7 +2153,7 @@
sub phase_unpack {
my $self = shift;
my ($archive, $found_archive, $bdir, $destdir, $unpack_cmd);
- my ($suffix, $verbosity, $answer, $checksum, $continue);
+ my ($suffix, $verbosity, $answer, $tries, $checksum, $continue);
my ($renamefield, @renamefiles, $renamefile, $renamelist, $expand);
my ($tarcommand, $tarflags, $cat, $gzip, $bzip2, $unzip,
$found_archive_sum);
@@ -2208,9 +2208,9 @@
return;
}
+ $tries = 0;
my $maxtries = should_skip_prompt('fetch') ? 2 : 3;
foreach $suffix ($self->get_source_suffices) {
- my $tries = 0;
$archive = $self->get_tarball($suffix);
# search for archive, try fetching if not found
@@ -2341,6 +2341,8 @@
if (&execute($unpack_cmd, nonroot_okay=>1)) {
die "unpacking file $archive of package
".$self->get_fullname()." failed\n";
}
+
+ $tries = 0;
}
}
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1055
retrieving revision 1.1056
diff -u -d -r1.1055 -r1.1056
--- ChangeLog 16 Jul 2005 05:53:49 -0000 1.1055
+++ ChangeLog 17 Jul 2005 23:17:28 -0000 1.1056
@@ -1,3 +1,7 @@
+2005-07-17 Daniel Macks <[EMAIL PROTECTED]>
+
+ * PkgVersion.pm: ...but don't break continuation option.
+
2005-07-16 Daniel Macks <[EMAIL PROTECTED]>
* PkgVersion.pm: Make failed unpacking of source a fatal error.
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
