[PATCH] Include the category when we suggest running "emerge ... portage"

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] Include the category when we suggest running "emerge ... portage"

Mike Gilbert-2
This will prevent problems if another package named "portage" is added
in another category.

Signed-off-by: Mike Gilbert <[hidden email]>
---
 lib/portage/emaint/modules/sync/sync.py                | 2 +-
 lib/portage/package/ebuild/deprecated_profile_check.py | 2 +-
 man/emerge.1                                           | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/portage/emaint/modules/sync/sync.py b/lib/portage/emaint/modules/sync/sync.py
index e28c42336..ac37fdcfa 100644
--- a/lib/portage/emaint/modules/sync/sync.py
+++ b/lib/portage/emaint/modules/sync/sync.py
@@ -299,7 +299,7 @@ class SyncRepos(object):
  msgs.append(warn(" * ")+bold("An update to portage is available.")+" It is _highly_ recommended")
  msgs.append(warn(" * ")+"that you update portage now, before any other packages are updated.")
  msgs.append('')
- msgs.append(warn(" * ")+"To update portage, run 'emerge --oneshot portage' now.")
+ msgs.append(warn(" * ")+"To update portage, run 'emerge --oneshot sys-apps/portage' now.")
  msgs.append('')
  return msgs
 
diff --git a/lib/portage/package/ebuild/deprecated_profile_check.py b/lib/portage/package/ebuild/deprecated_profile_check.py
index fdb19b4ac..abf32a079 100644
--- a/lib/portage/package/ebuild/deprecated_profile_check.py
+++ b/lib/portage/package/ebuild/deprecated_profile_check.py
@@ -77,7 +77,7 @@ def deprecated_profile_check(settings=None):
  "can migrate to the above profile.")), noiselevel=-1)
  writemsg(" %s %s\n\n" % (colorize("WARN", "*"),
  _("In order to update portage, "
- "run 'emerge --oneshot portage'.")),
+ "run 'emerge --oneshot sys-apps/portage'.")),
  noiselevel=-1)
 
  return True
diff --git a/man/emerge.1 b/man/emerge.1
index 4ce0dbebc..2261a771b 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -319,7 +319,7 @@ finished calculating the graph.
 
 \fB--alert\fR may be 'y' or 'n'. 'true' and 'false' mean the same thing.
 Using \fB--alert\fR without an option is the same as using it with 'y'.
-Try it with 'emerge -aA portage'.
+Try it with 'emerge -aA sys-apps/portage'.
 
 If your terminal emulator is set up to make '\\a' into a window manager
 urgency hint, move your cursor to a different window to get the effect.
@@ -1294,7 +1294,7 @@ permanent, you can put them in /etc/portage/package.use instead.
 If \fBemerge \-\-update @system\fR or \fBemerge \-\-update @world\fR
 fails with an error message, it may be that an ebuild uses some
 newer feature not present in this version of \fBemerge\fR.  You
-can use \fBemerge \-\-update portage\fR to upgrade to the lastest
+can use \fBemerge \-\-update sys-apps/portage\fR to upgrade to the lastest
 version, which should support any necessary new features.
 .SH "MASKED PACKAGES"
 \fINOTE: Please use caution when using development packages.  Problems
--
2.25.0


Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] Include the category when we suggest running "emerge ... portage"

Zac Medico-2
On 1/31/20 12:02 PM, Mike Gilbert wrote:
> This will prevent problems if another package named "portage" is added
> in another category.
>
> Signed-off-by: Mike Gilbert <[hidden email]>
> ---
>   lib/portage/emaint/modules/sync/sync.py                | 2 +-
>   lib/portage/package/ebuild/deprecated_profile_check.py | 2 +-
>   man/emerge.1                                           | 4 ++--
>   3 files changed, 4 insertions(+), 4 deletions(-)

Looks good. Please merge.
--
Thanks,
Zac