Attachment #399912 for bug #544706

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

Lines 361-366 the specified configuration file(s), or enable the Link Here

(-)a/man/emerge.1 (+6 lines)
361	\fBEMERGE_DEFAULT_OPTS\fR variable may be used to	361	\fBEMERGE_DEFAULT_OPTS\fR variable may be used to
362	disable this option by default in \fBmake.conf\fR(5).	362	disable this option by default in \fBmake.conf\fR(5).
363	.TP	363	.TP
		364	.BR "\-\-autounmask\-comments [ y \| n ]"
		365	If \-\-autounmask is enabled, each package atom that
		366	depends on the change will be written as a bash line
		367	comment directly before the change. This option is
		368	enabled by default.
		369	.TP
364	.BR "\-\-autounmask\-unrestricted\-atoms [ y \| n ]"	370	.BR "\-\-autounmask\-unrestricted\-atoms [ y \| n ]"
365	If \-\-autounmask is enabled, keyword and mask changes	371	If \-\-autounmask is enabled, keyword and mask changes
366	using the \'=\' operator will be written. With this	372	using the \'=\' operator will be written. With this

Lines 7908-7913 class depgraph(object): Link Here

(-)a/pym/_emerge/depgraph.py (-11 / +22 lines)
7908	autounmask_write = \	7908	autounmask_write = \
7909	self._frozen_config.myopts.get("--autounmask-write",	7909	self._frozen_config.myopts.get("--autounmask-write",
7910	ask) is True	7910	ask) is True
		7911	autounmask_comments = \
		7912	self._frozen_config.myopts.get("--autounmask-comments", True) == True
7911	autounmask_unrestricted_atoms = \	7913	autounmask_unrestricted_atoms = \
7912	self._frozen_config.myopts.get("--autounmask-unrestricted-atoms", "n") == True	7914	self._frozen_config.myopts.get("--autounmask-unrestricted-atoms", "n") == True
7913	quiet = "--quiet" in self._frozen_config.myopts	7915	quiet = "--quiet" in self._frozen_config.myopts
Lines 7966-7972 class depgraph(object): Link Here
7966	if keyword == "**":	7968	if keyword == "**":
7967	masked_by_missing_keywords = True	7969	masked_by_missing_keywords = True
7968		7970
7969	unstable_keyword_msg[root].append(self._get_dep_chain_as_comment(pkg))	7971	if autounmask_comments:
		7972	unstable_keyword_msg[root].append(self._get_dep_chain_as_comment(pkg))
		7973
7970	if autounmask_unrestricted_atoms:	7974	if autounmask_unrestricted_atoms:
7971	if is_latest:	7975	if is_latest:
7972	unstable_keyword_msg[root].append(">=%s %s\n" % (pkg.cpv, keyword))	7976	unstable_keyword_msg[root].append(">=%s %s\n" % (pkg.cpv, keyword))
Lines 7999-8012 class depgraph(object): Link Here
7999	portdb=pkg.root_config.trees["porttree"].dbapi,	8003	portdb=pkg.root_config.trees["porttree"].dbapi,
8000	return_location=True)	8004	return_location=True)
8001		8005
8002	p_mask_change_msg[root].append(self._get_dep_chain_as_comment(pkg))	8006	if autounmask_comments:
8003	if filename:	8007	p_mask_change_msg[root].append(self._get_dep_chain_as_comment(pkg))
8004	p_mask_change_msg[root].append("# %s:\n" % filename)	8008
8005	if comment:	8009	if filename:
8006	comment = [line for line in	8010	p_mask_change_msg[root].append("# %s:\n" % filename)
8007	comment.splitlines() if line]	8011	if comment:
8008	for line in comment:	8012	comment = [line for line in
8009	p_mask_change_msg[root].append("%s\n" % line)	8013	comment.splitlines() if line]
		8014	for line in comment:
		8015	p_mask_change_msg[root].append("%s\n" % line)
8010	if autounmask_unrestricted_atoms:	8016	if autounmask_unrestricted_atoms:
8011	if is_latest:	8017	if is_latest:
8012	p_mask_change_msg[root].append(">=%s\n" % pkg.cpv)	8018	p_mask_change_msg[root].append(">=%s\n" % pkg.cpv)
Lines 8038-8044 class depgraph(object): Link Here
8038	adjustments.append(flag)	8044	adjustments.append(flag)
8039	else:	8045	else:
8040	adjustments.append("-" + flag)	8046	adjustments.append("-" + flag)
8041	use_changes_msg[root].append(self._get_dep_chain_as_comment(pkg, unsatisfied_dependency=True))	8047
		8048	if autounmask_comments:
		8049	use_changes_msg[root].append(self._get_dep_chain_as_comment(pkg, unsatisfied_dependency=True))
		8050
8042	if is_latest:	8051	if is_latest:
8043	use_changes_msg[root].append(">=%s %s\n" % (pkg.cpv, " ".join(adjustments)))	8052	use_changes_msg[root].append(">=%s %s\n" % (pkg.cpv, " ".join(adjustments)))
8044	elif is_latest_in_slot:	8053	elif is_latest_in_slot:
Lines 8055-8061 class depgraph(object): Link Here
8055	license_msg.setdefault(root, [])	8064	license_msg.setdefault(root, [])
8056	is_latest, is_latest_in_slot = check_if_latest(pkg)	8065	is_latest, is_latest_in_slot = check_if_latest(pkg)
8057		8066
8058	license_msg[root].append(self._get_dep_chain_as_comment(pkg))	8067	if autounmask_comments:
		8068	license_msg[root].append(self._get_dep_chain_as_comment(pkg))
		8069
8059	if is_latest:	8070	if is_latest:
8060	license_msg[root].append(">=%s %s\n" % (pkg.cpv, " ".join(sorted(missing_licenses))))	8071	license_msg[root].append(">=%s %s\n" % (pkg.cpv, " ".join(sorted(missing_licenses))))
8061	elif is_latest_in_slot:	8072	elif is_latest_in_slot:

Lines 323-328 def parse_opts(tmpcmdline, silent=False): Link Here

(-)a/pym/_emerge/main.py (-1 / +11 lines)
323	"choices" : true_y_or_n	323	"choices" : true_y_or_n
324	},	324	},
325		325
		326	"--autounmask-comments": {
		327	"help" : "write autounmask changes with descriptive comments",
		328	"choices" : true_y_or_n
		329	},
		330
326	"--autounmask-unrestricted-atoms": {	331	"--autounmask-unrestricted-atoms": {
327	"help" : "write autounmask changes with >= atoms if possible",	332	"help" : "write autounmask changes with >= atoms if possible",
328	"choices" : true_y_or_n	333	"choices" : true_y_or_n
Lines 745-750 def parse_opts(tmpcmdline, silent=False): Link Here
745	if myoptions.autounmask in true_y:	750	if myoptions.autounmask in true_y:
746	myoptions.autounmask = True	751	myoptions.autounmask = True
747		752
		753	if myoptions.autounmask_comments in true_y:
		754	myoptions.autounmask_comments = True
		755
		756	if myoptions.autounmask_unrestricted_atoms in true_y:
		757	myoptions.autounmask_unrestricted_atoms = True
		758
748	if myoptions.autounmask_unrestricted_atoms in true_y:	759	if myoptions.autounmask_unrestricted_atoms in true_y:
749	myoptions.autounmask_unrestricted_atoms = True	760	myoptions.autounmask_unrestricted_atoms = True
750		761
751	-

Return to bug 544706