projects
/
webmin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1de2e37
)
Get correct version for updates
author
Jamie Cameron
<jcameron@webmin.com>
Thu, 11 Nov 2010 23:44:20 +0000
(15:44 -0800)
committer
Jamie Cameron
<jcameron@webmin.com>
Thu, 11 Nov 2010 23:44:20 +0000
(15:44 -0800)
https://sourceforge.net/tracker/?func=detail&atid=117457&aid=
3107449
&group_id=17457
software/apt-lib.pl
patch
|
blob
|
history
diff --git
a/software/apt-lib.pl
b/software/apt-lib.pl
index
f75c091
..
f4498b3
100755
(executable)
--- a/
software/apt-lib.pl
+++ b/
software/apt-lib.pl
@@
-79,9
+79,10
@@
my $cmd = "apt-get -s install ".
my $out = &backquote_command($cmd);
my @rv;
foreach my $l (split(/\r?\n/, $out)) {
- if ($l =~ /Inst\s+(\S+)\s+\[(\S+)\]/) {
+ if ($l =~ /Inst\s+(\S+)\s+\[(\S+)\]\s+\(([^ \)]+)/ ||
+ $l =~ /Inst\s+(\S+)\s+\[(\S+)\]/) {
my $pkg = { 'name' => $1,
- 'version' => $2 };
+ 'version' => $
3 || $
2 };
if ($pkg->{'version'} =~ s/^(\S+)://) {
$pkg->{'epoch'} = $1;
}