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

Revert 8cc0aaad04

Browse Source
This commit is contained in:
Ilia Rostovtsev
2020-01-27 13:41:21 +03:00
parent 38e22aa37f
commit e82c202d2e
3 changed files with 13 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
package-updates/index.cgi
View File

@@ -64,18 +64,12 @@ foreach $p (sort { $a->{'name'} cmp $b->{'name'} } (@current, @avail)) {
# Work out the status
$c = $current{$p->{'name'}."/".$p->{'system'}};
$a = $avail{$p->{'name'}."/".$p->{'system'}};
$bp = $a->{'disallowed'} =~ /\/Backports/;
if ($a && $c && &compare_versions($a, $c) > 0) {
# An update is available
if ($bp) {
$msg = '<b>'.&ui_text_color(&text('index_new_backports', $a->{'version'}), 'success').'</b>';
}
else {
$msg = "<b><font color=#00aa00>".
&text('index_new', $a->{'version'})."</font></b>";
$need = 1;
}
$msg = "<b><font color=#00aa00>".
&text('index_new', $a->{'version'})."</font></b>";
$need = 1;
next if ($in{'mode'} eq 'security' && !$a->{'security'});
next if ($in{'mode'} ne 'updates' &&
$in{'mode'} ne 'current' &&
@@ -84,12 +78,7 @@ foreach $p (sort { $a->{'name'} cmp $b->{'name'} } (@current, @avail)) {
elsif ($a && !$c) {
# Could be installed, but isn't currently
next if (!&installation_candiate($a));
if ($bp) {
$msg = &ui_text_color($text{'index_caninstall_backports'}, 'success');
}
else {
$msg = "<font color=#00aa00>$text{'index_caninstall'}</font>";
}
$msg = "<font color=#00aa00>$text{'index_caninstall'}</font>";
$need = 0;
next if ($in{'mode'} ne 'new');
}
@@ -111,10 +100,7 @@ foreach $p (sort { $a->{'name'} cmp $b->{'name'} } (@current, @avail)) {
next if ($in{'mode'} ne 'current');
}
$source = ucfirst($a->{'source'});
if ($bp) {
$source = &ui_text_color("<span title=\"$text{'index_install_disallowed_backports'}\">$source$a->{'disallowed'} <sup><b>&quest;</b></sup></span>", 'info');
}
elsif ($a->{'security'}) {
if ($a->{'security'}) {
$source = "<font color=#ff0000>$source</font>";
}
@@ -131,13 +117,11 @@ foreach $p (sort { $a->{'name'} cmp $b->{'name'} } (@current, @avail)) {
push(@rows, [
{ 'type' => 'checkbox', 'name' => 'u',
'value' => $p->{'update'}."/".$p->{'system'},
'checked' => $need,
'disabled' => $bp ? 1 : 0 },
($bp ? $p->{'name'} :
&ui_link("view.cgi?mode=$in{'mode'}&name=".
&urlize($p->{'name'})."&system=".
&urlize($p->{'system'})."&search=".
&urlize($in{'search'}), $p->{'name'})),
'checked' => $need },
&ui_link("view.cgi?mode=$in{'mode'}&name=".
&urlize($p->{'name'})."&system=".
&urlize($p->{'system'})."&search=".
&urlize($in{'search'}), $p->{'name'}),
$p->{'desc'},
$msg,
$source ? ( $source ) : ( ),

3
package-updates/lang/en
View File

@@ -148,8 +148,11 @@ repos_enone=None selected
repos_title=Delete Repositories
repos_rusure=Are you sure you want to delete the $1 selected package repositories? Packages installed from them will still be available, but may not be updatable.
repos_ok=Delete Now
<<<<<<< HEAD
index_install_disallowed_backports=By default backports repositories have a lower priority than stable (100), thus they won't be installed or upgraded unless explicitly configured to (or the package only exists in backports) - packages from backports must be installed using command line, with special flags
index_new_backports=Backports new version $1
index_caninstall_backports=Available for manual installation
=======
>>>>>>> parent of 8cc0aaad0... Fix to handle backports repos (Ubuntu enabled default)
__norefs=1

5
software/apt-lib.pl
View File

@@ -185,11 +185,6 @@ while(<DUMP>) {
elsif (/^\s*File:\s*(\S+)/ && $pkg) {
$pkg->{'file'} ||= $1;
}
# By default Debian backports repositories have a lower priority than stable (100) thus they won't
# be installed or upgraded unless explicitly configured to (or the package only exists in backports).
if ($pkg->{'file'} =~ /dists_.*-backports/) {
$pkg->{'disallowed'} = "/Backports";
}
}
close(DUMP);
&reset_environment();