From 01dabc7668702c6930b90b2136998cb12e1dc1fd Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Tue, 28 Feb 2012 14:18:53 +0000 Subject: Use Tempdir.remove instead of rm, and drop unused Tempdir.clear If the remove method is insufficient (because it gets run as non-root, but some of the stuff needs root to remove them), then we need to fix the method, not replace it with other things. The Tempdir.clear method was not used anywhere, so YAGNI and removed it. --- morph | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'morph') diff --git a/morph b/morph index 485dd469..9b81f277 100755 --- a/morph +++ b/morph @@ -145,9 +145,7 @@ class Morph(cliapp.Application): # build things in this order ret.append(builder.build(blobs, order)) - # we may not have permission to tempdir.remove() - ex = morphlib.execute.Execute('.', lambda msg: None) - ex.runv(["rm", "-rf", tempdir.dirname]) + tempdir.remove() if args: raise cliapp.AppException('Extra args on command line: %s' % args) @@ -285,9 +283,7 @@ class Morph(cliapp.Application): self.msg('Building %s' % first_blob) ret.append(builder.build_single(first_blob, blobs, order)) - # we may not have permission to tempdir.remove() - ex = morphlib.execute.Execute('.', lambda msg: None) - ex.runv(["rm", "-rf", tempdir.dirname]) + tempdir.remove() if args: raise cliapp.AppException('Extra args on command line: %s' % args) @@ -355,9 +351,7 @@ class Morph(cliapp.Application): # build the tuple and all its dependencies result.append(controller.build(blobs, order)) - # we may not have permission to tempdir.remove() - ex = morphlib.execute.Execute('.', lambda msg: None) - ex.runv(["rm", "-rf", tempdir.dirname]) + tempdir.remove() if args: raise cliapp.AppException('Extra args on command line: %s' % args) -- cgit v1.2.1