interim update
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3173 348d0f76-0448-11de-a6fe-93d51630548a
This commit is contained in:
parent
b54031fc86
commit
7973806716
|
|
@ -200,6 +200,7 @@ def compareAlignmentIndices(remoteAlignmentIndex, alignmentIndex):
|
||||||
print ' md5s: local=%s remote=%s' % (raImd5, laImd5)
|
print ' md5s: local=%s remote=%s' % (raImd5, laImd5)
|
||||||
if raImd5 <> laImd5:
|
if raImd5 <> laImd5:
|
||||||
print ' [FAIL] -- alignment indices do not have the same hash!'
|
print ' [FAIL] -- alignment indices do not have the same hash!'
|
||||||
|
sys.exit(1)
|
||||||
else:
|
else:
|
||||||
print ' [PASS] -- alignment indices are the same'
|
print ' [PASS] -- alignment indices are the same'
|
||||||
|
|
||||||
|
|
@ -250,6 +251,9 @@ if __name__ == "__main__":
|
||||||
FTPSERVER = FTP(ftpParsed[1])
|
FTPSERVER = FTP(ftpParsed[1])
|
||||||
FTPSERVER.login()
|
FTPSERVER.login()
|
||||||
|
|
||||||
|
displayChangeLog(OPTIONS.remoteChangeLog)
|
||||||
|
compareAlignmentIndices(OPTIONS.remoteAlignmentIndex, OPTIONS.alignmentIndex)
|
||||||
|
|
||||||
results = dict()
|
results = dict()
|
||||||
for file in itertools.chain(readAlignmentIndex(OPTIONS.alignmentIndex), filesInLocalPath(root, OPTIONS.scanLocal )):
|
for file in itertools.chain(readAlignmentIndex(OPTIONS.alignmentIndex), filesInLocalPath(root, OPTIONS.scanLocal )):
|
||||||
#print line
|
#print line
|
||||||
|
|
@ -259,9 +263,6 @@ if __name__ == "__main__":
|
||||||
results[file] = compared
|
results[file] = compared
|
||||||
#localIndex
|
#localIndex
|
||||||
|
|
||||||
compareAlignmentIndices(OPTIONS.remoteAlignmentIndex, OPTIONS.alignmentIndex)
|
|
||||||
displayChangeLog(OPTIONS.remoteChangeLog)
|
|
||||||
|
|
||||||
printHeaderSep()
|
printHeaderSep()
|
||||||
print 'SUMMARY: Total files examined', len(results)
|
print 'SUMMARY: Total files examined', len(results)
|
||||||
for status in ['in-sync', 'size-mismatch', 'unknown-local-file', 'local-file-missing', 'orphaned-file']:
|
for status in ['in-sync', 'size-mismatch', 'unknown-local-file', 'local-file-missing', 'orphaned-file']:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue