add /cvmfs file-content-metada repo into stack of repos

PyConf/python/PyConf/application.py

@@ -172,8 +172,13 @@ def _commit_oid_to_branch(path, branch, branch_name, oid):
 
 
 def get_metainfo_repos():
+    FILE_CONTENT_METADATA = "/cvmfs/lhcb-condb.cern.ch/git-conddb/file-content-metadata.git"
     repo = os.environ.get('LHCbFileContentMetaDataRepo', None)
-    if repo: return ["{}/.git".format(repo)]
+    # TODO: allow a colon seperated list of repos!!!
+    # make sure the cvmfs repo is present (and last)
+    if repo:
+        return ["{}/.git".format(repo)] + (
+            [FILE_CONTENT_METADATA] if not repo.startswith('/cvmfs') else [])
 
     cwd = os.getcwd()
     repo_name = "{}/lhcb-metainfo/.git".format(cwd)
@@ -887,7 +892,11 @@ def configure_input(options):
         input_iohelper = IOHelper(options.input_type, options.output_type
                                   or None)
         # setupServices may create (the wrong) EventDataSvc, so do it first
-        setup_component(options.event_store, instance_name='EventDataSvc')
+        extra_args = {'EvtStoreSvc': {'FollowAncestors': False}}
+        setup_component(
+            options.event_store,
+            instance_name='EventDataSvc',
+            **extra_args.get(options.event_store, {}))
         input_iohelper.setupServices()
         evtSel = input_iohelper.inputFiles(options.input_files, clear=True)
         evtSel.FirstEvent = options.first_evt
@@ -1216,11 +1225,13 @@ def plot_control_flow(top_node, filename='control_flow', extensions=('gv', )):
 def configured_ann_svc(name='HltANNSvc',
                        repositories=get_metainfo_repos(),
                        old_json=None,
+                       version='master',
                        *args,
                        **kwargs):
     from Configurables import GitANNSvc
     if not old_json:
-        return GitANNSvc(name, Repositories=repositories, *args, **kwargs)
+        return GitANNSvc(
+            name, Repositories=repositories, Version=version, *args, **kwargs)
 
     dct = json.loads(old_json)
     _convert = lambda cfg, keys : json.dumps({ key: { v: k for k, v in cfg[key].items() } for key in keys.intersection( cfg.keys() ) })