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

Ensure that realpath does really exist (local test debugging) and guard against an undefined keyring pkg variable.

Browse source 
git-svn-id: http://emdebian.org/svn/current@7765 563faec7-e20c-0410-992a-a66f704d0ccd
This commit is contained in:
codehelp 2011-02-09 17:19:49 +00:00
parent 9bb4403541
commit af316c5101
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
debian/changelog vendored
View file

@ -3,8 +3,10 @@ multistrap (2.1.12) unstable; urgency=low
* Fix hook implementation if no hooks in use * Fix hook implementation if no hooks in use
* Accumulate warnings from system calls and hooks and report to user * Accumulate warnings from system calls and hooks and report to user
at the end of the operation. at the end of the operation.
* Ensure that realpath does really exist (local test debugging) and
guard against an undefined keyring pkg variable.
-- Neil Williams <codehelp@debian.org> Tue, 08 Feb 2011 20:38:33 +0000 -- Neil Williams <codehelp@debian.org> Wed, 09 Feb 2011 17:19:37 +0000
multistrap (2.1.11) unstable; urgency=low multistrap (2.1.11) unstable; urgency=low

5
multistrap
View file

@ -78,6 +78,10 @@ die ($msg)
if (not defined $file); if (not defined $file);
undef ($msg); undef ($msg);
my $realpath = `which realpath`;
chomp ($realpath);
die (_g("ERR: Unable to find realpath - missing dependency.\n")) if (not -x ($realpath));
$cachedir = "var/cache/apt/"; # archives $cachedir = "var/cache/apt/"; # archives
$libdir = "var/lib/apt/"; # lists $libdir = "var/lib/apt/"; # lists
$etcdir = "etc/apt/"; # sources $etcdir = "etc/apt/"; # sources
@ -256,6 +260,7 @@ if ((defined $k) and (not defined $noauth)) {
} }
system ("$str apt-get -y -d --reinstall install $k"); system ("$str apt-get -y -d --reinstall install $k");
foreach my $keyring_pkg (values %keyrings) { foreach my $keyring_pkg (values %keyrings) {
next if (not defined $keyring_pkg);
my @files=(); my @files=();
my $file = `find /var/cache/apt/archives/ -name "$keyring_pkg*"|grep -m1 $keyring_pkg`; my $file = `find /var/cache/apt/archives/ -name "$keyring_pkg*"|grep -m1 $keyring_pkg`;
chomp ($file); chomp ($file);