From 16370bf808a72f08d09e0e0254e1b204bef5c93c Mon Sep 17 00:00:00 2001 From: Jesus Alvarez Date: Sun, 23 Dec 2012 09:05:28 -0800 Subject: [PATCH] package.py: Move files to x86_64 subdir in testing --- package.py | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/package.py b/package.py index d7556f9..ca7d308 100755 --- a/package.py +++ b/package.py @@ -353,27 +353,28 @@ if __name__ == '__main__': vers = re.search(r'[\w-]+-([\d\w\._]+-[\d])-(?:i686|x86_64)', bpkg) if vers: proc = subprocess.call('mkdir -p ../../backup/testing/' + - vers.group(1), shell=True) + vers.group(1) + '/x86_64/', shell=True) if proc > 1: logger.warning('There was an error creating the backup ' 'directory') log('Moving "' + bpkg + '" to "backup/testing/' + vers.group(1) + - '"') + '/x86_64/"') proc = subprocess.call('mv ' + bpkg + '* ../../backup/testing/' + - vers.group(1) + '/', shell=True) + vers.group(1) + '/x86_64/', shell=True) if proc > 1: logger.warning('There was a problem copying the package to ' 'the backup directory') - source = glob.glob('*.src.tar.gz') - if source: - source = source[0] - else: - source = '' - proc = subprocess.call('mv ' + source + ' ../../backup/testing/x86_64/' - + vers.group(1) + '/', shell=True) - if proc > 1: - logger.warning('There was a problem copying the package source to ' - 'the backup directory') + + source = glob.glob('*.src.tar.gz') + if source: + source = source[0] + else: + source = '' + proc = subprocess.call('mv ' + source + ' ../../backup/testing/' + + vers.group(1) + '/', shell=True) + if proc > 1: + logger.warning('There was a problem copying the package ' + 'source to the backup directory') # Cleanup proc = subprocess.call('rm -r *.log src/', shell=True) if proc > 1: