projects
/
cdist.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bbd34ea
)
Tidy up test error handling, hopefully.
author
Carl Hetherington
<cth@carlh.net>
Wed, 12 Nov 2014 23:53:37 +0000
(23:53 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 12 Nov 2014 23:53:37 +0000
(23:53 +0000)
cdist
patch
|
blob
|
history
diff --git
a/cdist
b/cdist
index e69ede027dfd25813e7d0555700cd64f336a78f8..ea3adf5b89cf792841acd8ec76f6fe50e0ff8f78 100755
(executable)
--- a/
cdist
+++ b/
cdist
@@
-120,10
+120,6
@@
def scp_escape(n):
else:
return '\"%s\"' % s[0]
else:
return '\"%s\"' % s[0]
-def command(c):
- if os.system(c) != 0:
- raise Error('%s failed' % c)
-
def copytree(a, b):
log('copy %s -> %s' % (scp_escape(b), scp_escape(b)))
command('scp -r %s %s' % (scp_escape(a), scp_escape(b)))
def copytree(a, b):
log('copy %s -> %s' % (scp_escape(b), scp_escape(b)))
command('scp -r %s %s' % (scp_escape(a), scp_escape(b)))
@@
-147,10
+143,10
@@
def rmtree(a):
log('remove %s' % a)
shutil.rmtree(a, ignore_errors=True)
log('remove %s' % a)
shutil.rmtree(a, ignore_errors=True)
-def command(c
, can_fail=False
):
+def command(c):
log(c)
r = os.system(c)
log(c)
r = os.system(c)
- if (r >> 8)
and not can_fail
:
+ if (r >> 8):
raise Error('command %s failed' % c)
def command_and_read(c):
raise Error('command %s failed' % c)
def command_and_read(c):
@@
-284,7
+280,7
@@
class Target(object):
project.checkout(self)
self.build_dependencies(project)
self.build(project)
project.checkout(self)
self.build_dependencies(project)
self.build(project)
-
return
project.cscript['test'](self)
+ project.cscript['test'](self)
def set(self, a, b):
self.variables[a] = b
def set(self, a, b):
self.variables[a] = b