pylinted cmd_build.py
authorEd Bartosh <eduard.bartosh@intel.com>
Tue, 8 May 2012 10:46:03 +0000 (13:46 +0300)
committerEd Bartosh <eduard.bartosh@intel.com>
Tue, 8 May 2012 10:46:03 +0000 (13:46 +0300)
Change-Id: Ia6bb7585ca1b16864433e00b35a3708df169bb34

gitbuildsys/cmd_build.py

index b7466ef..599f48c 100644 (file)
@@ -67,12 +67,11 @@ def do(opts, args):
                 "user": USER,
                 "passwdx": PASSWDX,
             }
-    (fd, oscrcpath) = tempfile.mkstemp(dir=tmpdir, prefix='.oscrc')
-    os.close(fd)
-    f = file(oscrcpath, 'w+')
-    f.write(oscrc)
-    f.close()
-    
+    (fds, oscrcpath) = tempfile.mkstemp(dir=tmpdir, prefix='.oscrc')
+    os.close(fds)
+    with file(oscrcpath, 'w+') as foscrc:
+        foscrc.write(oscrc)
+
     # TODO: check ./packaging dir at first
     specs = glob.glob('%s/packaging/*.spec' % workdir)
     if not specs:
@@ -104,18 +103,19 @@ def do(opts, args):
         msger.info('creating %s for package build ...' % target_prj)
         try:
             prj.branch_from(base_prj)
-        except errors.ObsError, e:
-            msger.error('%s' % e)
+        except errors.ObsError, exc:
+            msger.error('%s' % exc)
 
     msger.info('checking out %s/%s to %s ...' % (target_prj, spec.name, tmpdir))
-    localpkg = obspkg.ObsPackage(tmpdir, target_prj, spec.name, APISERVER, oscrcpath)
+    localpkg = obspkg.ObsPackage(tmpdir, target_prj, spec.name,
+                                 APISERVER, oscrcpath)
     oscworkdir = localpkg.get_workdir()
     localpkg.remove_all()
 
     if gbp_build(["argv[0] placeholder", "--git-export-only",
-              "--git-ignore-new", "--git-builder=osc",
-              "--git-export-dir=%s" % oscworkdir,
-              "--git-packaging-dir=packaging"]):
+                  "--git-ignore-new", "--git-builder=osc",
+                  "--git-export-dir=%s" % oscworkdir,
+                  "--git-packaging-dir=packaging"]):
         msger.error("Failed to get packaging info from git tree")
 
     localpkg.update_local()