Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for O2O steering #16103

Merged
merged 1 commit into from Oct 7, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions CondCore/Utilities/python/o2o.py
Expand Up @@ -11,8 +11,8 @@

import CondCore.Utilities.credentials as auth

prod_db_service = ['cms_orcon_prod','o2o_prod']
dev_db_service = ['cms_orcoff_prep','o2o_dev']
prod_db_service = ['cms_orcon_prod','cms_orcon_prod/cms_cond_general_w']
dev_db_service = ['cms_orcoff_prep','cms_orcoff_prep/cms_test_conditions']
schema_name = 'CMS_CONDITIONS'
sqlalchemy_tpl = 'oracle://%s:%s@%s'
coral_tpl = 'oracle://%s/%s'
Expand Down
2 changes: 1 addition & 1 deletion CondCore/Utilities/scripts/conddb
Expand Up @@ -993,7 +993,7 @@ def _copy_tag(args, copyTime, session1, session2, isSQLite, first, second, fromI
if destTimeType != tag['time_type']:
logging.error('Cannot copy iovs from tag %s (time type: %s) to tag %s (time type: %s), since the time types are different.' %(first,tag['time_type'],second,destTimeType))
raise Exception('Time type mismatch, bailing out.')
output(args, 'Confirm the update of the existing tag "%s" [n]?' %second, newline=False)
output(args, 'Confirm the update of the existing tag "%s" in %s [n]?' %(second,args.destdb), newline=False)
if not args.yes and raw_input().lower() not in ['y', 'yes']:
raise Exception('Aborted by the user.')
session2.merge(Tag2(name=second,modification_time=copyTime))
Expand Down
2 changes: 0 additions & 2 deletions CondTools/Ecal/python/conddb_init.py
@@ -1,7 +1,5 @@
import FWCore.ParameterSet.VarParsing as VarParsing

process = cms.Process("ProcessOne")

options = VarParsing.VarParsing()
options.register('destinationDatabase',
'',
Expand Down