projects
/
webmin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7740d8f
)
Handle YUM info output where wrong arch is listed
author
Jamie Cameron
<jcameron@webmin.com>
Mon, 4 Jan 2010 19:48:16 +0000
(11:48 -0800)
committer
Jamie Cameron
<jcameron@webmin.com>
Mon, 4 Jan 2010 19:48:16 +0000
(11:48 -0800)
software/yum-lib.pl
patch
|
blob
|
history
diff --git
a/software/yum-lib.pl
b/software/yum-lib.pl
index
379cdeb
..
dd15dbc
100755
(executable)
--- a/
software/yum-lib.pl
+++ b/
software/yum-lib.pl
@@
-160,11
+160,14
@@
while(<PKG>) {
s/\r|\n//g;
if (/^Name\s*:\s*(\S+)/) {
if ($done{$1}) {
- # Start of a new package
+ # Seen before .. update with newer info. This can happen
+ # when YUM shows the installed version first.
$pkg = $done{$1};
+ delete($pkg->{'epoch'});
+ delete($pkg->{'version'});
}
else {
- # S
een before .. update with newer info
+ # S
tart of a new package
$pkg = { 'name' => $1 };
$done{$pkg->{'name'}} = $pkg;
push(@rv, $pkg);