closure: fix package ordering

[dab.git] / DAB.pm

diff --git a/DAB.pm b/DAB.pm
index 8991084bb0897ec0d3e49574edcefdad78961ce5..caedf5023788c176dd047ab9bd7f0aaf31dc2306 100644 (file)
--- a/DAB.pm
+++ b/DAB.pm
@@ -345,6 +345,8 @@ sub new {
        $config->{ostype} = "ubuntu-15.10";
     } elsif ($suite eq 'xenial') {
        $config->{ostype} = "ubuntu-16.04";
+    } elsif ($suite eq 'yakkety') {
+       $config->{ostype} = "ubuntu-16.10";
     } else {
        die "unsupported debian suite '$suite'\n";
     }
@@ -376,7 +378,7 @@ sub new {
            push @{$config->{source}}, "http://security.debian.org SUITE/updates main contrib";
        } elsif ($suite eq 'hardy' || $suite eq 'intrepid' || $suite eq 'jaunty' ||
                 $suite eq 'xenial' || $suite eq 'wily' || $suite eq 'vivid' ||
-                $suite eq 'trusty' || $suite eq 'precise') {
+                $suite eq 'trusty' || $suite eq 'precise' || $suite eq 'yakkety') {
            my $comp = "main restricted universe multiverse";
            push @{$config->{source}}, "http://archive.ubuntu.com/ubuntu SUITE $comp"; 
            push @{$config->{source}}, "http://archive.ubuntu.com/ubuntu SUITE-updates $comp"; 
@@ -443,7 +445,8 @@ sub new {
     # ubuntu has too many dependencies on udev, so
     # we cannot exclude it (instead we disable udevd)
 
-    if ($suite eq 'vivid' || $suite eq 'wily' || $suite eq 'xenial') {
+    if ($suite eq 'vivid' || $suite eq 'wily' || $suite eq 'xenial' ||
+       $suite eq 'yakkety') {
        push @$incl, 'isc-dhcp-client';
        push @$excl, qw(libmodule-build-perl);
     } elsif ($suite eq 'trusty') {
@@ -1005,18 +1008,19 @@ sub closure {
     # first, record provided packages
     __record_provides ($pkginfo, $closure, $list, 1);
 
-    my $pkgs = {};
+    my $pkghash = {};
+    my $pkglist = [];
 
     # 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 ];
+    return $pkglist;
 }
 
 sub __closure_single {
-    my ($pkginfo, $closure, $pkgs, $pname, $excl) = @_;
+    my ($pkginfo, $closure, $pkghash, $pkglist, $pname, $excl) = @_;
 
     $pname =~ s/^\s+//;
     $pname =~ s/\s+$//;
@@ -1033,8 +1037,11 @@ sub __closure_single {
     my $url = $info->{url};
 
     $url || die "$pname: no url for package '$pname'";
-    
-    $pkgs->{$pname} = 1;
+
+    if (!$pkghash->{$pname}) {
+       unshift @$pkglist, $pname;
+       $pkghash->{$pname} = 1;
+    }
 
     __record_provides ($pkginfo, $closure, [$pname]) if $info->{provides};
 
@@ -1070,7 +1077,7 @@ sub __closure_single {
 
       #printf (STDERR "$pname: $p --> $found\n");
          
-      __closure_single ($pkginfo, $closure, $pkgs, $found, $excl);
+      __closure_single ($pkginfo, $closure, $pkghash, $pkglist, $found, $excl);
   }
 }
 
@@ -1119,7 +1126,8 @@ sub install_init_script {
     $self->run_command ("install -m 0755 '$script' '$target'");
     if ($suite eq 'etch' || $suite eq 'lenny') {
        $self->ve_command ("update-rc.d $base start $prio $runlevel .");
-    } elsif ($suite eq 'xenial' || $suite eq 'wily' || $suite eq 'vivid') {
+    } elsif ($suite eq 'xenial' || $suite eq 'wily' || $suite eq 'vivid' ||
+            $suite eq 'yakkety') {
        die "unable to install init script (system uses systemd)\n";
     } elsif ($suite eq 'trusty' || $suite eq 'precise') {
        die "unable to install init script (system uses upstart)\n";
@@ -1147,7 +1155,7 @@ sub bootstrap {
        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;
@@ -1238,7 +1246,7 @@ sub bootstrap {
     # avoid warnings about non-existent resolv.conf
     write_file ("", "$rootdir/etc/resolv.conf", 0644);
 
-    if ($suite eq 'xenial' || $suite eq 'wily') {
+    if ($suite eq 'yakkety' || $suite eq 'xenial' || $suite eq 'wily') {
        # no need to configure loopback device
     } else {
        $data = "auto lo\niface lo inet loopback\n";
@@ -1280,7 +1288,7 @@ sub bootstrap {
 
     $self->ve_dpkg ('install', 'mawk');
     $self->ve_dpkg ('install', 'debconf');
-    
+
     # unpack required packages
     foreach my $p (@$required) {
        $self->ve_dpkg ('unpack', $p);