projects
/
webmin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6f2c44d
)
Handle new yum output format
author
Jamie Cameron
<jcameron@webmin.com>
Wed, 23 Dec 2009 07:58:08 +0000
(23:58 -0800)
committer
Jamie Cameron
<jcameron@webmin.com>
Wed, 23 Dec 2009 07:58:08 +0000
(23:58 -0800)
software/yum-lib.pl
patch
|
blob
|
history
diff --git
a/software/yum-lib.pl
b/software/yum-lib.pl
index
af7f6b7
..
379cdeb
100755
(executable)
--- a/
software/yum-lib.pl
+++ b/
software/yum-lib.pl
@@
-30,6
+30,9
@@
while(<CMD>) {
push(@rv, $2);
}
elsif (/^(Installed|Dependency Installed|Updated|Dependency Updated):\s*(.*)/) {
+ # Line like :
+ # Updated:
+ # wbt-virtual-server-theme.x86
local @pkgs = split(/\s+/, $2);
if (!@pkgs) {
# Wrapped to next line
@@
-47,6
+50,11
@@
while(<CMD>) {
}
}
}
+ elsif (/^\s+Updating\s+:\s+(\S+)/) {
+ # Line like :
+ # Updating : wbt-virtual-server-theme 1/2
+ push(@rv, $1);
+ }
if (!/ETA/ && !/\%\s+done\s+\d+\/\d+\s*$/) {
print &html_escape($_."\n");
}