From ff9ca69b4f32f60b1a540851768addc3faf90a57 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Fri, 5 Feb 2010 10:38:16 +0300 Subject: [PATCH] Remove 5 seconds delays of unmerge (IssueID #119) --- Change.log | 1 + install/calculate | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Change.log b/Change.log index 435dfab..47dd80a 100644 --- a/Change.log +++ b/Change.log @@ -1,6 +1,7 @@ CHANGE LOG 1.3.7 +* Remove delay on unmerge performing. 1.3.6 * Fix bashrc for work with /var/lib/layman. diff --git a/install/calculate b/install/calculate index 4292c08..a7e73a5 100755 --- a/install/calculate +++ b/install/calculate @@ -4140,7 +4140,7 @@ sub configure{ #chroot emerge sys-apps/openrc printmes(" ".gettext('Execute')); printmes(" emerge sys-apps/openrc..."); - system "$data{emergerun1} -C sys-apps/baselayout sys-apps/sysvinit $data{emergerun2} &>/dev/null"; + system "CLEAN_DELAY=0 $data{emergerun1} -C --backtrack=0 sys-apps/baselayout sys-apps/sysvinit $data{emergerun2} &>/dev/null"; system "$data{path} rm $data{chroot}/etc/init.d/depscan.sh $data{chroot}/etc/init.d/functions.sh $data{chroot}/etc/init.d/runscript.sh"; if(system "$data{emergerun1} sys-apps/openrc sys-apps/sysvinit sys-fs/udev sys-fs/e2fsprogs $data{emergerun2} &>/dev/null"){ @@ -6738,7 +6738,7 @@ sub makeadd{ $packages .= " =$1"; $list{$1} ++; } - if(system "$data{path} emerge -C $packages &>/dev/null"){ + if(system "$data{path} CLEAN_DELAY=0 emerge -C --backtrack=0 $packages &>/dev/null"){ printmes(" ".gettext('error').".\n"); return ""; }else{