josch/multistrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove workaround for apt from lenny.

Browse source 
git-svn-id: http://emdebian.org/svn/current@7751 563faec7-e20c-0410-992a-a66f704d0ccd
This commit is contained in:
codehelp 2011-02-07 12:11:13 +00:00
parent 1a736b4e46
commit 451dc6920d
2 changed files with 12 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
debian/changelog vendored
View file

@ -3,8 +3,9 @@ multistrap (2.1.11) unstable; urgency=low
* Fix examples in comments within device_table.txt to * Fix examples in comments within device_table.txt to
use consistent tabs. (Closes: #611808) use consistent tabs. (Closes: #611808)
* Add example for wheezy and use permanent codenames. * Add example for wheezy and use permanent codenames.
* Remove workaround for apt from lenny.
-- Neil Williams <codehelp@debian.org> Sun, 06 Feb 2011 20:36:49 +0000 -- Neil Williams <codehelp@debian.org> Mon, 07 Feb 2011 12:09:55 +0000
multistrap (2.1.10) experimental; urgency=low multistrap (2.1.10) experimental; urgency=low

42
multistrap
View file

@ -1,6 +1,6 @@
#!/usr/bin/perl #!/usr/bin/perl
# Copyright (C) 2009, 2010 Neil Williams <codehelp@debian.org> # Copyright (C) 2009-2011 Neil Williams <codehelp@debian.org>
# #
# This package is free software; you can redistribute it and/or modify # This package is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -155,7 +155,7 @@ if (not -d "$dir") {
my $msg = sprintf (_g("Unable to create directory '%s'"),$dir); my $msg = sprintf (_g("Unable to create directory '%s'"),$dir);
die "$progname: $msg\n" if ($ret != 0); die "$progname: $msg\n" if ($ret != 0);
} }
$dir = `realpath $dir`; $dir = `realpath $dir 2>/dev/null`;
chomp ($dir); chomp ($dir);
$dir .= ($dir =~ m:/$:) ? '' : "/"; $dir .= ($dir =~ m:/$:) ? '' : "/";
system ("mkdir -p ${dir}${cachedir}") if (not -d "${dir}${cachedir}"); system ("mkdir -p ${dir}${cachedir}") if (not -d "${dir}${cachedir}");
@ -437,8 +437,8 @@ print "\n";
exit 0; exit 0;
sub our_version { sub our_version {
my $query = `dpkg-query -W -f='\${Version}' multistrap`; my $query = `dpkg-query -W -f='\${Version}' multistrap 2>/dev/null`;
(defined $query) ? return $query : return "2.1.5"; ($query ne "") ? return $query : return "2.1.5";
} }
sub add_extra_packages { sub add_extra_packages {
@ -610,7 +610,7 @@ sub check_bin_sh {
unlink ("$dir/var/lib/dpkg/info/dash.postinst"); unlink ("$dir/var/lib/dpkg/info/dash.postinst");
# now ensure that a usable shell is available as /bin/sh # now ensure that a usable shell is available as /bin/sh
if (not -l "$dir/bin/sh") { if (not -l "$dir/bin/sh") {
print (_g("ERR: ./bin/sh symbolic link does not exist.\n")); print (_g("INF: ./bin/sh symbolic link does not exist.\n"));
if (-f "$dir/bin/dash") { if (-f "$dir/bin/dash") {
print (_g("INF: Setting ./bin/sh -> ./bin/dash\n")); print (_g("INF: Setting ./bin/sh -> ./bin/dash\n"));
chdir ("$dir/bin"); chdir ("$dir/bin");
@ -840,9 +840,9 @@ bootstrap=Debian
packages= packages=
source=http://cdn.debian.net/debian source=http://cdn.debian.net/debian
keyring=debian-archive-keyring keyring=debian-archive-keyring
suite=lenny suite=stable
This will result in a completely normal bootstrap of Debian lenny from This will result in a completely normal bootstrap of Debian stable from
the specified mirror, for armel in /opt/multistrap/. the specified mirror, for armel in /opt/multistrap/.
'Architecture' and 'directory' can be overridden on the command line. 'Architecture' and 'directory' can be overridden on the command line.
@ -903,7 +903,9 @@ sub cascade {
my @p = split(' ', lc($keys{$section}{'debconfseed'})) my @p = split(' ', lc($keys{$section}{'debconfseed'}))
if (defined $keys{$section}{'debconfseed'}); if (defined $keys{$section}{'debconfseed'});
foreach my $f (@p) { foreach my $f (@p) {
my $fl = `realpath $f`; my $fl = `realpath $f 2>/dev/null`;
chomp($fl);
next if ($fl eq "");
next if (not -f $fl); next if (not -f $fl);
chomp ($fl); chomp ($fl);
push @debconf, $fl; push @debconf, $fl;
@ -962,30 +964,6 @@ sub cascade {
$uniq{$x}++; $uniq{$x}++;
} }
@extrapkgs = keys %uniq; @extrapkgs = keys %uniq;
# check for old versions of apt, <= 0.7.20.2+lenny1
my $aptVer = `dpkg-query -W -f='\${Version}' apt`;
if (defined $aptVer and ($aptVer ne "")) {
chomp ($aptVer);
my $retval = system ("dpkg --compare-versions $aptVer '>>' 0.7.20.2+lenny1");
$retval /= 256;
if ($retval == 1) {
foreach my $key (sort keys %suites) {
if (($suites{$key} =~ /lenny/)
or ($suites{$key} =~ /squeeze/)
or ($suites{$key} =~ /sid/)
or ($suites{$key} =~ /etch/)) {
my $msg = sprintf (_g("ERROR: Your version of apt is too old to support ".
"using a codename like '%s'. You MUST use the suite and multistrap is ".
"unable to guess which one you meant because suites change over time. " .
"Use one of: 'oldstable', 'stable', 'stable-proposed-updates', 'testing',".
" 'unstable' or 'experimental'. Alternatively, upgrade to version of apt ".
"newer than 0.7.20.2+lenny1.\n"), $suites{$key});
system ("echo \"$msg\" | fold -s");
exit 5;
}
}
}
}
} }
sub _g { sub _g {