michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-05-04 22:30:33 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Don't append the architecture un-necessarily, as this breaks upgrades that change it http://virtualmin.com/node/36740

Browse Source
This commit is contained in:
Jamie Cameron
2015-04-05 16:19:53 -07:00
parent 3d20f8c56e
commit 18d16d7639
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
software/yum-lib.pl
View File

@@ -19,8 +19,14 @@ if ($in->{'enablerepo'}) {
$enable = "enablerepo=".quotemeta($in->{'enablerepo'});
}
local (@rv, @newpacks);
# If there are multiple architectures to update for a package, split them out
local @names = map { &append_architectures($_) } split(/\s+/, $update);
if (@names == 1) {
@names = ( $update );
}
$update = join(" ", @names);
print "<b>",&text('yum_install', "<tt>yum $enable -y install $update</tt>"),"</b><p>\n";
print "<pre>";
&additional_log('exec', undef, "yum $enable -y install $update");
@@ -83,8 +89,8 @@ else {
}
# append_architectures(package)
# Given a package name, if it has multiple architectures return the name with each
# appended
# Given a package name, if it has multiple architectures return the name with
# each appended
sub append_architectures
{
my ($name) = @_;