Enable missing exception handling

Change-Id: I42bfb2965215431e9ba81d2b2ddb52ece1c7639f

diff --git a/job_ref_create_prj_obs.py b/job_ref_create_prj_obs.py
index 11ec293..224d2f5 100644 (file)
--- a/job_ref_create_prj_obs.py
+++ b/job_ref_create_prj_obs.py
@@ -1053,8 +1053,7 @@ class ref_create_project_obs(object):
             todo_dict_latest = todo_dict_return["merge_items"]
             todo_dict_conflicts = todo_dict_return["conflicts"]
             log_info('CONFLICTS:')
-            if True:
-            #try:
+            try:
                 if todo_dict_conflicts is not None:
                     for cf in todo_dict_conflicts:
                         cf_pkg = cf
@@ -1075,8 +1074,8 @@ class ref_create_project_obs(object):
                         todo_dict_latest[ci_pkg]['content'] = new_content
                         log_info('Updating conflicting package info:')
                         log_info(' %s: (%s)(%s) -> (%s)(%s)' % (ci_pkg, old_git, old_rev, ci_git, ci_rev))
-            #except Exception as err:
-            #    print "Exception while checking conflicts"
+            except Exception as err:
+                print "Exception while checking conflicts"
 
             log_info('\nCompare With Manifest Done at %s' % (str(datetime.now())))