X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=src%2Fpakfire%2Flib%2Ffunctions.pl;h=cfb7e51175f30a7ffb790ade89a7ae5a19bc38f9;hp=d2f77fa8f18134d421e166ce808901dc2ae67b54;hb=bb6481a82072cf2df27306508c8b72b584eb4f80;hpb=b29a624081f02a3d4161b1c181dcf064429b51c8
diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index d2f77fa8f1..cfb7e51175 100644
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -34,8 +34,8 @@ use Net::Ping;
package Pakfire;
# GPG Keys
-my $myid = "64D96617"; # Our own gpg-key paks@ipfire.org
-my $trustid = "65D0FD58"; # gpg-key of CaCert
+my $myid = "179740DC4D8C47DC63C099C74BDE364C64D96617"; # Our own gpg-key paks@ipfire.org
+my $trustid = "A31D4F81EF4EBD07B456FA04D2BB0D0165D0FD58"; # gpg-key of CaCert
# A small color-hash :D
my %color;
@@ -519,8 +519,13 @@ sub dblist {
} elsif ("$filter" eq "installed") {
next unless ( -e "$Conf::dbdir/installed/meta-$templine[0]" );
}
- if ("$forweb" eq "forweb") {
- print "\n";
+ if ("$forweb" eq "forweb")
+ {
+ if ("$filter" eq "notinstalled") {
+ print "\n";
+ } else {
+ print "\n";
+ }
} else {
if ("$Pakfire::enable_colors" eq "1") {
if (&isinstalled("$templine[0]")) {
@@ -536,7 +541,7 @@ sub dblist {
}
}
-sub resolvedeps {
+sub resolvedeps_one {
my $pak = shift;
getmetafile("$pak");
@@ -548,7 +553,7 @@ sub resolvedeps {
close(FILE);
my $line;
- my (@templine, @deps, @tempdeps, @all);
+ my (@templine, @deps, @all);
foreach $line (@file) {
@templine = split(/\: /,$line);
if ("$templine[0]" eq "Dependencies") {
@@ -563,35 +568,46 @@ sub resolvedeps {
message("PAKFIRE RESV: $pak: Dependency is already installed: $_");
} else {
message("PAKFIRE RESV: $pak: Need to install dependency: $_");
- push(@tempdeps,$_);
push(@all,$_);
}
}
}
- foreach (@tempdeps) {
- if ($_) {
- my @newdeps = resolvedeps("$_");
- foreach(@newdeps) {
- unless (($_ eq " ") || ($_ eq "")) {
- my $return = &isinstalled($_);
- if ($return eq 0) {
- message("PAKFIRE RESV: $pak: Dependency is already installed: $_");
- } else {
- message("PAKFIRE RESV: $pak: Need to install dependency: $_");
- push(@all,$_);
- }
- }
+ return @all;
+}
+
+sub resolvedeps {
+ my $pak = shift;
+ my @all;
+
+ # Resolve all not yet installed dependencies of $pak
+ my @deps = &resolvedeps_one($pak);
+ push(@all, @deps);
+
+ # For each dependency, we check if more dependencies exist
+ while (@deps) {
+ my $dep = pop(@deps);
+
+ my @subdeps = &resolvedeps_one($dep);
+ foreach my $subdep (@subdeps) {
+ # Skip the package we are currently resolving for
+ next if ($pak eq $subdep);
+
+ # If the package is not already to be installed,
+ # we add it to the list (@all) and check if it has
+ # more dependencies on its own.
+ unless (grep {$_ eq $subdep} @all) {
+ push(@deps, $subdep);
+ push(@all, $subdep);
}
}
}
- message("");
- chomp (@all);
+
return @all;
}
sub resolvedeps_recursive {
- my @packages = shift;
+ my @packages = @_;
my @result = ();
foreach my $pkg (@packages) {