# HG changeset patch # User Goffi # Date 1294337810 -3600 # Node ID 6a37bc1b0b8c7803a380006133bffe4606e0e6f8 # Parent 0cd5b3c4513fbcea26f5deb38f1b4e6ac18483e2 distutils: fixed custom wokkel building diff -r 0cd5b3c4513f -r 6a37bc1b0b8c setup.py --- a/setup.py Thu Jan 06 18:48:56 2011 +0100 +++ b/setup.py Thu Jan 06 19:16:50 2011 +0100 @@ -73,12 +73,16 @@ '/usr/bin/hg commit -m "Merged wokkel\'s MUC branch"', '%s setup.py install' % sys.executable] for command in commands: - ret = subprocess.call(command, shell=True) - if ret!=0: - os.chdir(ori_path) - print ("ERROR while building/installing custom wokkel") - print ('Error happened when executing [%s]' % command) - raise MercurialException + if command.startswith('cd '): + os.chdir(command[3:]) + else: + ret = subprocess.call(command, stdout=open('/dev/null', 'w'), shell=True) + if ret!=0: + os.chdir(ori_path) + print ("ERROR while building/installing custom wokkel") + print ('Error happened when executing [%s]' % command) + print ('tmpdir is [%s]' % work_path) + raise MercurialException os.chdir(ori_path) print "Custom wokkel builded and installed, removing temporary files" import shutil