We cannot use perl 'keys', because that return a list with random
order. Some packages use preinst scripts (run at unpack time), so
package order is important.
(cherry picked from commit
a922f88f4abeea8ff9d268ea2bd9dcadab9b98e2)
# first, record provided packages
__record_provides ($pkginfo, $closure, $list, 1);
# first, record provided packages
__record_provides ($pkginfo, $closure, $list, 1);
+ my $pkghash = {};
+ my $pkglist = [];
# then resolve dependencies
foreach my $pname (@$list) {
# then resolve dependencies
foreach my $pname (@$list) {
- __closure_single ($pkginfo, $closure, $pkgs, $pname, $self->{excl});
+ __closure_single ($pkginfo, $closure, $pkghash, $pkglist, $pname, $self->{excl});
- return [ keys %$pkgs ];
- my ($pkginfo, $closure, $pkgs, $pname, $excl) = @_;
+ my ($pkginfo, $closure, $pkghash, $pkglist, $pname, $excl) = @_;
$pname =~ s/^\s+//;
$pname =~ s/\s+$//;
$pname =~ s/^\s+//;
$pname =~ s/\s+$//;
my $url = $info->{url};
$url || die "$pname: no url for package '$pname'";
my $url = $info->{url};
$url || die "$pname: no url for package '$pname'";
+
+ if (!$pkghash->{$pname}) {
+ unshift @$pkglist, $pname;
+ $pkghash->{$pname} = 1;
+ }
__record_provides ($pkginfo, $closure, [$pname]) if $info->{provides};
__record_provides ($pkginfo, $closure, [$pname]) if $info->{provides};
#printf (STDERR "$pname: $p --> $found\n");
#printf (STDERR "$pname: $p --> $found\n");
- __closure_single ($pkginfo, $closure, $pkgs, $found, $excl);
+ __closure_single ($pkginfo, $closure, $pkghash, $pkglist, $found, $excl);
push @$important, "postfix";
}
push @$important, "postfix";
}
- foreach my $p (keys %$pkginfo) {
+ foreach my $p (sort keys %$pkginfo) {
next if grep { $p eq $_ } @{$self->{excl}};
my $pri = $pkginfo->{$p}->{priority};
next if !$pri;
next if grep { $p eq $_ } @{$self->{excl}};
my $pri = $pkginfo->{$p}->{priority};
next if !$pri;
$self->ve_dpkg ('install', 'mawk');
$self->ve_dpkg ('install', 'debconf');
$self->ve_dpkg ('install', 'mawk');
$self->ve_dpkg ('install', 'debconf');
# unpack required packages
foreach my $p (@$required) {
$self->ve_dpkg ('unpack', $p);
# unpack required packages
foreach my $p (@$required) {
$self->ve_dpkg ('unpack', $p);