From 1b1f845635a1542fc2b7fda43d8dc44e55a8fded Mon Sep 17 00:00:00 2001 From: Jason Stubbs Date: Thu, 1 Sep 2005 14:42:25 +0000 Subject: 68928-spawn-command-isabs-zmedico.patch (spawn included "." in PATH) 98727_sleep_locale_cleanup.patch (sleep was defined twice for "." and "," locales) 98827_lchown_normal_files.patch (lchown was being used on known-to-be-regular files) 98827_darwin_noop_lchown.patch (lchwon was aliased to chown on darwin) 99101_ccache_perms_adjust.patch (perms test and adjustment didn't match) 99120_uid_gid_mixup.patch (portage gid used in place of uid) 99418_merge_retcode_ignored.patch (dispatch-conf ignored result of merge command) 100382_incomplete_world.patch (versioned atoms were not being added to world) broken-stat-perms.patch (result of conditional execution being unconditionally tested) svn path=/main/branches/2.0/; revision=1960 --- bin/dispatch-conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'bin/dispatch-conf') diff --git a/bin/dispatch-conf b/bin/dispatch-conf index 0d316126a..5007353fc 100755 --- a/bin/dispatch-conf +++ b/bin/dispatch-conf @@ -186,7 +186,10 @@ class dispatch: elif c == 'm': merged = SCRATCH_DIR+"/"+os.path.basename(conf['current']) print - os.system (self.options['merge'] % (merged, conf ['current'], newconf)) + ret = os.system (self.options['merge'] % (merged, conf ['current'], newconf)) + if ret: + print "Failure running 'merge' command" + continue shutil.copyfile(merged, mrgconf) os.remove(merged) mystat = os.lstat(conf['new']) -- cgit v1.2.3-1-g7c22