projects
/
webmin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c1a7bde
)
Don't just ignore Solaris package failure
author
Jamie Cameron
<jcameron@webmin.com>
Thu, 31 Dec 2009 03:54:38 +0000
(19:54 -0800)
committer
Jamie Cameron
<jcameron@webmin.com>
Thu, 31 Dec 2009 03:54:38 +0000
(19:54 -0800)
webmin/upgrade.cgi
patch
|
blob
|
history
diff --git
a/webmin/upgrade.cgi
b/webmin/upgrade.cgi
index
3dcfd04
..
fd486f0
100755
(executable)
--- a/
webmin/upgrade.cgi
+++ b/
webmin/upgrade.cgi
@@
-325,7
+325,8
@@
elsif ($in{'mode'} eq 'solaris-pkg' || $in{'mode'} eq 'sun-pkg') {
$in{'root'} = '/';
$in{'adminfile'} = '$module_root_directory/adminupgrade';
- $rv = &foreign_call("software", "install_package", $file, $pkg);
+ $rv = &software::install_package($file, $pkg);
+ &error($rv) if ($rv);
unlink($file) if ($need_unlink);
$ENV{'config_dir'} = $config_directory;
$ENV{'webmin_upgrade'} = 1;