Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 275945 | Differences between
and this patch

Collapse All | Expand All

(-)pym/_emerge/depgraph.py (+5 lines)
Lines 2091-2096 Link Here
2091
				break
2091
				break
2092
2092
2093
		if len(matched_packages) > 1:
2093
		if len(matched_packages) > 1:
2094
			if "--avoid-update" in self.myopts:
2095
				for pkg in matched_packages:
2096
					if pkg.installed:
2097
						return pkg, existing_node
2098
			
2094
			bestmatch = portage.best(
2099
			bestmatch = portage.best(
2095
				[pkg.cpv for pkg in matched_packages])
2100
				[pkg.cpv for pkg in matched_packages])
2096
			matched_packages = [pkg for pkg in matched_packages \
2101
			matched_packages = [pkg for pkg in matched_packages \
(-)pym/_emerge/main.py (+5 lines)
Lines 65-70 Link Here
65
"--searchdesc",   "--selective",
65
"--searchdesc",   "--selective",
66
"--skipfirst",
66
"--skipfirst",
67
"--tree",
67
"--tree",
68
"--avoid-update",
68
"--update",
69
"--update",
69
"--usepkg",       "--usepkgonly",
70
"--usepkg",       "--usepkgonly",
70
"--verbose",
71
"--verbose",
Lines 1060-1065 Link Here
1060
			noiselevel=-1)
1061
			noiselevel=-1)
1061
		return 1
1062
		return 1
1062
1063
1064
	if ("--avoid-update" in myopts) and ("--update" in myopts):
1065
		writemsg("!!! confilcting options given: --update and --avoid-update\n", noiselevel=-1)
1066
		return 1
1067
1063
	if settings.get("PORTAGE_DEBUG", "") == "1":
1068
	if settings.get("PORTAGE_DEBUG", "") == "1":
1064
		spinner.update = spinner.update_quiet
1069
		spinner.update = spinner.update_quiet
1065
		portage.debug=1
1070
		portage.debug=1
(-)pym/_emerge/help.py (+8 lines)
Lines 235-240 Link Here
235
		print "              to the prompt, so an accidental press of the \"Enter\" key at any"
235
		print "              to the prompt, so an accidental press of the \"Enter\" key at any"
236
		print "              time prior to the prompt will be interpreted as a choice!"
236
		print "              time prior to the prompt will be interpreted as a choice!"
237
		print
237
		print
238
		print "       "+green("--avoid-update")
239
		print "              Tries to prevent package updates. This may not always be possible"
240
		print "              since new packages or new dependencies due to use flag changes may"
241
		print "              require a newer version of an installed package. Furthermore this"
242
		print "              option may lead to slot conflicts (Multiple package instances within"
243
		print "              a single package slot have been pulled into the dependency graph)."
244
		print "              It is not possible to use this option in such a case."
245
		print
238
		print "       "+green("--buildpkg")+" ("+green("-b")+" short option)"
246
		print "       "+green("--buildpkg")+" ("+green("-b")+" short option)"
239
		desc = "Tells emerge to build binary packages for all ebuilds processed in" + \
247
		desc = "Tells emerge to build binary packages for all ebuilds processed in" + \
240
			" addition to actually merging the packages. Useful for maintainers" + \
248
			" addition to actually merging the packages. Useful for maintainers" + \
(-)man/emerge.1 (+10 lines)
Lines 90-95 Link Here
90
to the \fBworld\fR file at the end, so that they are considered for
90
to the \fBworld\fR file at the end, so that they are considered for
91
later updating.
91
later updating.
92
.TP
92
.TP
93
.BR "\-\-avoid\-update "
94
Tries to prevent package updates. This may not always be possible since new 
95
packages or new dependencies due to use flag changes may require a newer version 
96
of an installed package. Furthermore this option may lead to slot conflicts 
97
(Multiple package instances within a single package slot have been pulled 
98
into the dependency graph). It is not possible to use this option in such a case.
99
.TP
93
.BR "\-\-clean " (\fB\-c\fR)
100
.BR "\-\-clean " (\fB\-c\fR)
94
Cleans up the system by examining the installed packages and removing older
101
Cleans up the system by examining the installed packages and removing older
95
packages.  This is accomplished by looking at each installed package and separating
102
packages.  This is accomplished by looking at each installed package and separating
Lines 364-369 Link Here
364
371
365
USE flags may be toggled by your profile as well as your USE and package.use
372
USE flags may be toggled by your profile as well as your USE and package.use
366
settings.
373
settings.
374
375
\fB\-\-avoid\-update\fR may prevent updates of installed packages without 
376
use flag changes. Note that \fB\-\-avoid-\update\fR may lead to slot conflicts.
367
.TP
377
.TP
368
.BR "\-\-noconfmem"
378
.BR "\-\-noconfmem"
369
Causes portage to disregard merge records indicating that a config file
379
Causes portage to disregard merge records indicating that a config file

Return to bug 275945