Merge pull request #154 from mrodozov/add-arch-and-branch-33

Add arch and cmsdist branch to opts.json

cmsBuild

@@ -3319,7 +3319,13 @@ def buildPackage(pkg, scheduler):
 
     if monitor_job:
         from json import dump as jdump
-        build_opts = {"builders": opts.workersPoolSize, "build_jobs": opts.compilingProcesses}
+        err, cmsdist_branch = getstatusoutput("cd %s; git rev-parse --abbrev-ref HEAD" % opts.cmsdist)
+        if err: cmsdist_branch = ""
+        err, hname = getstatusoutput("hostname")
+        build_opts = {"builders": opts.workersPoolSize, "build_jobs": opts.compilingProcesses,
+                      "architecture": opts.architecture, "cmsdist": cmsdist_branch, "name": pkg.name,
+                      "realversion": pkg.realVersion, "version": pkg.version, "checksum": pkg.checksum,
+                      "hostname": hname}
         with open(pkg.builddir + "/opts.json", "w") as bopts_file:
             jdump(build_opts, bopts_file)