From 36dc6f0390325b331781dc6f644ff8630e07e53e Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Tue, 25 Oct 2011 20:37:17 +0200 Subject: [PATCH] fix DIST --- debian_build.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/debian_build.py b/debian_build.py index 8e50abd..cb6e2ad 100755 --- a/debian_build.py +++ b/debian_build.py @@ -485,20 +485,16 @@ if __name__ == '__main__': time.sleep(60) # give reprepro time to process FLAVOURS_FILE=os.path.join(GIT_TARGET_WORKSPACE, GIT_REPO_NAME, "debian/pb_flavours") fh = open(FLAVOURS_FILE, 'r') - for flavour in fh.read(): + for flavour in fh(): cmd = ['%s' % os.path.join(CWD, "build-oot.sh"), '%s' % JOB_NAME, '%s' % flavour, - '%s' % options.distribution, + '%s' % os.environ.get('DIST'), '%s' % pb_suite ] logger.info('calling "%s" ...', ' '.join(cmd)) ret = os.system('%s' %(' '.join(cmd))) if ret: - logger_loud_error( - '"%s" returned non-zero (exitcode was: %s).', - ' '.join(cmd), - ret, - ) + logger_loud_error('"%s" returned non-zero (exitcode was: %s).' % (' '.join(cmd), ret)) fh.close() exit_ok() except Exception, error: -- 2.39.5