diff --git a/TarSCM/cli.py b/TarSCM/cli.py index 322a559c..0b5f7f79 100644 --- a/TarSCM/cli.py +++ b/TarSCM/cli.py @@ -195,6 +195,10 @@ def parse_args(self, options): '(only used with \'--latest-signed-*\')') parser.add_argument('--without-version', default = False, help='Do not add version to output file.') + parser.add_argument('--ignore-for-workflow', default = False, + help='Do not override the sources when running OBS' + 'SCM branch_package workflow. Useful for' + 'auxiliary files such as recipes.') self.verify_args(parser.parse_args(options)) diff --git a/TarSCM/tasks.py b/TarSCM/tasks.py index 65c8838d..9f187d16 100644 --- a/TarSCM/tasks.py +++ b/TarSCM/tasks.py @@ -160,7 +160,7 @@ def check_for_branch_request(self): # the source supposed to be merged is more important then the code # referenced in the _service file. args = self.args - if not os.path.exists('_branch_request'): + if args.ignore_for_workflow or not os.path.exists('_branch_request'): return args # is it a branch request? diff --git a/tar_scm.service.in b/tar_scm.service.in index 0e68da6d..7ca9b681 100644 --- a/tar_scm.service.in +++ b/tar_scm.service.in @@ -216,4 +216,7 @@ which get maintained in the SCM. Can be used multiple times. Do not add version to output file. + + Do not override the sources when running OBS SCM branch_package workflow. Useful for auxiliary files such as recipes. +