From: Mathias Klette Date: Wed, 16 May 2012 14:23:03 +0000 (+0200) Subject: fix X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=02ac0ac6bbff0fc80fc8fec7cf3a7fa7abddd8de;p=profitbricks%2Fjenkins-build-scripts.git fix --- diff --git a/debian_build.py b/debian_build.py index 8fab1b8..73d6c05 100755 --- a/debian_build.py +++ b/debian_build.py @@ -429,30 +429,31 @@ if __name__ == '__main__': # cleanup existing *orig.tar.gz if os.path.isdir(BUILD_AREA): files = [os.path.join(BUILD_AREA,file) for file in fnmatch.filter(os.listdir(BUILD_AREA),'*.orig.tar.gz')] - logger.debug('Previous upstream tarball(s) found: %s' %( files )) - cmd = [BIN_SUDO, BIN_RM, '-v', " ".join(files)] - cmdobj = subprocess.Popen( - cmd, - shell=False, - cwd='/', - close_fds=True, - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT, - env={'':''} - ) + if len(files) > 0: + logger.debug('Previous upstream tarball(s) found: %s' %( files )) + cmd = [BIN_SUDO, BIN_RM, '-v', " ".join(files)] + cmdobj = subprocess.Popen( + cmd, + shell=False, + cwd='/', + close_fds=True, + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, + env={'':''} + ) - logger.debug('Calling "%s" ..' %(' '.join(cmd))) - ret = cmdobj.wait() - for line in cmdobj.stdout.readlines(): - logger.debug('%s' %(line)) + 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) + if ret: + _str = ( + 'Cmd "%s" returned non-zero (exitcode: %s).' + %(' '.join(cmd), ret) + ) + logger.debug(_str) + raise Exception(_str) files = [os.path.join(BUILD_AREA,file) for file in fnmatch.filter(os.listdir(BUILD_AREA),'*.orig.tar.gz')] logger.debug('Previous upstream tarball(s) found: %s' %( files ))