| 1 |
commit: 93892428a8e798ddc8a3e661225bd7da840740c1 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 31 19:56:33 2020 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 31 21:20:37 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=93892428 |
| 7 |
|
| 8 |
Include the category when we suggest running "emerge ... portage" |
| 9 |
|
| 10 |
This will prevent problems if another package named "portage" is added |
| 11 |
in another category. |
| 12 |
|
| 13 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 14 |
Reviewed-by: Zac Medico <zmedico <AT> gentoo.org> |
| 15 |
|
| 16 |
lib/portage/emaint/modules/sync/sync.py | 2 +- |
| 17 |
lib/portage/package/ebuild/deprecated_profile_check.py | 2 +- |
| 18 |
man/emerge.1 | 4 ++-- |
| 19 |
3 files changed, 4 insertions(+), 4 deletions(-) |
| 20 |
|
| 21 |
diff --git a/lib/portage/emaint/modules/sync/sync.py b/lib/portage/emaint/modules/sync/sync.py |
| 22 |
index e28c42336..ac37fdcfa 100644 |
| 23 |
--- a/lib/portage/emaint/modules/sync/sync.py |
| 24 |
+++ b/lib/portage/emaint/modules/sync/sync.py |
| 25 |
@@ -299,7 +299,7 @@ class SyncRepos(object): |
| 26 |
msgs.append(warn(" * ")+bold("An update to portage is available.")+" It is _highly_ recommended") |
| 27 |
msgs.append(warn(" * ")+"that you update portage now, before any other packages are updated.") |
| 28 |
msgs.append('') |
| 29 |
- msgs.append(warn(" * ")+"To update portage, run 'emerge --oneshot portage' now.") |
| 30 |
+ msgs.append(warn(" * ")+"To update portage, run 'emerge --oneshot sys-apps/portage' now.") |
| 31 |
msgs.append('') |
| 32 |
return msgs |
| 33 |
|
| 34 |
|
| 35 |
diff --git a/lib/portage/package/ebuild/deprecated_profile_check.py b/lib/portage/package/ebuild/deprecated_profile_check.py |
| 36 |
index fdb19b4ac..abf32a079 100644 |
| 37 |
--- a/lib/portage/package/ebuild/deprecated_profile_check.py |
| 38 |
+++ b/lib/portage/package/ebuild/deprecated_profile_check.py |
| 39 |
@@ -77,7 +77,7 @@ def deprecated_profile_check(settings=None): |
| 40 |
"can migrate to the above profile.")), noiselevel=-1) |
| 41 |
writemsg(" %s %s\n\n" % (colorize("WARN", "*"), |
| 42 |
_("In order to update portage, " |
| 43 |
- "run 'emerge --oneshot portage'.")), |
| 44 |
+ "run 'emerge --oneshot sys-apps/portage'.")), |
| 45 |
noiselevel=-1) |
| 46 |
|
| 47 |
return True |
| 48 |
|
| 49 |
diff --git a/man/emerge.1 b/man/emerge.1 |
| 50 |
index 4ce0dbebc..2261a771b 100644 |
| 51 |
--- a/man/emerge.1 |
| 52 |
+++ b/man/emerge.1 |
| 53 |
@@ -319,7 +319,7 @@ finished calculating the graph. |
| 54 |
|
| 55 |
\fB--alert\fR may be 'y' or 'n'. 'true' and 'false' mean the same thing. |
| 56 |
Using \fB--alert\fR without an option is the same as using it with 'y'. |
| 57 |
-Try it with 'emerge -aA portage'. |
| 58 |
+Try it with 'emerge -aA sys-apps/portage'. |
| 59 |
|
| 60 |
If your terminal emulator is set up to make '\\a' into a window manager |
| 61 |
urgency hint, move your cursor to a different window to get the effect. |
| 62 |
@@ -1294,7 +1294,7 @@ permanent, you can put them in /etc/portage/package.use instead. |
| 63 |
If \fBemerge \-\-update @system\fR or \fBemerge \-\-update @world\fR |
| 64 |
fails with an error message, it may be that an ebuild uses some |
| 65 |
newer feature not present in this version of \fBemerge\fR. You |
| 66 |
-can use \fBemerge \-\-update portage\fR to upgrade to the lastest |
| 67 |
+can use \fBemerge \-\-update sys-apps/portage\fR to upgrade to the lastest |
| 68 |
version, which should support any necessary new features. |
| 69 |
.SH "MASKED PACKAGES" |
| 70 |
\fINOTE: Please use caution when using development packages. Problems |
Archives