Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1:/tmp/cvs-serv27789
Modified Files:
ChangeLog PkgVersion.pm
Log Message:
die if no md5 specified. You were warned!
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -d -r1.328 -r1.329
--- ChangeLog 23 Sep 2003 00:35:20 -0000 1.328
+++ ChangeLog 23 Sep 2003 14:46:41 -0000 1.329
@@ -1,3 +1,7 @@
+2003-09-23 Peter O'Gorman <[EMAIL PROTECTED]>
+
+ * PkgVersion.pm: die if no md5 specified. You were warned!
+
2003-09-22 Ben Hines <[EMAIL PROTECTED]>
* Bootstrap.pm: Support 10.2.8.
Index: PkgVersion.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/PkgVersion.pm,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -d -r1.140 -r1.141
--- PkgVersion.pm 14 Sep 2003 16:12:22 -0000 1.140
+++ PkgVersion.pm 23 Sep 2003 14:46:41 -0000 1.141
@@ -982,7 +982,7 @@
my ($archive, $found_archive, $bdir, $destdir, $unpack_cmd);
my ($i, $verbosity, $answer, $tries, $checksum, $continue);
my ($renamefield, @renamefiles, $renamefile, $renamelist, $expand);
- my ($tarcommand, $tarflags, $cat, $gzip, $bzip2, $unzip);
+ my ($tarcommand, $tarflags, $cat, $gzip, $bzip2, $unzip, $found_archive_sum);
if ($self->{_type} eq "bundle") {
return;
@@ -1044,9 +1044,9 @@
# verify the MD5 checksum, if specified
$checksum = $self->get_checksum($i);
- if ($checksum ne "-" ) { # Checksum was specified
+ $found_archive_sum = &file_MD5_checksum($found_archive);
+ if ($checksum ne "-" ) { # Checksum was specified
# compare to the MD5 checksum of the tarball
- my $found_archive_sum = &file_MD5_checksum($found_archive);
if ($checksum ne $found_archive_sum) {
# mismatch, ask user what to do
$tries++;
@@ -1081,7 +1081,10 @@
next; # restart loop with same
tarball
}
}
- }
+ } else {
+ # No checksum was specifed in the .info file, die die die
+ die "No checksum specifed for ".$self->get_fullname()." I got a
sum of $found_archive_sum \n";
+ }
# Determine the name of the TarFilesRename in the case of multi
tarball packages
if ($i < 2) {
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
