From ae086f09227a390c0232cd67b759b74328a3bb82 Mon Sep 17 00:00:00 2001 From: Mathias Klette Date: Wed, 16 May 2012 20:15:33 +0200 Subject: [PATCH] we don't mind if rm fails --- debian_build.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/debian_build.py b/debian_build.py index 6196349..0fb93f9 100755 --- a/debian_build.py +++ b/debian_build.py @@ -290,7 +290,8 @@ if __name__ == '__main__': files = [os.path.join(BUILD_AREA,file) for file in fnmatch.filter(os.listdir(BUILD_AREA),'*.orig.tar.gz')] if len(files) > 0: logger.debug('Previous upstream tarball(s) found: %s' %( files )) - cmd = [BIN_SUDO, BIN_RM, '-v', " ".join(files)] + cmd = [BIN_SUDO, BIN_RM, '-v'] + cmd.extend(files) cmdobj = subprocess.Popen( cmd, shell=False, @@ -304,15 +305,8 @@ if __name__ == '__main__': logger.debug('Calling "%s":' %(' '.join(cmd))) ret = cmdobj.wait() for line in cmdobj.stdout.readlines(): - logger.debug('%s' %(line)) - - if ret: - _str = ( - 'Cmd "%s" returned non-zero (exitcode: %s).' - %(' '.join(cmd), ret) - ) - logger.debug(_str) - raise Exception(_str) + logger.debug('%s' %(line.strip())) + logger.debug('Cmd returned with status %d' %(cmdobj.returncode)) ## #if GIT_BRANCH_NAME != 'master': ## if not git_helper.git_new_branch_from(localname,remotename): -- 2.39.5