From 190ab8a2600460fc38c8d86f5a00515d2747e22a Mon Sep 17 00:00:00 2001
From: ZhuoX Li <zhuox.li@intel.com>
Date: Fri, 4 Apr 2014 14:24:16 +0800
Subject: [PATCH] Add a UploadError class in common/upload_service.py

Change-Id: I6d459707b1dff6c27124f2cc929130364709267b
---
 common/upload_service.py | 9 +++++++--
 job_submit.py            | 7 +++----
 job_submitobs.py         | 4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/common/upload_service.py b/common/upload_service.py
index 9dd92f9..19aa250 100644
--- a/common/upload_service.py
+++ b/common/upload_service.py
@@ -7,6 +7,11 @@
 import os
 from gitbuildsys.errors import ObsError
 
+class UploadError(Exception):
+    """Local error handler
+    """
+    pass
+
 def upload_obs_service(git_url, git_project, git_tag,
         git_revision, obs_project, build, package):
     """UPload _service file to OBS.Create package if doesn't exist.To replace
@@ -15,7 +20,7 @@ def upload_obs_service(git_url, git_project, git_tag,
         try:
             build.create_package(obs_project, package)
         except ObsError, error:
-            raise UtilsError("Unable to create package %s/%s :%s" % \
+            raise UploadError("Unable to create package %s/%s :%s" % \
                     (obs_project, package, error))
     # Upload _service file to the project for gbs source service
     print 'Upload service file'
@@ -32,5 +37,5 @@ def upload_obs_service(git_url, git_project, git_tag,
         build.commit_files(obs_project, package,
                 [(fname, True)], commit_message)
     except ObsError, error:
-        raise UtilsError("Unable to upload _service to %s: %s" % \
+        raise UploadError("Unable to upload _service to %s: %s" % \
                 (obs_project, error))
diff --git a/job_submit.py b/job_submit.py
index a1fc960..91850c0 100755
--- a/job_submit.py
+++ b/job_submit.py
@@ -13,8 +13,7 @@ from gitbuildsys.errors import ObsError
 
 from common import mapping
 from common.git import clone_gitproject
-from common.utils import UtilsError
-from common.upload_service import upload_obs_service
+from common.upload_service import upload_obs_service, UploadError
 from common.gerrit import is_ref_deleted
 from common.buildservice import BuildService
 from common.backenddb import BackendDB
@@ -84,7 +83,7 @@ def create_project(git_url, git_project, git_tag, git_revision, build,
     try:
         upload_obs_service(git_url, git_project, git_tag,
                            git_revision, obs_project, build, package)
-    except UtilsError, err:
+    except UploadError, err:
         raise LocalError(err)
 
     build.link_project(obs_project, src=obs_target_prj, linktype="localdep")
@@ -150,7 +149,7 @@ def main(build_type):
                     try:
                         upload_obs_service(url, gerrit_project, git_tag, \
                                 gerrit_newrev, obs_target_prj, build, package)
-                    except UtilsError, err:
+                    except UploadError, err:
                         raise LocalError(err)
                 else:
                     print "Warning: target project %s doesn't exist, " \
diff --git a/job_submitobs.py b/job_submitobs.py
index 76fa3c1..c469616 100755
--- a/job_submitobs.py
+++ b/job_submitobs.py
@@ -17,7 +17,7 @@ from urllib2 import HTTPError
 # internal module
 from common import runner
 from common import utils
-from common.upload_service import upload_obs_service
+from common.upload_service import upload_obs_service, UploadError
 from common.git import Git, clone_gitproject
 from common import obspkg
 from common import mapping
@@ -487,7 +487,7 @@ def main():
                 try:
                     upload_obs_service(url, gerrit_project, tag,
                             event['newrev'], obs_stg_prj, build, spec.name)
-                except utils.UtilsError, err:
+                except UploadError, err:
                     print err
                     return 1
 
-- 
2.7.4