From: Mathias Klette <mathias.klette@profitbricks.com>
Date: Wed, 16 May 2012 13:16:06 +0000 (+0200)
Subject: verify tarballs have been deleted
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=615b7c61d266f395142584d7697c39713272623d;p=profitbricks%2Fjenkins-build-scripts.git

verify tarballs have been deleted
---

diff --git a/debian_build.py b/debian_build.py
index 2b787b8..cce7a2e 100755
--- a/debian_build.py
+++ b/debian_build.py
@@ -428,8 +428,9 @@ if __name__ == '__main__':
 
     # cleanup existing *orig.tar.gz
     if os.path.isdir('../build-area/'):
-        files = " ".join(fnmatch.filter(os.listdir('../build-area/'),'*.orig.tar.gz'))
-        cmd = [BIN_SUDO, BIN_RM, '-f', files]
+        files = fnmatch.filter(os.listdir('../build-area/'),'*.orig.tar.gz')
+        logger.debug('Previous upstream tarball(s) found: %s' %( files ))
+        cmd = [BIN_SUDO, BIN_RM, '-f', " ".join(files)]
         cmdobj = subprocess.Popen(
                 cmd,
                 shell=False,
@@ -440,11 +441,7 @@ if __name__ == '__main__':
                 env={'':''}
         )
     
-        logger.debug(
-                'Trying to call "%s"'
-                %(' '.join(cmd))
-        )
-    
+        logger.debug('Calling "%s" ..' %(' '.join(cmd)))
         ret = cmdobj.wait()
         if ret:
             _str = (
@@ -454,6 +451,9 @@ if __name__ == '__main__':
             logger.debug(_str)
             raise Exception(_str)
 
+        files = fnmatch.filter(os.listdir('../build-area/'),'*.orig.tar.gz')
+        logger.debug('Previous upstream tarball(s) found: %s' %( files ))
+
 
     logger.info('dist: %s' %(pb_suite))
     cmd = ['figlet-figlet', '-t', 'dist: %s' %(pb_suite)]