webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-26 19:00:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

pakfire: Replace duplicate code with dblist functioncall

Browse Source 
Replace pakfire install code duplicating dblist working with call
to actual dblist function.

Signed-off-by: Robin Roevens <robin.roevens@disroot.org>
This commit is contained in:
Robin Roevens
2022-07-28 13:21:29 +02:00
committed by Peter Müller
parent 2b25c02932
commit 4bac9fdd12
1 changed files with 13 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/pakfire/pakfire
View File

@@ -107,42 +107,30 @@
### Make sure that the list is not outdated.
&Pakfire::dbgetlist("noforce");
open(FILE, "<$Conf::dbdir/lists/packages_list.db");
my @db = <FILE>;
close(FILE);
my %paklist = &Pakfire::dblist("all");
my $dep;
my @deps;
my $pak;
my @paks;
my @temp;
my @templine;
my $found = 0;
my $return;
my @all;
foreach $pak (@ARGV) {
unless ("$pak" =~ "^-") {
$return = &Pakfire::isinstalled($pak);
if ($return eq 0) {
&Pakfire::message("PAKFIRE INFO: $pak is already installed");
next;
}
$found = 0;
foreach (@db) {
@templine = split(/;/,$_);
if ("$templine[0]" eq "$pak" ) {
push(@paks,$pak);
push(@all,$pak);
@temp = &Pakfire::resolvedeps("$pak");
foreach $dep (@temp) {
push(@deps,$dep) if $dep;
push(@all,$dep) if $dep;
}
$found = 1;
break;
if (defined $paklist{$pak}) {
if ("$paklist{$pak}{'Installed'}" eq "yes") {
&Pakfire::message("PAKFIRE INFO: $pak is already installed");
next;
}
}
if ($found == 0) {
push(@paks,$pak);
push(@all,$pak);
@temp = &Pakfire::resolvedeps("$pak");
foreach $dep (@temp) {
push(@deps,$dep) if $dep;
push(@all,$dep) if $dep;
}
} else {
&Pakfire::message("");
&Pakfire::message("PAKFIRE WARN: The pak \"$pak\" is not known. Please try running \"pakfire update\".");
}