Merging in Master 20UL16 vs 20UL16APV was confusing git

Author: scarletnorberg

Unified/injector.py

@@ -13,7 +13,7 @@
 
 def injector(url, options, specific):
     mlock = moduleLock()
-    if mlock(): return
+    if mlock() and not options.manual: return
 
     use_mcm = True
     up = componentInfo(soft=['mcm','wtc','jira'] )
@@ -229,6 +229,7 @@ def injector(url, options, specific):
     parser.add_option('--user_relval',help="The user that can inject workflows for relvals", default=None)
     parser.add_option('--user_storeresults',help="The user that can inject workflows for store results", default=None)
     parser.add_option('--no_convert',help="Prevent the conversion to stepchain", default=False)
+    parser.add_option('-m','--manual', help='Manual inject, bypassing lock check',action='store_true',dest='manual',default=False)
     (options,args) = parser.parse_args()
 
     spec = None

campaignAPI.py

@@ -111,6 +111,7 @@ def parseMongoCampaigns(campaigns, verbose=False):
         'SecondaryLocation': 'SecondaryLocation',
         'secondaries': 'Secondaries',
         'partial_copy': 'PartialCopy',
+        'toDDM': 'TiersToDM',
         'maxcopies': 'MaxCopies'}
     # campaign schema dict
     confRec = {
@@ -122,6 +123,7 @@ def parseMongoCampaigns(campaigns, verbose=False):
         'SecondaryLocation': [],
         'Secondaries': {},
         'PartialCopy': 1,
+        'TiersToDM': [],
         'MaxCopies': 1}
 
     if not isinstance(campaigns, list):