Use --upgrade flag for pkgutil
authorJamie Cameron <jcameron@webmin.com>
Wed, 11 Nov 2009 08:33:51 +0000 (00:33 -0800)
committerJamie Cameron <jcameron@webmin.com>
Wed, 11 Nov 2009 08:33:51 +0000 (00:33 -0800)
software/csw_upgrade.cgi

index d4b26ac..c2134f7 100755 (executable)
@@ -11,7 +11,8 @@ print "<b>",&text('csw_updatedesc',
 print "<pre>";
 &additional_log("exec", undef, "$pkg_get upgrade");
 &clean_environment();
-open(CMD, "yes y | $pkg_get upgrade 2>&1 </dev/null |");
+$flag = $pkg_get =~ /pkgutil/ ? "--upgrade" : "upgrade";
+open(CMD, "yes y | $pkg_get $flag 2>&1 </dev/null |");
 while(<CMD>) {
        print &html_escape($_);
        }