Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* Add version-tracking into dependency sorting. Closes: #687949) 

+ Use/parse output from a newer version of apt so that "apt-cache
      depends" will include version information on dependencies.
    + All tracking of packages now include versions, so we pass around
      hashes of {package name, comparison op, version} everywhere instead
      of simply passing package names as strings.
    + Add the APT::Cache::ShowVersion=1 option to apt-cache calls to
      turn on version reporting. Needs a locally-patched version of apt
      *for now*, but expecting that to be fixed for the Wheezy
      release. The new code degrades gracefully if version info is not
      available.
    + Add a dependency on libdpkg-perl for version comparison code.
This commit is contained in:
Steve McIntyre 2012-09-26 18:18:47 +00:00
parent 7072e8b02c
commit c46f7c0cf6
4 changed files with 427 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
debian/changelog vendored
View File

@ -10,6 +10,18 @@ debian-cd (3.1.11) UNRELEASED; urgency=low
- generate boot entries for grub on the fly; temporary code for now,
will switch to parsing the isolinux entries shortly instead.
- depending more and more on xorriso rather than genisoimage...
* Add version-tracking into dependency sorting. Closes: #687949)
+ Use/parse output from a newer version of apt so that "apt-cache
depends" will include version information on dependencies.
+ All tracking of packages now include versions, so we pass around
hashes of {package name, comparison op, version} everywhere instead
of simply passing package names as strings.
+ Add the APT::Cache::ShowVersion=1 option to apt-cache calls to
turn on version reporting. Needs a locally-patched version of apt
*for now*, but expecting that to be fixed for the Wheezy
release. The new code degrades gracefully if version info is not
available.
+ Add a dependency on libdpkg-perl for version comparison code.
-- Steve McIntyre <93sam@debian.org> Wed, 26 Sep 2012 01:09:13 +0100

2
debian/control vendored
View File

@ -11,7 +11,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/debian-cd/trunk?op=log
Package: debian-cd
Architecture: all
Depends: ${misc:Depends}, curl, perl, dpkg-dev, cpp, libdigest-md5-perl, libdigest-sha-perl, tofrodos, apt (>= 0.3.11.1), make, genisoimage, lynx-cur | lynx, grep-dctrl, bc, libcompress-zlib-perl, bzip2, xorriso
Depends: ${misc:Depends}, curl, perl, dpkg-dev, cpp, libdigest-md5-perl, libdigest-sha-perl, tofrodos, apt (>= 0.3.11.1), make, genisoimage, lynx-cur | lynx, grep-dctrl, bc, libcompress-zlib-perl, bzip2, xorriso, libdpkg-perl
Recommends: hfsutils, netpbm, syslinux-common, mtools
Description: Tools for building (Official) Debian CD set
Debian-cd is the official tool for building Debian CD set since the potato

1
tools/apt-selection
View File

@ -32,6 +32,7 @@ options=" -q -o Dir::State::status=$APTTMP/$CODENAME-$ARCH/status \
-o Dir::Cache=$APTTMP/$CODENAME-$ARCH/apt-cache/ \
-o Dir::Etc=$APTTMP/$CODENAME-$ARCH/apt/ \
-o APT::Cache::AllVersions=0 \
-o APT::Cache::ShowVersion=1 \
-o APT::Architecture=$ARCH "
sections=main

585
tools/sort_deps
View File

@ -13,8 +13,10 @@
# per-disc basis now.
use strict;
use Data::Dumper;
use Dpkg::Version;
my $list = shift;
my $listfile = shift;
my $nonfree = read_env('NONFREE', 0);
my $extranonfree = read_env('EXTRANONFREE', 0);
@ -34,7 +36,7 @@ my $dir = "$ENV{'TDIR'}/$ENV{'CODENAME'}";
my $force_unstable_tasks = read_env('FORCE_SID_TASKSEL', 0);
my $tasks_packages = read_env('TASKS_PACKAGES',
"$ENV{'MIRROR'}/dists/sid/main/binary-$ENV{'ARCH'}/Packages.gz");
my @output;
my @output = ();
$| = 1; # Autoflush for debugging
@ -68,7 +70,7 @@ msg(0, "Running sort_deps to sort packages for $arch:\n");
msg(1, "======================================================================
Here are the settings you've chosen for making the list:
Architecture: $arch
List of prefered packages: $list
List of prefered packages: $listfile
Output file: $dir/packages.$arch
");
msg(1, "Complete selected packages with all the rest: ");
@ -150,7 +152,7 @@ foreach (keys %excluded) {
close (STATS);
# Browse the list of packages to include
my ($output_size, $size) = (0, 0, 0);
my ($output_size, $size) = (0, 0);
my %cds;
# Generate a dependency tree for each package
@ -171,9 +173,11 @@ while (@list) {
if ($res[$i] !~ m/^(\S+)\s*$/) {
msg(0, "UNEXPECTED: Line `$res[$i]' while parsing " .
"end of deptree from '$p'\n");
die "sort_deps failed! :-(\n";
}
$p = lc $1; $i++;
msg(2, " Dependency tree of `$p' ...\n");
$p = lc $1;
$i++;
msg(2, " Dependency tree of `$p' ...\n");
read_depends (\$i, \@res, $p);
}
@ -200,7 +204,7 @@ msg(0, " S/R/I/B packages take $output_size bytes\n");
# Now start to look for packages wanted by the user ...
msg(0, " Adding the rest of the requested packages\n");
open (LIST, "< $list") || die "Can't open $list : $!\n";
open (LIST, "< $listfile") || die "Can't open $listfile : $!\n";
while (defined($_=<LIST>)) {
chomp;
next if m/^\s*$/;
@ -218,9 +222,9 @@ while (defined($_=<LIST>)) {
# nevertheless ... this may be removed once the udebs have a
# better depencency system
if ($packages{$_}{"IsUdeb"}) {
add_to_output($packages{$_}{"Size"}, [$_]);
add_to_output($_);
} else {
add_package ($_, ! $norecommends, ! $nosuggests);
add_package ($_, ! $norecommends, ! $nosuggests);
}
}
close LIST;
@ -270,7 +274,7 @@ if ($extranonfree and (! $nonfree))
# include and if COMPLETE=0 there's a chance that the package
# will not get included in any CD ... so I'm checking the complete
# list again
open (LIST, "< $list") || die "Can't open $list : $!\n";
open (LIST, "< $listfile") || die "Can't open $listfile : $!\n";
while (defined($_=<LIST>)) {
chomp;
next if m/^\s*$/;
@ -364,17 +368,46 @@ sub parse_package {
}
}
sub dump_depend {
my $tmpin = shift;
my %d;
my $ret = "";
if ("ARRAY" eq ref($tmpin)) {
my @array = @{$tmpin};
foreach (@array) {
%d = %$_;
$ret .= $d{"Package"};
if ($d{"CmpOp"} ne "") {
$ret .= " (" . $d{"CmpOp"} . " " . $d{"Version"} . ")";
}
$ret .= " ";
}
} elsif ("HASH" eq ref($tmpin)) {
%d = %$tmpin;
$ret .= $d{"Package"};
if ($d{"CmpOp"} ne "") {
$ret .= " (" . $d{"CmpOp"} . " " . $d{"Version"} . ")";
}
} else {
die "dump_depend: $tmpin is neither an array nor a hash!\n";
}
return $ret;
}
sub read_depends {
my $i = shift; # Ref
my $lines = shift; # Ref
my $pkg = shift; # string
my $types = "(?:Pre)?Depends|Suggests|Recommends|Replaces|Conflicts|Breaks|Enhances";
my (@dep, @rec, @sug);
my ($type, $or, $elt);
my ($type, $or);
while ($lines->[$$i] =~ m/^\s([\s\|])($types):/) {
$type = $2; $or = $1;
# Get rid of replaces and conflicts ...
# Get rid of replaces, conflicts and any other fields we don't
# care about...
if (($type eq "Replaces") or
($type eq "Conflicts") or
($type eq "Breaks") or
@ -385,19 +418,51 @@ sub read_depends {
}
next;
}
my $out_type = $type;
$out_type =~ s/^Pre//; # PreDepends are like Depends for me
# Check the kind of depends : or, virtual, normal
if ($or eq '|') {
$elt = read_ordepends ($i, $lines);
my $elt = read_ordepends ($i, $lines);
foreach my $t (@$elt) {
msg(1, " " . dump_depend($t) . " (OR)\n");
}
push @{$packages{$pkg}{$out_type}}, $elt;
} elsif ($lines->[$$i] =~ m/^\s\s$type: <([^>]+)>/) {
$elt = read_virtualdepends ($i, $lines);
} elsif ($lines->[$$i] =~ m/^\s\s$type: (\S+)/) {
$elt = $1; $$i++;
my $elt = read_virtualdepends ($i, $lines);
foreach my $t (@$elt) {
msg(1, " " . dump_depend($t) . " <virt>\n");
}
push @{$packages{$pkg}{$out_type}}, $elt;
} elsif ($lines->[$$i] =~ m/^\s\s$type: (\S+)( \((\S+) (\S+)\))*/) {
my %elt;
$elt{"Package"} = $1;
if (defined $2) {
$elt{"CmpOp"} = $3;
$elt{"Version"} = $4;
} else {
$elt{"CmpOp"} = "";
$elt{"Version"} = "";
}
msg(1, " " . dump_depend(\%elt) . "\n");
push @{$packages{$pkg}{$out_type}}, \%elt;
$$i++;
# Special case for packages providing not
# truely virtual packages
# truly virtual packages
if ($lines->[$$i] =~ m/^\s{4}/) {
$elt = [ $elt ];
while ($lines->[$$i] =~ m/\s{4}(\S+)/) {
push @{$elt}, $1;
while ($lines->[$$i] =~ m/\s{4}(\S+)( \((\S+) (\S+)\))*/) {
$elt{"Package"} = $1;
if (defined $2) {
$elt{"CmpOp"} = $3;
$elt{"Version"} = $4;
} else {
$elt{"CmpOp"} = "";
$elt{"Version"} = "";
}
msg(1, " " . dump_depend(\%elt) . "\n");
push @{$packages{$pkg}{$out_type}}, \%elt;
$$i++;
}
}
@ -407,20 +472,90 @@ sub read_depends {
msg(0, " ", $lines->[$_]);
}
}
$type =~ s/^Pre//; # PreDepends are like Depends for me
next if dep_satisfied($elt);
push @{$packages{$pkg}{$type}}, $elt;
}
}
# Big matrix of tests. Check to see if the available version of a
# package matches what we're requesting in a dependency relationship
sub check_versions {
my $wanted = shift;
my $op = shift;
my $available = shift;
# Trivial check - if we don't care about versioning, anything will
# do!
if ($op eq "") {
return 1;
}
# Ask the dpkg perl code to compare the version strings
my $comp = version_compare($available, $wanted);
if ($op eq "<=") {
if ($comp == -1 || $comp == 0) {
return 1;
}
} elsif ($op eq ">=") {
if ($comp == 0 || $comp == 1) {
return 1;
}
} elsif ($op eq "<<") {
if ($comp == -1) {
return 1;
}
} elsif ($op eq ">>") {
if ($comp == 1) {
return 1;
}
} elsif ($op eq "=") {
if ($comp == 0) {
return 1;
}
# Not sure this ("!") actually exists!
# Mentioned in apt sources, but not in debian policy
# No harm done by checking for it, though...
} elsif ($op eq "!") {
if ($comp == -1 || $comp == 1) {
return 1;
}
}
# else
return 0;
}
# Check if a specific dependency package is installed already
sub dep_pkg_included {
my $p = shift;
my %d = %$p;
my $pn = $d{"Package"};
if ($included{$pn}) {
if (check_versions($d{"Version"}, $d{"CmpOp"}, $packages{$pn}{"Version"})) {
msg(1, " $pn is included already, acceptable version " . $packages{$pn}{"Version"} . "\n");
return 1;
} else {
msg(1, " $pn is included already, but invalid version " . $packages{$pn}{"Version"} . "\n");
}
}
# else
return 0;
}
# Check to see if a dependency is satisfied, either a direct
# dependency or any one of an OR array
sub dep_satisfied {
my $p = shift;
if (ref $p) {
if ("ARRAY" eq ref $p) {
foreach (@{$p}) {
return 1 if $included{$_};
if (dep_pkg_included($_)) {
return 1;
}
}
} elsif ("HASH" eq ref $p) {
return dep_pkg_included($p);
} else {
return $included{$p};
die "dep_satisfied: $p is neither a hash nor an array!\n";
}
return 0;
}
@ -429,11 +564,21 @@ sub read_ordepends {
my $i = shift;
my $lines = shift;
my @or = ();
my ($val,$dep, $last) = ('','',0);
my ($val, $dep, $last) = ('','',0);
my ($op, $version);
chomp $lines->[$$i];
while ($lines->[$$i]
=~ m/^\s([\s\|])((?:Pre)?Depends|Suggests|Recommends): (\S+)/) {
=~ m/^\s([\s\|])((?:Pre)?Depends|Suggests|Recommends): (\S+)( \((\S+) (\S+)\))*/) {
$val = $3;
if (defined $4) {
$op = $5;
$version = $6;
} else {
$op = "";
$version = "";
}
$last = 1 if $1 ne '|'; #Stop when no more '|'
if ($val =~ m/^<.*>$/) {
$dep = read_virtualdepends ($i, $lines);
@ -443,11 +588,24 @@ sub read_ordepends {
push @or, $dep;
}
} else {
push @or, $val; $$i++;
# Hack for packages providing not a truely
my %elt;
$elt{"Package"} = $val;
$elt{"CmpOp"} = $op;
$elt{"Version"} = $version;
push @or, \%elt;
$$i++;
# Hack for packages providing not a truly
# virtual package
while ($lines->[$$i] =~ m/^\s{4}(\S+)/) {
push @or, $1;
while ($lines->[$$i] =~ m/^\s{4}(\S+)( \((\S+) (\S+)\))*/) {
$elt{"Package"} = $1;
if (defined $2) {
$elt{"CmpOp"} = $3;
$elt{"Version"} = $4;
} else {
$elt{"CmpOp"} = "";
$elt{"Version"} = "";
}
push @or, \%elt;
$$i++;
}
}
@ -469,14 +627,28 @@ sub read_virtualdepends {
$$i++
}
# Now look at the alternatives on the following lines
while ($lines->[$$i] =~ m/^\s{4}(\S+)/) {
push @or, $1;
while ($lines->[$$i] =~ m/^\s{4}(\S+)( \((\S+) (\S+)\))*/) {
my %elt;
$elt{"Package"} = $1;
if (defined $2) {
$elt{"CmpOp"} = $3;
$elt{"Version"} = $4;
} else {
$elt{"CmpOp"} = "";
$elt{"Version"} = "";
}
push @or, \%elt;
$$i++;
}
if (@or) {
return \@or;
} else {
return $virtual;
my %elt;
$elt{"Package"} = $virtual;
$elt{"CmpOp"} = "";
$elt{"Version"} = "";
push @or, \%elt;
return \@or;
}
}
@ -507,7 +679,7 @@ sub add_package {
return;
}
msg(3, " \@dep before checklist = @dep\n");
msg(3, " \@dep before checklist = " . dump_depend(\@dep) . "\n");
# Check if all packages are allowed (fail if one cannot)
($ok, $reasons) = check_list (\@dep, 1);
@ -517,24 +689,26 @@ sub add_package {
return;
}
msg(3, " \@dep after checklist = @dep\n");
msg(3, " \@dep after checklist = " . dump_depend(\@dep) . "\n");
if ($add_rec) {
#TODO: Look for recommends (not yet included !!)
add_recommends (\@dep, $p);
# Check again but doesn't fail if one of the package cannot be
# installed, just ignore it (it will be removed from @dep)
#TODO: Look for recommends (not yet included !!)
add_recommends (\@dep, $p);
msg(3, " \@dep after add_recommends = " . dump_depend(\@dep) . "\n");
# Check again but doesn't fail if one of the package cannot be
# installed, just ignore it (it will be removed from @dep)
($ok, $reasons) = check_list (\@dep, 0);
if (not $ok) {
msg(0, "UNEXPECTED: It shouldn't fail here !\n");
return;
}
msg(3, " \@dep after checklist2 = @dep\n");
msg(3, " \@dep after checklist2 = " . dump_depend(\@dep) . "\n");
}
if ($add_sug) {
#TODO: Look for suggests (not yet included !!)
add_suggests (\@dep, $p);
msg(3, " \@dep after add_suggests = " . dump_depend(\@dep) . "\n");
# Check again but doesn't fail if one of the package cannot be
# installed, just ignore it (it will be removed from @dep)
($ok, $reasons) = check_list (\@dep, 0);
@ -542,63 +716,77 @@ sub add_package {
msg(0, "UNEXPECTED: It shouldn't fail here !\n");
return;
}
msg(3, " \@dep after checklist3 = @dep\n");
msg(3, " \@dep after checklist3 = " . dump_depend(\@dep) . "\n");
}
# All packages are ok, now check for the size issue
$size = get_size (\@dep);
add_to_output ($size, \@dep);
# All packages are ok, now list them out and add sizes
foreach my $t (@dep) {
my %t = %$t;
my $pkgname = $t{"Package"};
add_to_output($pkgname);
}
}
sub accepted {
my $p = shift;
return not $excluded{$p} if (exists $excluded{$p});
# Return false for a non-existant package ...
# Return false for a non-existent package ...
msg(1, "WARNING: $p cannot be accepted, it doesn't exist ...\n");
return 0;
}
sub add_suggests {
my $list = shift;
my $deps_list = shift;
my $pkg = shift;
my @parents = ($pkg);
my $p; # = shift;
my @copy = @{$list}; # A copy is needed since I'll modify the array
my @copy = @{$deps_list}; # A copy is needed since I'll modify the array
foreach $p (@copy) {
add_missing($list, $packages{$p}{"Suggests"}, $p, 1, \@parents);
my %t = %$p;
my $pkgname = $t{"Package"};
add_missing($deps_list, $packages{$pkgname}{"Suggests"}, \%t, 1, \@parents);
}
}
sub add_recommends {
my $list = shift;
my $deps_list = shift;
my $pkg = shift;
my @parents = ($pkg);
my $p; # = shift;
my @copy = @{$list}; # A copy is needed since I'll modify the array
my @copy = @{$deps_list}; # A copy is needed since I'll modify the array
foreach $p (@copy) {
add_missing($list, $packages{$p}{"Recommends"}, $p, 1, \@parents);
my %t = %$p;
my $pkgname = $t{"Package"};
add_missing($deps_list, $packages{$pkgname}{"Recommends"}, \%t, 1, \@parents);
}
}
sub get_missing {
my $p = shift;
my @list = ();
my @deps_list = ();
my @parents = ();
my %t;
my $dep_text;
if (not add_missing (\@list, $packages{$p}{"Depends"}, $p, 0, \@parents)) {
$t{"Package"} = $p;
$t{"CmpOp"} = "";
$t{"Version"} = "";
if (not add_missing (\@deps_list, $packages{$p}{"Depends"}, \%t, 0, \@parents)) {
return ();
}
remove_entry($p, \@list);
push @list, $p;
return (@list);
# Explicitly move the package itself to the end of the list,
# i.e. *after* all its dependencies
remove_entry(\%t, \@deps_list);
push @deps_list, \%t;
return (@deps_list);
}
# Recursive function adding to the
# Recursive function adding packages to our list
sub add_missing {
my $list = shift;
my $new = shift;
@ -607,59 +795,92 @@ sub add_missing {
my $ok = 1;
my $soft_depend = shift;
my $parents = shift;
my $pkgname;
my (%pkgin);
push(@{$parents}, $pkgin);
if (ref $pkgin eq "HASH") {
%pkgin = %$pkgin;
} else {
die "add_missing passed a non-hash";
}
push(@{$parents}, $pkgin{"Package"});
#msg(3, " add_missing: parents atm @{$parents}\n");
# Check all dependencies
foreach (@{$new}) {
if (ref) {
my $textout = "";
foreach my $orpkg (@{$_}) {
$textout .= "$orpkg ";
}
msg(3, " $pkgin Dep: ( OR $textout) soft_depend $soft_depend\n");
} else {
msg(3, " $pkgin Dep: $_ soft_depend $soft_depend\n");
}
next if dep_satisfied ($_);
# If it's an OR
if (ref) {
my $or_ok = 0;
# Loop over each package in the OR
# We always add the first package in the OR to allow
# APT to figure out which is the better one to install
# for any combination of packages that have similar
# alternative dependencies, but in different order.
# Having the first alternative available should be good
# enough for all cases we care about.
foreach my $thisdep (@{$new}) {
my $textout = "";
$pkgname = $pkgin{"Package"};
# Minor tweak: check all the OR packages
# up-front with no recursion. If *any* one of
# them is already installed, it will do.
foreach my $pkg (@{$_}) {
if ($included{$pkg} or is_in ($pkg, $parents)) {
msg(3, " OR relationship already satisfied by $pkg\n");
# Print out status
if ("ARRAY" eq ref($thisdep)) {
$textout = "(OR ";
foreach my $orpkg (@{$thisdep}) {
$textout .= dump_depend($orpkg) . " ";
}
$textout .= ")";
} elsif ("HASH" eq ref($thisdep)) {
$textout = dump_depend($thisdep);
} else {
die "add_missing: $thisdep should be an array or hash!\n";
}
msg(3, " $pkgname Dep: $textout soft_depend $soft_depend\n");
# Bail out early if we can!
if (dep_satisfied ($thisdep)) {
next;
}
# Still work to do...
# If it's an OR
if ("ARRAY" eq ref($thisdep)) {
my $or_ok = 0;
# First check all the OR packages up-front with no
# recursion. If *any* one of them is already installed, it
# will do.
foreach my $pkg (@{$thisdep}) {
my %t = %$pkg;
my $pkgname = $t{"Package"};
# Already installed?
if (dep_satisfied($pkg)) {
msg(3, " OR relationship already installed: " . dump_depend($pkg) . "\n");
$or_ok = 1;
last;
} else {
msg(3, " $pkg not already installed\n");
}
# Pulled in already somewhere above us in the
# depth-first search? (yes, we have to cope with
# circular dependencies here...)
if (is_in ($t{"Package"}, $parents) &&
check_versions($t{"Version"}, $t{"CmpOp"}, $packages{$pkgname}{"Version"})) {
msg(3, " OR relationship already satisfied by parent " . dump_depend($pkg) . "\n");
$or_ok = 1;
last;
}
# else
msg(3, " " . dump_depend($pkg) . " not already installed\n");
}
# If we don't have any of the OR packages,
# then start again and try them in order
# If we don't have any of the OR packages, then start
# again and try them in order. We always add the first
# package in the OR to allow APT to figure out which is
# the better one to install for any combination of
# packages that have similar alternative dependencies, but
# in different order. Having the first alternative
# available should be good enough for all cases we care
# about.
if (not $or_ok) {
msg(3, " OR relationship not already satisfied, looking at alternatives in order\n");
foreach my $pkg (@{$_}) {
next if not accepted ($pkg);
# If the package is already included
# then don't worry
if ($included{$pkg}) {
$or_ok = 1;
last;
foreach my $pkg (@{$thisdep}) {
my %t = %$pkg;
my $pkgname = $t{"Package"};
if (not accepted($pkgname)) {
next;
}
# Check we don't already have the package
if (is_in ($pkg, $list)) {
if (is_in_dep_list($pkg, $list)) {
$or_ok = 1;
last;
# Otherwise try to add it
@ -668,7 +889,7 @@ sub add_missing {
# package that is
# added successfully
push (@{$list}, $pkg);
if (add_missing ($list, $packages{$pkg}{"Depends"}, $pkg, $soft_depend, $parents)) {
if (add_missing ($list, $packages{$pkgname}{"Depends"}, $pkg, $soft_depend, $parents)) {
$or_ok = 1;
remove_entry($pkg, $list);
push @{$list}, $pkg;
@ -681,52 +902,63 @@ sub add_missing {
}
$ok &&= $or_ok;
if (not $ok) {
$pkgname = $pkgin{"Package"};
if ($soft_depend) {
msg(1, " $pkgin failed, couldn't satisfy OR dep (but it's a soft dep, so ignoring...)\n");
msg(1, " $pkgname failed, couldn't satisfy OR dep (but it's a soft dep, so ignoring...)\n");
$ok = 1;
} else {
msg(1, " $pkgin failed, couldn't satisfy OR dep\n");
msg(1, " $pkgname failed, couldn't satisfy OR dep\n");
}
}
# Else it's a simple dependency
} else {
msg(1, " Looking at adding $_ to satisfy dep\n");
if (not exists $packages{lc $_}) {
msg(1, " $_ doesn't exist...\n");
my %t = %{$thisdep};
my $pt = dump_depend(\%t);
msg(1, " Looking at adding $pt to satisfy dep\n");
if (not exists $packages{lc $t{"Package"}}) {
msg(1, " $pt doesn't exist...\n");
if ($soft_depend) {
msg(1, " soft dep: $pkgin ok, despite missing dep on $_\n");
msg(1, " soft dep: $pkgname ok, despite missing dep on $pt\n");
$ok = 1;
} else {
msg(1, " $pkgin failed, couldn't satisfy dep on $_\n");
msg(1, " $pkgname failed, couldn't satisfy dep on $pt\n");
$ok = 0;
last;
}
}
next if $included{lc $_}; # Already included, don't worry
next if is_in (lc $_, $list);
push @{$list}, lc $_;
if (not add_missing ($list, $packages{lc $_}{"Depends"}, lc $_, $soft_depend, $parents)) {
msg(1, "couldn't add $_ ...\n");
if (dep_satisfied(\%t)) {
msg(1, " $pt already included\n");
next; # Already included, don't worry
}
if (is_in_dep_list(\%t, $list)) {
msg(1, " $pt already in dep list\n");
next;
}
push @{$list}, \%t;
if (not add_missing ($list, $packages{$t{"Package"}}{"Depends"}, \%t, $soft_depend, $parents)) {
my $pkgname = $pkgin{"Package"};
msg(1, "couldn't add $pt ...\n");
if ($soft_depend) {
msg(1, "soft dep: $pkgin ok, despite missing dep on $_\n");
msg(1, "soft dep: $pkgname ok, despite missing dep on $pt\n");
$ok = 1;
} else {
msg(1, "$pkgin failed, couldn't satisfy dep on $_\n");
msg(1, "$pkgname failed, couldn't satisfy dep on $pt\n");
pop @{$list};
$ok = 0;
}
}
remove_entry(lc $_, $list);
push @{$list}, lc $_;
remove_entry(\%t, $list);
push @{$list}, \%t;
}
}
# If a problem has come up, then restore the original list
if (not $ok) {
@{$list} = @backup;
}
if (not is_in(lc $pkgin, $list)) {
push @{$list}, lc $pkgin;
}
if (not is_in_dep_list(\%pkgin, $list)) {
push @{$list}, \%pkgin;
}
return $ok;
}
@ -740,30 +972,41 @@ sub is_in {
return 0;
}
# Remove an antry from @{$array}
sub remove_entry {
my $value = shift;
my $array = shift;
my $entries = scalar(@{$array});
my $i;
# Check if a package dependency is already in a dependency list
sub is_in_dep_list {
my $hash = shift;
my $array = shift;
my %t = %$hash;
for ($i=0; $i < $entries; $i++) {
if (@{$array}[$i] eq $value) {
splice(@{$array}, $i, 1);
$i--;
$entries--;
}
}
foreach my $key (@{$array}) {
my %a = %$key;
if ($a{"Package"} eq $t{"Package"}) {
my $pn = $a{"Package"};
if (check_versions($t{"Version"}, $t{"CmpOp"}, $packages{$pn}{"Version"})) {
return 1;
}
}
}
return 0;
}
# The size of a group of packages
sub get_size {
my $arrayref = shift;
my $size = 0;
foreach (@{$arrayref}) {
$size += $packages{$_}{"Size"};
# Remove an antry from @{$array}
sub remove_entry {
my $tmp1 = shift;
my $array = shift;
my $entries = scalar(@{$array});
my $i;
my %t1 = %$tmp1;
for ($i=0; $i < $entries; $i++) {
my $tmp2 = @{$array}[$i];
my %t2 = %$tmp2;
if ($t1{"Package"} eq $t2{"Package"}) {
splice(@{$array}, $i, 1);
$i--;
$entries--;
}
}
return $size;
}
# Check a list of packages
@ -773,31 +1016,34 @@ sub check_list {
my $ok = 1;
my @to_remove = ();
my $reasons = "";
foreach (@{$ref}) {
if (not exists $excluded{$_}) {
msg(1," $_ has been refused because it doesn't exist ...\n");
$ok = 0;
push @to_remove, $_;
$reasons = $reasons . " noexist";
next;
foreach my $thispkg (@{$ref}) {
my %t = %$thispkg;
my $pkgname = $t{"Package"};
if (not exists $excluded{$pkgname}) {
msg(1," $pkgname has been refused because it doesn't exist ...\n");
$ok = 0;
push @to_remove, $thispkg;
$reasons = $reasons . " noexist";
next;
}
if (not accepted($_)) {
msg(1," $_ has been refused because of $excluded{$_} ...\n");
$ok = 0;
push @to_remove, $_;
$reasons = $reasons . " " . $excluded{$_};
next;
if (not accepted($pkgname)) {
msg(1," $pkgname has been refused because of $excluded{$pkgname} ...\n");
$ok = 0;
push @to_remove, $thispkg;
$reasons = $reasons . " " . $excluded{$pkgname};
next;
}
if ($included{$_}) {
msg(1,
" $_ has already been included in CD $included{$_}.\n");
push @to_remove, $_;
$reasons = $reasons . " alreadyinc";
next;
if ($included{$pkgname}) {
msg(1, " $pkgname has already been included.\n");
push @to_remove, $thispkg;
$reasons = $reasons . " alreadyinc";
next;
}
}
foreach my $removed (@to_remove) {
msg(2, " Removing $removed ... ($reasons )\n");
my %t = %$removed;
my $pkgname = $t{"Package"};
msg(2, " Removing $pkgname ... ($reasons )\n");
@{$ref} = grep { $_ ne $removed } @{$ref};
}
return ($fail ? $ok : 1, $reasons);
@ -805,20 +1051,15 @@ sub check_list {
# Add packages to the output list
sub add_to_output {
my $size = shift;
my $ref = shift;
msg(2, " \$output_size = $output_size, \$size = $size\n");
my $pkgname = shift;
my $size = $packages{$pkgname}{"Size"};
$output_size += $size;
foreach my $pkg (@{$ref}) {
$included{$pkg} = 1;
}
push(@output, @{$ref});
$included{$pkgname} = 1;
push(@output, $pkgname);
}
sub yesno {
my $in = shift;
return $in ? "yes" : "no";
my $in = shift;
return $in ? "yes" : "no";
}