diff options
author | Brent Eagles <brent@zeroc.com> | 2005-11-14 13:09:08 +0000 |
---|---|---|
committer | Brent Eagles <brent@zeroc.com> | 2005-11-14 13:09:08 +0000 |
commit | 7693d00f1555f116585551a4fa797bc9b0b3674d (patch) | |
tree | 0ed2ba51031f5c3d5be453b112a153c0b338f5a2 /cpp | |
parent | http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=607. Added (diff) | |
download | ice-7693d00f1555f116585551a4fa797bc9b0b3674d.tar.bz2 ice-7693d00f1555f116585551a4fa797bc9b0b3674d.tar.xz ice-7693d00f1555f116585551a4fa797bc9b0b3674d.zip |
tweaked external program code
Diffstat (limited to 'cpp')
-rw-r--r-- | cpp/RPMTools.py | 2 | ||||
-rwxr-xr-x | cpp/makebindist.py | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/cpp/RPMTools.py b/cpp/RPMTools.py index fa4441cf2b8..d7798eefa6e 100644 --- a/cpp/RPMTools.py +++ b/cpp/RPMTools.py @@ -118,7 +118,7 @@ class Package: ofile.write('%clean\n') ofile.write('\n') ofile.write('%changelog\n') - ofile.write('* Tue Mar 8 2005 ZeroC Staff\n') + ofile.write('* Tue Nov 15 2005 ZeroC Staff\n') ofile.write('- See source distributions or the ZeroC website for more information\n') ofile.write(' about the changes in this release\n') ofile.write('\n') diff --git a/cpp/makebindist.py b/cpp/makebindist.py index 7a9cb484945..ea6b8db4a59 100755 --- a/cpp/makebindist.py +++ b/cpp/makebindist.py @@ -28,10 +28,11 @@ class ExtProgramError: def __str__(self): return repr(self.msg) -def runprog(commandstring): - commandtuple = commandstring.split() - result = os.spawnvpe(os.P_WAIT, commandtuple[0], commandtuple, os.environ) - if result != 0: +def runprog(commandstring, haltOnError = True): + #commandtuple = commandstring.split() + #result = os.spawnvpe(os.P_WAIT, commandtuple[0], commandtuple, os.environ) + result = os.system(commandstring) + if result != 0 and haltOnError: msg = 'Command %s failed with error code %d' % (commandstring, result) raise ExtProgramError(msg) |