Fix refreshing of available packages

diff --git a/package-updates/package-updates-lib.pl b/package-updates/package-updates-lib.pl
index 9cdf748..370376f 100644 (file)
--- a/package-updates/package-updates-lib.pl
+++ b/package-updates/package-updates-lib.pl
@@ -28,8 +28,8 @@ $apt_cache_file = "$module_config_directory/aptcache";
 $yum_changelog_cache_dir = "$module_config_directory/yumchangelog";
 
 # list_current(nocache)
-# Returns a list of packages and versions for the core packages managed
-# by this module. Return keys are :
+# Returns a list of packages and versions for Virtualmin-related packages
+# managed by this module. Return keys are :
 #  name - The local package name (ie. CSWapache2)
 #  update - Name used to refer to it by the updates system (ie. apache2)
 #  version - Version number
@@ -347,37 +347,7 @@ if (!$pkg) {
        print &text('update_efindpkg', $name),"<p>\n";
        return ( );
        }
-if ($pkg->{'system'} eq 'webmin') {
-       # Webmin module, which we can download and install 
-       local ($host, $port, $page, $ssh) =
-               &parse_http_url($pkg->{'updatesurl'});
-       local ($mhost, $mport, $mpage, $mssl) =
-               &parse_http_url($pkg->{'url'}, $host, $port, $page, $ssl);
-       local $mfile;
-       ($mfile = $mpage) =~ s/^(.*)\///;
-       local $mtemp = &transname($mfile);
-       local $error;
-       print &text('update_wdownload', $pkg->{'name'}),"<br>\n";
-       &http_download($mhost, $mport, $mpage, $mtemp, \$error, undef, $mssl,
-                      $webmin::config{'upuser'}, $webmin::config{'uppass'});
-       if ($error) {
-               print &text('update_ewdownload', $error),"<p>\n";
-               return ( );
-               }
-       print $text{'update_wdownloaded'},"<p>\n";
-
-       # Install the module
-       print &text('update_winstall', $pkg->{'name'}),"<br>\n";
-       local $irv = &webmin::install_webmin_module($mtemp, 1, 0);
-       if (!ref($irv)) {
-               print &text('update_ewinstall', $irv),"<p>\n";
-               }
-       else {
-               print $text{'update_winstalled'},"<p>\n";
-               @rv = map { /([^\/]+)$/; $1 } @{$irv->[1]};
-               }
-       }
-elsif (defined(&software::update_system_install)) {
+if (defined(&software::update_system_install)) {
        # Using some update system, like YUM or APT
        &clean_environment();
        if ($software::update_system eq $pkg->{'system'}) {

diff --git a/system-status/system-status-lib.pl b/system-status/system-status-lib.pl
index c963b9b..c03536a 100755 (executable)
--- a/system-status/system-status-lib.pl
+++ b/system-status/system-status-lib.pl
@@ -100,7 +100,7 @@ my %pkgs = map { $_, 1 } @$pkgs;
 my $info = &get_collected_info();
 if ($info->{'poss'} && &foreign_installed("package-updates")) {
        &foreign_require("package-updates");
-       my @poss = &package_updates::list_possible_updates(2);
+       my @poss = &package_updates::list_possible_updates(2, 1);
        $info->{'poss'} = \@poss;
        }
 &save_collected_info($info);