package.py: Move files to x86_64 subdir in testing

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 = glob.glob('*.src.tar.gz')
-            source = source[0]
+            if source:
-        else:
+                source = source[0]
-            source = ''
+            else:
-        proc = subprocess.call('mv ' + source + ' ../../backup/testing/x86_64/'
+                source = ''
-                               + vers.group(1) + '/', shell=True)
+            proc = subprocess.call('mv ' + source + ' ../../backup/testing/' +
-        if proc > 1:
+                                   vers.group(1) + '/', shell=True)
-            logger.warning('There was a problem copying the package source to '
+            if proc > 1:
-                           'the backup directory')
+                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: