moving bucket opening towards beginning

This commit is contained in:
Ryan Tucker 2009-12-29 08:48:39 -05:00
parent c7a6d2a310
commit 07777a8628

View file

@ -120,6 +120,9 @@ for i in [tarCreate, compPath, splitPath, parPath]:
sys.stderr.write('Error: %s is not an executable program\n' % i) sys.stderr.write('Error: %s is not an executable program\n' % i)
sys.exit(1) sys.exit(1)
# open s3 connection
bucket = open_s3(secrets.accesskey, secrets.sharedkey, host)
mesg = "Writing archive for host %s, backup #%i" % (host, bkupNum) mesg = "Writing archive for host %s, backup #%i" % (host, bkupNum)
if splitSize > 0 and is_exe(splitPath): if splitSize > 0 and is_exe(splitPath):
mesg += ', split into %i byte chunks' % splitSize mesg += ', split into %i byte chunks' % splitSize
@ -153,8 +156,6 @@ if returncode != 0:
logging.info('Beginning post-processing of %s #%i' % (host, bkupNum)) logging.info('Beginning post-processing of %s #%i' % (host, bkupNum))
bucket = open_s3(secrets.accesskey, secrets.sharedkey, host)
for i in sorted(glob.glob(fileglob)): for i in sorted(glob.glob(fileglob)):
if secrets.gpgsymmetrickey: if secrets.gpgsymmetrickey:
sendfile = encrypt_file(i, secrets.gpgsymmetrickey, compPath) sendfile = encrypt_file(i, secrets.gpgsymmetrickey, compPath)