summaryrefslogtreecommitdiffstats
path: root/make/df-verify.py
diff options
context:
space:
mode:
authorKonaBlend <[email protected]>2015-10-29 22:40:07 -0400
committerBradley Sepos <[email protected]>2016-05-25 15:45:04 -0400
commitccfc9b59075d2bcc1d5a6a29cf859d055da7430c (patch)
tree956458f28a77be4361257e786cd85923b465050c /make/df-verify.py
parentce3bdc9c0380598d3af31b87d7cffb8271c41872 (diff)
Build: more fetch tweaks
- df-fetch --disable: exit with error to stop make. - df-fetch raise error when no URLs specified, or available due to ACLs. - df-verify report errors consistent with df-fetch.
Diffstat (limited to 'make/df-verify.py')
-rw-r--r--make/df-verify.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/make/df-verify.py b/make/df-verify.py
index adeb9af78..a06829e56 100644
--- a/make/df-verify.py
+++ b/make/df-verify.py
@@ -62,11 +62,10 @@ class Tool(hb_distfile.Tool):
def _run(self, error):
if self.options.disable:
- self.infof('%s disabled; nothing to do.\n' % self.name)
+ self.infof('%s failure; administratively disabled.\n' % self.name)
sys.exit(0)
if len(self.args) != 1:
- self.parser.print_usage()
- sys.exit(1)
+ raise error('no file specified')
filename = self.args[0]
if self.options.md5:
error.op = 'verify'
@@ -78,7 +77,7 @@ class Tool(hb_distfile.Tool):
self.infof('MD5 (%s) = %s (%d bytes)\n', filename, r.md5, r.size)
def run(self):
- error = hb_distfile.ToolError('run')
+ error = hb_distfile.ToolError(self.name)
try:
self._run(error)
except Exception, x: