[gentoo-commits] proj/portage:master commit in: lib/portage/emaint/

[gentoo-commits] proj/portage:master commit in: lib/portage/emaint/

[Sam James]

commit:     3495a66af1e7024e19c11290afb275920ead0f6e
Author:     Siddhanth Rathod <xsiddhanthrathod <AT> gmail <DOT> com>
AuthorDate: Thu Oct  5 13:20:26 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct  8 03:29:46 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=3495a66a

emaint: options.copy() only when options is non-None

Copy options when its not Null

Signed-off-by: Siddhanth Rathod <xsiddhanthrathod <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 lib/portage/emaint/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/portage/emaint/main.py b/lib/portage/emaint/main.py
index 791adecfde..0c620a1a84 100644
--- a/lib/portage/emaint/main.py
+++ b/lib/portage/emaint/main.py
@@ -136,7 +136,7 @@ class TaskHandler:
                 "module_output": self.module_output,
                 # pass in a copy of the options so a module can not pollute or change
                 # them for other tasks if there is more to do.
-                "options": options.copy(),
+                "options": options.copy() if options else None,
             }
             returncode, msgs = getattr(inst, func)(**kwargs)
             returncodes.append(returncode)

[gentoo-commits] proj/portage:master commit in: lib/portage/emaint/

[Sam James]

commit:     cf9dfb8274a0bcce0776b53e5d184d5a8ce2f17d
Author:     Steffen Winter <steffen.winter <AT> proton <DOT> me>
AuthorDate: Thu Feb  8 23:29:39 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb  9 07:29:03 2024 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=cf9dfb82

emaint: Print 'usage: ' only once in help message

`ArgumentParser` prepends 'usage: ' to the usage message already.

Signed-off-by: Steffen Winter <steffen.winter <AT> proton.me>
Closes: https://github.com/gentoo/portage/pull/1256
Signed-off-by: Sam James <sam <AT> gentoo.org>

 lib/portage/emaint/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/portage/emaint/main.py b/lib/portage/emaint/main.py
index 0c620a1a84..ad6eea359e 100644
--- a/lib/portage/emaint/main.py
+++ b/lib/portage/emaint/main.py
@@ -62,7 +62,7 @@ class OptionItem:
 
 
 def usage(module_controller):
-    _usage = "usage: emaint [options] COMMAND"
+    _usage = "emaint [options] COMMAND"
 
     desc = (
         "The emaint program provides an interface to system health "