Merge lp:~milo/linaro-license-protection/bug1262261 into lp:~linaro-automation/linaro-license-protection/trunk

[Milo Casagrande]

Fix for the BUILD-INFO rewrite problem. This targets only the "prebuilt" job type that appears to be affected by the problem.

[Fathi Boudra (fboudra)]

Only the prebuilt job type is used on ci.linaro.org.I argue that we don't want to touch the BUILD-INFO.txt file sent from ci.linaro.org _at all_: append_open_buildinfo/combine_build_info might be used on android job_type only (at best)

review: Disapprove

[lp:~milo/linaro-license-protection/bug1262261]

228. By Milo Casagrande on 2013-12-24

Make the B-I rewrite happen only for android jobs.

Unmerged revisions

=== modified file 'scripts/publish_to_snapshots.py'
--- scripts/publish_to_snapshots.py	2013-12-19 22:09:43 +0000
+++ scripts/publish_to_snapshots.py	2013-12-24 08:40:11 +0000
@@ -434,6 +434,16 @@
             common_bi.splice(tmp_bi)
 
 
+def rewrite_build_info(build_dir_path, target_dir_path, tmp_bi):
+    bi_path = os.path.join(target_dir_path, BUILDINFO)
+    if os.path.getsize(tmp_bi) > 0:
+        shutil.copy(tmp_bi, bi_path)
+
+    append_open_buildinfo(target_dir_path)
+    bi = SpliceBuildInfos([target_dir_path])
+    bi.splice(bi_path)
+
+
 def main():
     global uploads_path
     global target_path
@@ -462,23 +472,30 @@
         except BuildInfoException as e:
             print e.value
             return FAIL
+
         fd, tmp_bi = tempfile.mkstemp()
         os.close(fd)
         os.chmod(tmp_bi, 0644)
-        publisher.combine_buildinfo(build_dir_path, target_dir_path, tmp_bi)
-        ret = publisher.move_artifacts(args, build_dir_path, target_dir_path)
-        if ret != PASS:
-            print "Move Failed"
-            return FAIL
-        else:
-            if os.path.getsize(tmp_bi) > 0:
-                shutil.copy(tmp_bi, os.path.join(target_dir_path, BUILDINFO))
+
+        try:
+            if args.job_type == 'android':
+                publisher.combine_buildinfo(
+                    build_dir_path, target_dir_path, tmp_bi)
+
+            ret = publisher.move_artifacts(
+                args, build_dir_path, target_dir_path)
+
+            if ret != PASS:
+                print "Move Failed"
+                return FAIL
+            else:
+                if args.job_type == 'android':
+                    rewrite_build_info(
+                        build_dir_path, target_dir_path, tmp_bi)
+                print "Move succeeded"
+                return PASS
+        finally:
             os.remove(tmp_bi)
-            append_open_buildinfo(target_dir_path)
-            bi = SpliceBuildInfos([target_dir_path])
-            bi.splice(os.path.join(target_dir_path, BUILDINFO))
-            print "Move succeeded"
-            return PASS
     except Exception, details:
         print "In main() Exception details:", details
         return FAIL