Additional fixes

master_unpack.py

@@ -35,11 +35,6 @@ class Package:
         self.platform = self._get_platform(self.filename)
         self.branch = self._get_branch(self.filename)
 
-        if self.platform == '':
-            sys.stderr.write('Failed to detect platform ' +
-                'from package: %r\n' % self.filename)
-            sys.exit(1)
-
     # extension stripping
     def _strip_extension(self, filename):
         extensions = '.zip', '.tar', '.bz2', '.gz', '.tgz', '.tbz', '.exe'
@@ -101,7 +96,7 @@ def get_download_dir(branch):
     elif branch == 'experimental-build':
         directory = os.path.join(download_prefix, "experimental")
     else:
-        directory = os.path.join(download_prefix, "branches", branch)
+        directory = os.path.join(download_prefix, branch)
         os.makedirs(directory, exist_ok=True)
 
     return directory
@@ -130,6 +125,12 @@ def get_branch_platform(packages):
     # Extract branch and platform names
     branch = packages[0].branch
     platform = packages[0].platform
+
+    if platform == '':
+        sys.stderr.write('Failed to detect platform ' +
+            'from package: %r\n' % packages[0].filename)
+        sys.exit(1)
+
     for package in packages:
         if package.branch != branch or package.platform != platform:
             sys.stderr.write('All packages in the zip file must have the same branch and platform\n')