summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-11-06 13:24:17 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-11-06 13:24:17 +0000
commitabcb17a4ae6fe105c23b767148d3fa7cd12b1677 (patch)
tree2476b250abf94edeb969f82f009cdfc8c2e5d1e6
parentda7f92fb4a57007ef3de9c2cb3be6a8ea1719083 (diff)
downloaddrakx-abcb17a4ae6fe105c23b767148d3fa7cd12b1677.tar
drakx-abcb17a4ae6fe105c23b767148d3fa7cd12b1677.tar.gz
drakx-abcb17a4ae6fe105c23b767148d3fa7cd12b1677.tar.bz2
drakx-abcb17a4ae6fe105c23b767148d3fa7cd12b1677.tar.xz
drakx-abcb17a4ae6fe105c23b767148d3fa7cd12b1677.zip
ensure make_live doesn't fail when called twice (when $::prefix/dev is already gone)
-rwxr-xr-xmove/make_live2
1 files changed, 1 insertions, 1 deletions
diff --git a/move/make_live b/move/make_live
index 9246f9a11..8358ce666 100755
--- a/move/make_live
+++ b/move/make_live
@@ -67,7 +67,7 @@ print "Making live in $::prefix directory.\n";
system("chroot $::prefix update-menus");
system("chroot $::prefix fc-cache"); #- generate cache in all directories mentioned in config file
system("chroot $::prefix kbuildsycoca --global");
- rm_rf("$::prefix/dev"); # we don't need it, we use devfs
+ eval { rm_rf("$::prefix/dev") }; # we don't need it, we use devfs
}
symlinkf('/var/lib/xkb', "$::prefix/etc/X11/xkb/compiled"); # don't want the relative path, prefering the absolute path