summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2006-11-21 09:32:08 +0000
committerPascal Rigaux <pixel@mandriva.com>2006-11-21 09:32:08 +0000
commit946c2730f4cfd4b18c5a292481b60284bc95a34b (patch)
tree96a014a736d0aa6b1997eef6b0a50e3713eae7f0
parent59db9e4188cbc9819f719e26ac8b2070e1777df4 (diff)
downloadurpmi-946c2730f4cfd4b18c5a292481b60284bc95a34b.tar
urpmi-946c2730f4cfd4b18c5a292481b60284bc95a34b.tar.gz
urpmi-946c2730f4cfd4b18c5a292481b60284bc95a34b.tar.bz2
urpmi-946c2730f4cfd4b18c5a292481b60284bc95a34b.tar.xz
urpmi-946c2730f4cfd4b18c5a292481b60284bc95a34b.zip
revert buggy change
-rw-r--r--urpm.pm7
1 files changed, 5 insertions, 2 deletions
diff --git a/urpm.pm b/urpm.pm
index c1fafd4c..6e597e47 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -1183,8 +1183,11 @@ sub _read_existing_synthesis_and_hdlist {
#- XXX we could link the new hdlist to the old one.
#- (However links need to be managed. see bug #12391.)
#- as previously done, just read synthesis file here, this is enough.
- _parse_maybe_hdlist_or_synthesis($urpm, $medium, statedir_synthesis($urpm, $medium))
- or _check_after_reading_hdlist_or_synthesis($urpm, $medium);
+ if (!_parse_synthesis($urpm, $medium, statedir_synthesis($urpm, $medium))) {
+ _parse_hdlist($urpm, $medium, statedir_hdlist($urpm, $medium));
+ _check_after_reading_hdlist_or_synthesis($urpm, $medium);
+ }
+
1;
}