From: Zhang Qiang <qiang.z.zhang@intel.com>
Date: Mon, 11 Jun 2012 08:56:13 +0000 (+0800)
Subject: catch invalid apiurl exception in buildservice module
X-Git-Tag: 0.7~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f6500ec646187b07ded28f0bceebca4dd97c590c;p=tools%2Fgbs.git

catch invalid apiurl exception in buildservice module
---

diff --git a/gitbuildsys/buildservice.py b/gitbuildsys/buildservice.py
index b1dabe3..1be16ca 100644
--- a/gitbuildsys/buildservice.py
+++ b/gitbuildsys/buildservice.py
@@ -240,6 +240,8 @@ class BuildService(object):
                     raise RuntimeError, 'Current user has no write permission for specified oscrc: %s' % oscrc
 
                 raise # else
+            except urllib2.URLError:
+                raise errors.ObsError("invalid service apiurl: %s" % apiurl)
         else:
             conf.get_config()
 
diff --git a/gitbuildsys/cmd_remotebuild.py b/gitbuildsys/cmd_remotebuild.py
index 98bafe4..65a72d7 100644
--- a/gitbuildsys/cmd_remotebuild.py
+++ b/gitbuildsys/cmd_remotebuild.py
@@ -110,15 +110,12 @@ def do(opts, args):
 
     prj = obspkg.ObsProject(target_prj, apiurl = APISERVER, oscrc = oscrcpath)
     msger.info('checking status of obs project: %s ...' % target_prj)
-    try:
-        if prj.is_new():
-            if opts.target_obsprj and not target_prj.startswith('home:%s:' % USER):
-                msger.error('no permission to create project %s, only subpackage '\
-                        'of home:%s is allowed ' % (target_prj, USER))
-            msger.info('creating %s for package build ...' % target_prj)
-            prj.branch_from(base_prj)
-    except errors.ObsError, exc:
-        msger.error('%s' % exc)
+    if prj.is_new():
+        if opts.target_obsprj and not target_prj.startswith('home:%s:' % USER):
+            msger.error('no permission to create project %s, only subpackage '\
+                    'of home:%s is allowed ' % (target_prj, USER))
+        msger.info('creating %s for package build ...' % target_prj)
+        prj.branch_from(base_prj)
 
     msger.info('checking out %s/%s to %s ...' % (target_prj, spec.name, tmpdir))