diff options
| author |   Jason Stubbs <jstubbs@gentoo.org> | 2005-09-01 14:42:25 +0000 |
|---|---|---|
| committer | Jason Stubbs <jstubbs@gentoo.org> | 2005-09-01 14:42:25 +0000 |
| commit | 1b1f845635a1542fc2b7fda43d8dc44e55a8fded (patch) | |
| tree | 0fecbe5b910b08edf7837a6a2be02d7af7c85bc5 /bin/dispatch-conf | |
| parent | don't commit the remenants from applying a patch (diff) | |
| download | portage-multirepo-1b1f845635a1542fc2b7fda43d8dc44e55a8fded.tar.gz portage-multirepo-1b1f845635a1542fc2b7fda43d8dc44e55a8fded.tar.bz2 portage-multirepo-1b1f845635a1542fc2b7fda43d8dc44e55a8fded.zip | |
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
Diffstat (limited to 'bin/dispatch-conf')
| -rwxr-xr-x | bin/dispatch-conf | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bin/dispatch-conf b/bin/dispatch-conf index 0d316126..5007353f 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']) |