From 10fe5232d5129ffc4a0872c54ec3446691c8912f Mon Sep 17 00:00:00 2001 From: JF Ding Date: Wed, 22 Feb 2012 21:56:35 +0800 Subject: [PATCH] be safe to catch all exception from osc.core --- gitbuildsys/buildservice.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/gitbuildsys/buildservice.py b/gitbuildsys/buildservice.py index 6ec5fd6..f5f399f 100644 --- a/gitbuildsys/buildservice.py +++ b/gitbuildsys/buildservice.py @@ -35,19 +35,15 @@ class ObsError(Exception): def solid_get_files_meta(self, revision='latest', skip_service=True): from time import sleep import msger - try: - from xml.etree import cElementTree as ET - except ImportError: - import cElementTree as ET retry_count = 3 while retry_count > 0: fm = core.show_files_meta(self.apiurl, self.prjname, self.name, revision=revision, meta=self.meta) try: - root = ET.fromstring(fm) + root = core.ET.fromstring(fm) break - except SyntaxError, err: + except: msger.warning('corrupted or empty obs server response ,retrying ...') sleep(1) retry_count -= 1 @@ -62,7 +58,7 @@ def solid_get_files_meta(self, revision='latest', skip_service=True): if size and self.size_limit and int(size) > self.size_limit \ or skip_service and (e.get('name').startswith('_service:') or e.get('name').startswith('_service_')): e.set('skipped', 'true') - return ET.tostring(root) + return core.ET.tostring(root) core.Package.get_files_meta = solid_get_files_meta -- 2.7.4