projects
/
webmin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1f3a340
)
Fix debian package detection
author
Jamie Cameron
<jcameron@webmin.com>
Fri, 13 Nov 2009 06:15:39 +0000
(22:15 -0800)
committer
Jamie Cameron
<jcameron@webmin.com>
Fri, 13 Nov 2009 06:15:39 +0000
(22:15 -0800)
cluster-webmin/upgrade.cgi
patch
|
blob
|
history
diff --git
a/cluster-webmin/upgrade.cgi
b/cluster-webmin/upgrade.cgi
index
55a6474
..
980d002
100755
(executable)
--- a/
cluster-webmin/upgrade.cgi
+++ b/
cluster-webmin/upgrade.cgi
@@
-101,10
+101,11
@@
if (`rpm -qp $file 2>&1` =~ /(^|\n)webmin-(\d+\.\d+)/) {
$mode = "rpm";
$version = $2;
}
-elsif (`dpkg --info $file 2>&1` =~ /Package:\s+webmin
-(\d+\.\d+)
/) {
+elsif (`dpkg --info $file 2>&1` =~ /Package:\s+webmin/) {
# Looks like a Webmin Debian package
$mode = "deb";
- $version = $2;
+ `dpkg --info $file 2>&1` =~ /Version:\s+(\S+)/;
+ $version = $1;
}
else {
# Check if it is a webmin tar.gz file