Merge lp:~gesha/linaro-license-protection/1210113 into lp:~linaro-automation/linaro-license-protection/trunk

[Georgy Redkozubov]

This branch adds several checks on BUILD-INFO.txt which should not allow to create BUILD-INFO.txt with invalid format.

[Milo Casagrande (milo)]

Looks good to me.

review: Approve

=== modified file 'license_protected_downloads/buildinfo.py'
--- license_protected_downloads/buildinfo.py	2013-06-04 18:21:53 +0000
+++ license_protected_downloads/buildinfo.py	2013-09-20 13:14:26 +0000
@@ -194,17 +194,18 @@
 
     @classmethod
     def write_from_array(cls, build_info_array, file_path):
-        with open(file_path, "w") as outfile:
-            outfile.write("Format-Version: 0.5\n\n")
-            for key in build_info_array[0]:
-                if key != "format-version":
-                    outfile.write("Files-Pattern: %s\n" % key)
-                    for item in build_info_array[0][key][0]:
-                        text = build_info_array[0][key][0][item]
-                        if item == "license-text":
-                            text = text.replace("\n", "\n ")
-                        outfile.write("%s: %s\n" % (item, text))
-                    outfile.write("\n")
+        if len(build_info_array[0]):
+            with open(file_path, "w") as outfile:
+                outfile.write("Format-Version: 0.5\n\n")
+                for key in build_info_array[0]:
+                    if key != "format-version":
+                        outfile.write("Files-Pattern: %s\n" % key)
+                        for item in build_info_array[0][key][0]:
+                            text = build_info_array[0][key][0][item]
+                            if item == "license-text":
+                                text = text.replace("\n", "\n ")
+                            outfile.write("%s: %s\n" % (item, text))
+                        outfile.write("\n")
 
 
 if __name__ == "__main__":

=== modified file 'scripts/publish_to_snapshots.py'
--- scripts/publish_to_snapshots.py	2013-04-29 18:07:04 +0000
+++ scripts/publish_to_snapshots.py	2013-09-20 13:14:26 +0000
@@ -35,27 +35,28 @@
     ]
 open_buildinfo_files = [
     'MANIFEST',
-    '*manifest.xml',
+    '*manifest*.xml',
     'MD5SUMS',
     '*build_cmds.sh',
     'kernel_config',
     'HOWTO_*',
     'lava-job-info*'
     ]
-open_buildinfo = 'Files-Pattern: %s\nLicense-Type: open\n'
+open_buildinfo = '\nFiles-Pattern: %s\nLicense-Type: open\n'
 
 
 def append_open_buildinfo(buildinfo_path, files=open_buildinfo_files):
     """Append BUILD-INFO.txt with open section for open_buildinfo_files"""
-    try:
-        bifile = open(os.path.join(buildinfo_path, buildinfo), "a")
+    if os.path.exists(os.path.join(buildinfo_path, buildinfo)):
         try:
-            bifile.write(open_buildinfo % ', '.join(files))
-        finally:
-            bifile.close()
-    except IOError:
-        print "Unable to write to BUILD-INFO.txt"
-        pass
+            bifile = open(os.path.join(buildinfo_path, buildinfo), "a")
+            try:
+                bifile.write(open_buildinfo % ', '.join(files))
+            finally:
+                bifile.close()
+        except IOError:
+            print "Unable to write to BUILD-INFO.txt"
+            pass
 
 
 def setup_parser():
@@ -469,7 +470,8 @@
             print "Move Failed"
             return FAIL
         else:
-            shutil.copy(tmp_bi, os.path.join(target_dir_path, buildinfo))
+            if os.path.getsize(tmp_bi) > 0:
+                shutil.copy(tmp_bi, os.path.join(target_dir_path, buildinfo))
             os.remove(tmp_bi)
             append_open_buildinfo(target_dir_path)
             bi = SpliceBuildInfos([target_dir_path])