Attachment #596746 for bug #700456

View | Details | Raw Unified | Return to bug 700456
Collapse All | Expand All

Lines 412-417 the whole commit message to abort. Link Here

(-)a/repoman/lib/repoman/actions.py (+4 lines)
412	report_options.append(	412	report_options.append(
413	"--include-arches=\"%s\"" %	413	"--include-arches=\"%s\"" %
414	" ".join(sorted(self.scanner.include_arches)))	414	" ".join(sorted(self.scanner.include_arches)))
		415	if self.scanner.include_profiles is not None:
		416	report_options.append(
		417	"--include-profiles=\"%s\"" %
		418	" ".join(sorted(self.scanner.include_profiles)))
415		419
416	if portage_version is None:	420	if portage_version is None:
417	sys.stderr.write("Failed to insert portage version in message!\n")	421	sys.stderr.write("Failed to insert portage version in message!\n")

Lines 164-169 def parse_args(argv, repoman_default_opts): Link Here

(-)a/repoman/lib/repoman/argparser.py (+7 lines)
164	'A space separated list of arches used to '	164	'A space separated list of arches used to '
165	'filter the selection of profiles for dependency checks'))	165	'filter the selection of profiles for dependency checks'))
166		166
		167	parser.add_argument(
		168	'--include-profiles',
		169	dest='include_profiles', metavar='PROFILES', action='append',
		170	help=(
		171	'A space separated list of profiles used to '
		172	'define the selection of profiles for dependency checks'))
		173
167	parser.add_argument(	174	parser.add_argument(
168	'-d', '--include-dev', dest='include_dev', action='store_true',	175	'-d', '--include-dev', dest='include_dev', action='store_true',
169	default=False,	176	default=False,

Lines 19-25 module_spec = { Link Here

(-)a/repoman/lib/repoman/modules/scan/depend/__init__.py (-1 / +2 lines)
19	'func_desc': {	19	'func_desc': {
20	},	20	},
21	'mod_kwargs': ['qatracker', 'portdb', 'profiles', 'options',	21	'mod_kwargs': ['qatracker', 'portdb', 'profiles', 'options',
22	'repo_metadata', 'repo_settings', 'include_arches', 'caches',	22	'repo_metadata', 'repo_settings', 'include_arches',
		23	'include_profiles', 'caches',
23	'repoman_incrementals', 'env', 'have', 'dev_keywords'	24	'repoman_incrementals', 'env', 'have', 'dev_keywords'
24	],	25	],
25	'func_kwargs': {	26	'func_kwargs': {

Lines 33-38 class ProfileDependsChecks(ScanBase): Link Here

(-)a/repoman/lib/repoman/modules/scan/depend/profile.py (-2 / +7 lines)
33	@param options: cli options	33	@param options: cli options
34	@param repo_settings: repository settings instance	34	@param repo_settings: repository settings instance
35	@param include_arches: set	35	@param include_arches: set
		36	@param include_profiles: set
36	@param caches: dictionary of our caches	37	@param caches: dictionary of our caches
37	@param repoman_incrementals: tuple	38	@param repoman_incrementals: tuple
38	@param env: the environment	39	@param env: the environment
Lines 46-51 class ProfileDependsChecks(ScanBase): Link Here
46	self.options = kwargs.get('options')	47	self.options = kwargs.get('options')
47	self.repo_settings = kwargs.get('repo_settings')	48	self.repo_settings = kwargs.get('repo_settings')
48	self.include_arches = kwargs.get('include_arches')	49	self.include_arches = kwargs.get('include_arches')
		50	self.include_profiles = kwargs.get('include_profiles')
49	self.caches = kwargs.get('caches')	51	self.caches = kwargs.get('caches')
50	self.repoman_incrementals = kwargs.get('repoman_incrementals')	52	self.repoman_incrementals = kwargs.get('repoman_incrementals')
51	self.env = kwargs.get('env')	53	self.env = kwargs.get('env')
Lines 81-88 class ProfileDependsChecks(ScanBase): Link Here
81	if arch not in self.include_arches:	83	if arch not in self.include_arches:
82	continue	84	continue
83		85
84	relevant_profiles.extend(	86	for prof in self.profiles[arch]:
85	(keyword, groups, prof) for prof in self.profiles[arch])	87	if self.include_profiles is not None:
		88	if prof not in self.include_profiles:
		89	continue
		90	relevant_profiles.append((keyword, groups, prof))
86		91
87	relevant_profiles.sort(key=sort_key)	92	relevant_profiles.sort(key=sort_key)
88		93

Lines 164-169 class Scanner(object): Link Here

(-)a/repoman/lib/repoman/scanner.py (+5 lines)
164	if self.options.include_arches:	164	if self.options.include_arches:
165	self.include_arches = set()	165	self.include_arches = set()
166	self.include_arches.update(*[x.split() for x in self.options.include_arches])	166	self.include_arches.update(*[x.split() for x in self.options.include_arches])
		167	self.include_profiles = None
		168	if self.options.include_profiles:
		169	self.include_profiles = set()
		170	self.include_profiles.update(*[x.split() for x in self.options.include_profiles])
167		171
168	# Disable the "self.modules['Ebuild'].notadded" check when not in commit mode and	172	# Disable the "self.modules['Ebuild'].notadded" check when not in commit mode and
169	# running `svn status` in every package dir will be too expensive.	173	# running `svn status` in every package dir will be too expensive.
Lines 190-195 class Scanner(object): Link Here
190	"repo_metadata": self.repo_metadata,	194	"repo_metadata": self.repo_metadata,
191	"profiles": profiles,	195	"profiles": profiles,
192	"include_arches": self.include_arches,	196	"include_arches": self.include_arches,
		197	"include_profiles": self.include_profiles,
193	"caches": self.caches,	198	"caches": self.caches,
194	"repoman_incrementals": self.repoman_incrementals,	199	"repoman_incrementals": self.repoman_incrementals,
195	"env": self.env,	200	"env": self.env,

Lines 120-125 Ignore masked packages (not allowed with commit mode) Link Here

(-)a/repoman/man/repoman.1 (-1 / +4 lines)
120	A space separated list of arches used to filter the selection of	120	A space separated list of arches used to filter the selection of
121	profiles for dependency checks.	121	profiles for dependency checks.
122	.TP	122	.TP
		123	.BR "\-\-include\-profiles " PROFILES
		124	A space separated list of profiles used to
		125	define the selection of profiles for dependency checks.
		126	.TP
123	\fB\-d\fR, \fB\-\-include\-dev\fR	127	\fB\-d\fR, \fB\-\-include\-dev\fR
124	Include dev profiles in dependency checks.	128	Include dev profiles in dependency checks.
125	.TP	129	.TP
126	-

Return to bug 700456