forked from josch/mmdebstrap
improve dpkg and apt version parsing
This commit is contained in:
parent
aaa7c14275
commit
7a43ff89dc
2 changed files with 23 additions and 18 deletions
22
coverage.sh
22
coverage.sh
|
@ -3134,11 +3134,13 @@ rm /tmp/debian-chroot/etc/fstab
|
|||
rm /tmp/debian-chroot/etc/hostname
|
||||
rm /tmp/debian-chroot/etc/resolv.conf
|
||||
rm /tmp/debian-chroot/var/lib/dpkg/status
|
||||
rm /tmp/debian-chroot/var/lib/dpkg/available
|
||||
rm /tmp/debian-chroot/var/cache/apt/archives/lock
|
||||
rm /tmp/debian-chroot/var/lib/dpkg/lock
|
||||
rm /tmp/debian-chroot/var/lib/dpkg/lock-frontend
|
||||
if [ "$mode" != "chrootless" ] || dpkg --compare-versions "\$(dpkg --robot --version)" lt 1.20.0; then
|
||||
rm /tmp/debian-chroot/var/lib/dpkg/available
|
||||
rm /tmp/debian-chroot/var/lib/dpkg/cmethopt
|
||||
fi
|
||||
rm /tmp/debian-chroot/var/lib/apt/lists/lock
|
||||
## delete merged usr symlinks
|
||||
#rm /tmp/debian-chroot/libx32
|
||||
|
@ -3202,13 +3204,15 @@ rm /tmp/debian-chroot/etc/fstab
|
|||
rm /tmp/debian-chroot/etc/hostname
|
||||
rm /tmp/debian-chroot/etc/resolv.conf
|
||||
rm /tmp/debian-chroot/var/lib/dpkg/status
|
||||
rm /tmp/debian-chroot/var/lib/dpkg/available
|
||||
rm /tmp/debian-chroot/var/cache/apt/archives/lock
|
||||
rm /tmp/debian-chroot/var/lib/dpkg/lock
|
||||
rm /tmp/debian-chroot/var/lib/dpkg/lock-frontend
|
||||
rm /tmp/debian-chroot/var/lib/dpkg/cmethopt
|
||||
rm /tmp/debian-chroot/var/lib/apt/lists/lock
|
||||
rm /tmp/debian-chroot/var/lib/apt/extended_states
|
||||
if [ "$mode" != "chrootless" ] || dpkg --compare-versions "\$(dpkg --robot --version)" lt 1.20.0; then
|
||||
rm /tmp/debian-chroot/var/lib/dpkg/available
|
||||
rm /tmp/debian-chroot/var/lib/dpkg/cmethopt
|
||||
fi
|
||||
## delete merged usr symlinks
|
||||
#rm /tmp/debian-chroot/libx32
|
||||
#rm /tmp/debian-chroot/lib64
|
||||
|
@ -3322,13 +3326,15 @@ rm /tmp/debian-chroot/etc/fstab
|
|||
rm /tmp/debian-chroot/etc/hostname
|
||||
rm /tmp/debian-chroot/etc/resolv.conf
|
||||
rm /tmp/debian-chroot/var/lib/dpkg/status
|
||||
rm /tmp/debian-chroot/var/lib/dpkg/available
|
||||
rm /tmp/debian-chroot/var/cache/apt/archives/lock
|
||||
rm /tmp/debian-chroot/var/lib/dpkg/lock
|
||||
rm /tmp/debian-chroot/var/lib/dpkg/lock-frontend
|
||||
rm /tmp/debian-chroot/var/lib/dpkg/cmethopt
|
||||
rm /tmp/debian-chroot/var/lib/apt/lists/lock
|
||||
rm /tmp/debian-chroot/var/lib/apt/extended_states
|
||||
if dpkg --compare-versions "\$(dpkg --robot --version)" lt 1.20.0; then
|
||||
rm /tmp/debian-chroot/var/lib/dpkg/available
|
||||
rm /tmp/debian-chroot/var/lib/dpkg/cmethopt
|
||||
fi
|
||||
## delete merged usr symlinks
|
||||
#rm /tmp/debian-chroot/libx32
|
||||
#rm /tmp/debian-chroot/lib64
|
||||
|
@ -3383,13 +3389,15 @@ rm /tmp/debian-chroot/etc/fstab
|
|||
rm /tmp/debian-chroot/etc/hostname
|
||||
rm /tmp/debian-chroot/etc/resolv.conf
|
||||
rm /tmp/debian-chroot/var/lib/dpkg/status
|
||||
rm /tmp/debian-chroot/var/lib/dpkg/available
|
||||
rm /tmp/debian-chroot/var/cache/apt/archives/lock
|
||||
rm /tmp/debian-chroot/var/lib/dpkg/lock
|
||||
rm /tmp/debian-chroot/var/lib/dpkg/lock-frontend
|
||||
rm /tmp/debian-chroot/var/lib/dpkg/cmethopt
|
||||
rm /tmp/debian-chroot/var/lib/apt/lists/lock
|
||||
rm /tmp/debian-chroot/var/lib/apt/extended_states
|
||||
if dpkg --compare-versions "\$(dpkg --robot --version)" lt 1.20.0; then
|
||||
rm /tmp/debian-chroot/var/lib/dpkg/available
|
||||
rm /tmp/debian-chroot/var/lib/dpkg/cmethopt
|
||||
fi
|
||||
## delete merged usr symlinks
|
||||
#rm /tmp/debian-chroot/libx32
|
||||
#rm /tmp/debian-chroot/lib64
|
||||
|
|
19
mmdebstrap
19
mmdebstrap
|
@ -1392,7 +1392,7 @@ sub setup {
|
|||
sub run_setup() {
|
||||
my $options = shift;
|
||||
|
||||
my $dpkgversion;
|
||||
my $dpkgversion = version->new(0);
|
||||
{
|
||||
my $pid = open my $fh, '-|' // error "failed to fork(): $!";
|
||||
if ($pid == 0) {
|
||||
|
@ -1403,17 +1403,18 @@ sub run_setup() {
|
|||
exec 'dpkg', '--robot', '--version';
|
||||
}
|
||||
chomp(
|
||||
$dpkgversion = do { local $/; <$fh> }
|
||||
my $content = do { local $/; <$fh> }
|
||||
);
|
||||
close $fh;
|
||||
if ($? == 0 and $dpkgversion =~ /^([0-9]+\.[0-9]+\.[0-9]+) \(\S+\)$/) {
|
||||
# the --robot option was introduced in 1.20.0 but until 1.20.2 the
|
||||
# output contained a string after the version, separated by a
|
||||
# whitespace -- since then, it's only the version
|
||||
if ($? == 0 and $content =~ /^([0-9.]+)( .*)?$/) {
|
||||
# dpkg is new enough for the --robot option
|
||||
$dpkgversion = version->new($1);
|
||||
} else {
|
||||
$dpkgversion = undef;
|
||||
}
|
||||
}
|
||||
my $aptversion;
|
||||
my $aptversion = version->new(0);
|
||||
{
|
||||
my $pid = open my $fh, '-|', 'apt-get',
|
||||
'--version' // error "failed to fork(): $!";
|
||||
|
@ -1437,7 +1438,6 @@ sub run_setup() {
|
|||
# since we do not know the dpkg version inside the chroot at this
|
||||
# point, we can only omit it in chrootless mode
|
||||
if ( $options->{mode} ne 'chrootless'
|
||||
or not defined $dpkgversion
|
||||
or $dpkgversion < "1.20.0") {
|
||||
push @directories, '/etc/dpkg/dpkg.cfg.d/';
|
||||
}
|
||||
|
@ -1449,7 +1449,6 @@ sub run_setup() {
|
|||
# since we do not know the dpkg version inside the chroot at this
|
||||
# point, we can only omit it in chrootless mode
|
||||
if ( $options->{mode} ne 'chrootless'
|
||||
or not defined $dpkgversion
|
||||
or $dpkgversion < "1.20.0") {
|
||||
push @directories, '/var/lib/dpkg/triggers',
|
||||
'/var/lib/dpkg/info', '/var/lib/dpkg/alternatives',
|
||||
|
@ -1525,7 +1524,7 @@ sub run_setup() {
|
|||
print $conf "pkgCacheGen::ForceEssential \",\";\n";
|
||||
}
|
||||
if ($options->{dryrun}
|
||||
and (not defined $aptversion or $aptversion < "2.1.16")) {
|
||||
and ($aptversion < "2.1.16")) {
|
||||
# Without this option, apt will fail with:
|
||||
# E: Could not configure 'libc6:amd64'.
|
||||
# E: Could not perform immediate configuration on 'libgcc1:amd64'.
|
||||
|
@ -1569,7 +1568,6 @@ sub run_setup() {
|
|||
# since we do not know the dpkg version inside the chroot at this point, we
|
||||
# can only omit it in chrootless mode
|
||||
if ( $options->{mode} ne 'chrootless'
|
||||
or not defined $dpkgversion
|
||||
or $dpkgversion < "1.20.0") {
|
||||
open my $fh, '>', "$options->{root}/var/lib/dpkg/available"
|
||||
or error "failed to open(): $!";
|
||||
|
@ -1581,7 +1579,6 @@ sub run_setup() {
|
|||
# since we do not know the dpkg version inside the chroot at this point, we
|
||||
# can only omit it in chrootless mode
|
||||
if ( $options->{mode} ne 'chrootless'
|
||||
or not defined $dpkgversion
|
||||
or $dpkgversion < "1.20.0") {
|
||||
open my $fh, '>', "$options->{root}/var/lib/dpkg/cmethopt"
|
||||
or error "failed to open(): $!";
|
||||
|
|
Loading…
Reference in a new issue