Skip to content

Commit

Permalink
Merge pull request #20711 from ggovi/condcore-utilities-conddb-tools-…
Browse files Browse the repository at this point in the history
…fix-0-94X

Fixes for Conddb copy command
  • Loading branch information
cmsbuild committed Oct 6, 2017
2 parents 4390117 + c63d710 commit d89d440
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions CondCore/Utilities/scripts/conddb
Original file line number Diff line number Diff line change
Expand Up @@ -688,10 +688,10 @@ def _get_prompt_fcsr( session, timeType ):
try:
fcsr = t0DataSvc.getFirstSafeRun()
except ValueError, e:
self.logdebug('ValueError for firstConditionSafeRun from Tier-0 %s ' % (str(e),) )
logging.error('ValueError for firstConditionSafeRun from Tier-0 %s ' % (str(e),) )
# We got an answer but it is invalid. So far this usually means
# "None" which is not JSON, when the Tier0 is stopped.
raise Exception('invalid firstConditionSafeRun from Tier-0')
raise Exception('Invalid firstConditionSafeRun from Tier-0')
except Tier0Error:
# Impossible to get anything from the server after retries,
# i.e. unreachable, so no data.
Expand Down Expand Up @@ -1431,6 +1431,7 @@ def _copy_tag(args, copyTime, session1, session2, first, second, fromIOV=None, t

# Copy the set of IOVs collected
session2.merge(Tag2(name=second,modification_time=copyTime))
minIov = None
if payloadSerializationVersionMap is not None:
BoostRunMap = session2.get_dbtype(conddb.BoostRunMap)
q = session2.query(BoostRunMap).order_by(BoostRunMap.run_number)
Expand All @@ -1441,7 +1442,6 @@ def _copy_tag(args, copyTime, session1, session2, first, second, fromIOV=None, t
TagMetadata = session2.get_dbtype(conddb.TagMetadata)
q = session2.query(TagMetadata.min_serialization_v,TagMetadata.min_since).filter(TagMetadata.tag_name == second )
tagBoostVersion = None
minIov = None
for r in q:
tagBoostVersion = r[0]
minIov = r[1]
Expand Down

0 comments on commit d89d440

Please sign in to comment.