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

fakeroot support for download and don't lowercase include filenames.

Browse source 
git-svn-id: http://emdebian.org/svn/current@7554 563faec7-e20c-0410-992a-a66f704d0ccd
This commit is contained in:
codehelp 2010-10-15 15:37:01 +00:00
parent 7dbae4affb
commit d764a13c22
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
multistrap
View file

@ -260,7 +260,13 @@ foreach my $pkg (values %keyrings) {
if ((defined $k) and (not defined $noauth)) { if ((defined $k) and (not defined $noauth)) {
printf (_g("I: Installing %s\n"), $k); printf (_g("I: Installing %s\n"), $k);
# the keyring package must be available to the external apt # the keyring package must be available to the external apt
system ("apt-get -y -d --reinstall install $k"); my $str = "";
my $e=`LC_ALL=C printenv`;
if ($e !~ /\nFAKEROOTKEY=[0-9]+\n/) {
if (($e =~ /\nUSER=root\n/)) {
$str = "sudo" if (-f "/usr/bin/sudo");
}
system ("$str apt-get -y -d --reinstall install $k");
foreach my $keyring_pkg (values %keyrings) { foreach my $keyring_pkg (values %keyrings) {
my @files=(); my @files=();
my $file = `find /var/cache/apt/archives/ -name "$keyring_pkg*"`; my $file = `find /var/cache/apt/archives/ -name "$keyring_pkg*"`;
@ -859,7 +865,8 @@ sub cascade {
push @debootstrap, @b; push @debootstrap, @b;
my @a = split (' ', lc($keys{$section}{'aptsources'})); my @a = split (' ', lc($keys{$section}{'aptsources'}));
push @aptsources, @a; push @aptsources, @a;
my @i = split (' ', lc($keys{$section}{'include'})); my @i = split (' ', $keys{$section}{'include'})
if (defined $keys{$section}{'include'});
foreach my $inc (@i) { foreach my $inc (@i) {
# look for the full filepath or try same directory as current conf. # look for the full filepath or try same directory as current conf.
if (not -f $inc) { if (not -f $inc) {