Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormrussell2012-02-01 23:04:16 +0000
committermrussell2012-02-01 23:04:16 +0000
commit889a95dbac1c7ae6d1cd1ac9c3a6cd23034d1fe2 (patch)
treef58e571849078be5c8282b578689207cae603105 /org.eclipse.wb.releng/src/releng/util.py
parent3a8c63876f918b652a725688847408dba58edb7d (diff)
downloadorg.eclipse.windowbuilder-889a95dbac1c7ae6d1cd1ac9c3a6cd23034d1fe2.tar.gz
org.eclipse.windowbuilder-889a95dbac1c7ae6d1cd1ac9c3a6cd23034d1fe2.tar.xz
org.eclipse.windowbuilder-889a95dbac1c7ae6d1cd1ac9c3a6cd23034d1fe2.zip
fixed file error
Diffstat (limited to 'org.eclipse.wb.releng/src/releng/util.py')
-rw-r--r--org.eclipse.wb.releng/src/releng/util.py27
1 files changed, 14 insertions, 13 deletions
diff --git a/org.eclipse.wb.releng/src/releng/util.py b/org.eclipse.wb.releng/src/releng/util.py
index 52ea55d3..3e67b983 100644
--- a/org.eclipse.wb.releng/src/releng/util.py
+++ b/org.eclipse.wb.releng/src/releng/util.py
@@ -110,6 +110,7 @@ def _VerifySite(directory, sign_files):
error_list = []
try:
os.chdir(working_dir)
+ packed_files.sort()
for f in packed_files:
log.debug('processing: {0}'.format(f))
f_jar = str(f)[0:f.rindex('.pack.gz')]
@@ -122,7 +123,7 @@ def _VerifySite(directory, sign_files):
for e in elements:
processing_file = e
if sign_files:
- if f.index('wb.xwt') > 0:
+ if f.find('wb.xwt') > 0:
os.remove(f)
continue
commands = ['jarsigner', '-verify', e]
@@ -134,24 +135,24 @@ def _VerifySite(directory, sign_files):
if str(stdout).find('jar verified') < 0:
msg = 'failed to validate {0}'.format(processing_file)
error_list.append(msg)
- print msg
- os.remove(e)
+ log.error(msg)
else:
- print 'would do: jarsigner -verify {0}'.format(e)
+ log.warning('would do: jarsigner -verify {0}'.format(e))
+ os.remove(e)
finally:
os.chdir(current_dir)
- shutil.rmtree(working_dir)
+# shutil.rmtree(working_dir)
if error_list:
- print "************************************************************"
- print "verify errors"
- print "************************************************************"
- print "************************************************************"
+ log.error("************************************************************")
+ log.error("verify errors")
+ log.error("************************************************************")
+ log.error("************************************************************")
for error_line in error_list:
- print error_line
- print "************************************************************"
- print "************************************************************"
- print "************************************************************"
+ log.error(error_line)
+ log.error("************************************************************")
+ log.error("************************************************************")
+ log.error("************************************************************")
def DisplayMatch(match):

Back to the top