aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-09-30 14:41:45 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-09-30 14:41:45 +0000
commitfcb98b61d1b6c455d61182e112ecd841b85026c9 (patch)
treefdcee84bb9195b254e9770453f997b561858aa38
parentc3d160c98d2992036657d5165fe778db4b9ca727 (diff)
downloadrpmtools-fcb98b61d1b6c455d61182e112ecd841b85026c9.tar
rpmtools-fcb98b61d1b6c455d61182e112ecd841b85026c9.tar.gz
rpmtools-fcb98b61d1b6c455d61182e112ecd841b85026c9.tar.bz2
rpmtools-fcb98b61d1b6c455d61182e112ecd841b85026c9.tar.xz
rpmtools-fcb98b61d1b6c455d61182e112ecd841b85026c9.zip
- gendistrib:
o don't call genhdlist2 with --no-md5sum for no good reason
-rw-r--r--NEWS3
-rwxr-xr-xgendistrib5
2 files changed, 5 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 016018e..166b008 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- gendistrib:
+ o don't call genhdlist2 with --no-md5sum for no good reason
+
Version 5.7 - 23 September 2008, by Pascal "Pixel" Rigaux
- genhdlist2:
diff --git a/gendistrib b/gendistrib
index 765ae14..501fd9e 100755
--- a/gendistrib
+++ b/gendistrib
@@ -105,7 +105,6 @@ foreach my $m ($distrib->listmedia) {
synthesis => "$path/media_info/synthesis.hdlist.cz",
pubkey => "$path/media_info/pubkey",
noneedrebuild => $blind ? 0 : $distrib->check_index_sync($m, 'formedia'),
- noneedredomd5 => $blind ? 0 : $distrib->check_media_md5($m),
};
}
@@ -145,7 +144,7 @@ foreach my $e (grep { !$_->{noneedrebuild} } @hdlists) {
'--allow-empty-media',
$nooutput ? '--quiet' : (),
$nobadrpm ? '--no-bad-rpm' : (),
- $nomd5sum || $e->{noneedredomd5} ? "--no-md5sum" : (),
+ $nomd5sum ? "--no-md5sum" : (),
$distrib->getvalue($e->{media}, 'xml-info') ? '--xml-info' : (),
-e $file_deps ? "--file-deps $file_deps" : (),
);
@@ -173,7 +172,7 @@ if (grep { ! $_->{noneedrebuild} } @hdlists) {
}
}
}
-if (grep { ! ($_->{noneedrebuild} && $_->{noneedredomd5}) } @hdlists) {
+if (grep { !$_->{noneedrebuild} } @hdlists) {
unlink "$destinfodir/MD5SUM"; #- safety cleaning
unless ($nomd5sum) {
# this MD5SUM is mostly obsolete, but is still needed up to 2007.1