summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-12-27 20:30:20 +0000
committerOlivier Blin <oblin@mandriva.org>2005-12-27 20:30:20 +0000
commiteb8402e31843366713c1d9d16825a74057c45fdd (patch)
tree9ca751b538734e3cc99e72391fe4c6fcd7afae4b
parent454a867510e81ceeba1e8a6ba7148a1c4540c51f (diff)
downloaddrakx-eb8402e31843366713c1d9d16825a74057c45fdd.tar
drakx-eb8402e31843366713c1d9d16825a74057c45fdd.tar.gz
drakx-eb8402e31843366713c1d9d16825a74057c45fdd.tar.bz2
drakx-eb8402e31843366713c1d9d16825a74057c45fdd.tar.xz
drakx-eb8402e31843366713c1d9d16825a74057c45fdd.zip
check that abs_path doesn't fail to find (rpm/patch) files
-rwxr-xr-xtools/draklive12
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/draklive b/tools/draklive
index 9d33c1d0e..ed62ea586 100755
--- a/tools/draklive
+++ b/tools/draklive
@@ -431,13 +431,13 @@ sub install_system {
sub post_install_system {
my ($live) = @_;
- run_('urpmi',
- '--root',
- $live->{system}{root},
- map { abs_path($_) } @{$live->{system}{rpms}}) if @{$live->{system}{rpms}};
+ my @rpms = map { abs_path($_) } @{$live->{system}{rpms}};
+ each_index { !defined $_ and die "unable to find file " . $live->{system}{rpms}[$::i] } @rpms;
+ run_('urpmi', '--root', $live->{system}{root}, @rpms) if @rpms;
- run_('patch', '-p0', '-s', '-N', '-F', 0, '-d', $live->{system}{root}, '-r', '/tmp', '-i', $_)
- foreach map { abs_path($_) } @{$live->{system}{patches}};
+ my @patches = map { abs_path($_) } @{$live->{system}{patches}};
+ each_index { !defined $_ and die "unable to find file " . $live->{system}{patches}[$::i] } @patches;
+ run_('patch', '-p0', '-s', '-N', '-F', 0, '-d', $live->{system}{root}, '-r', '/tmp', '-i', $_) foreach @patches;
#- make sure harddrake is run
#- (do it in chroot, or else Storable from the build box may write an incompatible config file)