Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormrussell2012-02-01 22:41:33 +0000
committermrussell2012-02-01 22:41:33 +0000
commit3a8c63876f918b652a725688847408dba58edb7d (patch)
tree38a7565918b4357742cbb5f45c8457917fe80393 /org.eclipse.wb.releng/src/releng/util.py
parentaaef193f434ee3476e794f30e4da0d34cc747760 (diff)
downloadorg.eclipse.windowbuilder-3a8c63876f918b652a725688847408dba58edb7d.tar.gz
org.eclipse.windowbuilder-3a8c63876f918b652a725688847408dba58edb7d.tar.xz
org.eclipse.windowbuilder-3a8c63876f918b652a725688847408dba58edb7d.zip
updates to solve infinate loop
Diffstat (limited to 'org.eclipse.wb.releng/src/releng/util.py')
-rw-r--r--org.eclipse.wb.releng/src/releng/util.py22
1 files changed, 19 insertions, 3 deletions
diff --git a/org.eclipse.wb.releng/src/releng/util.py b/org.eclipse.wb.releng/src/releng/util.py
index 5e6c5392..52ea55d3 100644
--- a/org.eclipse.wb.releng/src/releng/util.py
+++ b/org.eclipse.wb.releng/src/releng/util.py
@@ -107,6 +107,7 @@ def _VerifySite(directory, sign_files):
current_dir = os.getcwd()
working_dir = tempfile.mkdtemp(prefix='verify-')
processing_file = None
+ error_list = []
try:
os.chdir(working_dir)
for f in packed_files:
@@ -121,22 +122,37 @@ def _VerifySite(directory, sign_files):
for e in elements:
processing_file = e
if sign_files:
+ if f.index('wb.xwt') > 0:
+ os.remove(f)
+ continue
commands = ['jarsigner', '-verify', e]
if log.isEnabledFor(log.info):
log.info('command line: {0}'.format(' '.join(commands)))
p = subprocess.Popen(commands, stderr=subprocess.PIPE,
stdout=subprocess.PIPE)
(stdout, stderr) = p.communicate()
- print 'stderr: {0}'.format(str(stderr))
- print 'stdout: {0}'.format(str(stdout))
if str(stdout).find('jar verified') < 0:
- raise Exception('failed to validate {0}'.format(processing_file))
+ msg = 'failed to validate {0}'.format(processing_file)
+ error_list.append(msg)
+ print msg
+ os.remove(e)
else:
print 'would do: jarsigner -verify {0}'.format(e)
finally:
os.chdir(current_dir)
shutil.rmtree(working_dir)
+ if error_list:
+ print "************************************************************"
+ print "verify errors"
+ print "************************************************************"
+ print "************************************************************"
+ for error_line in error_list:
+ print error_line
+ print "************************************************************"
+ print "************************************************************"
+ print "************************************************************"
+
def DisplayMatch(match):
if match is None:

Back to the top