michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add a better way to match standard php-common package

Browse Source 
fe0ad881f2 (r158184285)
This commit is contained in:
Ilia Ross
2025-05-28 12:13:19 +03:00
parent a477a59ca7
commit 8dada63714
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
phpini/phpini-lib.pl
View File

@@ -966,8 +966,11 @@ foreach my $pkg (&package_updates::list_available()) {
my $name = $pkg->{'name'};
next unless ($name =~ /^((?:rh-)?(php(?:\d[\d.]*)??)(?:-php)?-common|php\d*[\d.]*)$/);
$name = $2 || $1;
# Skip meta packages on Debian and Ubuntu
next if ($pkg->{'version'} =~ /^([\d]+)/ && $1 > 40);
# Skip the standard php-common meta package on Debian and Ubuntu, which
# never have a dash
next if ($pkg->{'system'} eq 'apt' &&
$pkg->{'name'} eq 'php-common' &&
$pkg->{'version'} !~ /-/);
my ($phpver, $shortver, $bin) = &get_php_info($name, $pkg->{'version'});
push(@rv, { 'name' => $pkg->{'name'},
'ver' => $pkg->{'version'},