commit: dd3b5ade5fda333a6a12471374a112fac4e043eb
Author: Tom Wijsman <tomwij <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 3 11:28:44 2014 +0000
Commit: Tom Wijsman <tomwij <AT> gentoo <DOT> org>
CommitDate: Tue Jun 3 11:28:44 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=dd3b5ade
repoman/main.py: Refactor "RepoMan Sez"
---
pym/repoman/main.py | 27 ++++++++++-----------------
pym/repoman/utilities.py | 8 ++++++--
2 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index c698265..425b891 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -964,25 +964,21 @@ if options.mode != 'commit':
if dofull:
print(bold("Note: type \"repoman full\" for a complete
listing."))
if dowarn and not dofail:
- print(
- green("RepoMan sez:"),
+ utilities.repoman_sez(
"\"You're only giving me a partial QA payment?\n"
" I'll take it this time, but I'm not
happy.\"")
elif not dofail:
- print(
- green("RepoMan sez:"),
+ utilities.repoman_sez(
"\"If everyone were like you, I'd be out of
business!\"")
elif dofail:
print(bad("Please fix these important QA issues first."))
- print(
- green("RepoMan sez:"),
+ utilities.repoman_sez(
"\"Make your QA payment on time"
" and you'll never see the likes of me.\"\n")
sys.exit(1)
else:
if dofail and can_force and options.force and not options.pretend:
- print(
- green("RepoMan sez:"),
+ utilities.repoman_sez(
" \"You want to commit even with these QA issues?\n"
" I'll take it this time, but I'm not
happy.\"\n")
elif dofail:
@@ -991,15 +987,13 @@ else:
"The --force option has been disabled"
" due to extraordinary issues."))
print(bad("Please fix these important QA issues first."))
- print(
- green("RepoMan sez:"),
+ utilities.repoman_sez(
"\"Make your QA payment on time"
" and you'll never see the likes of me.\"\n")
sys.exit(1)
if options.pretend:
- print(
- green("RepoMan sez:"),
+ utilities.repoman_sez(
"\"So, you want to play it safe. Good call.\"\n")
myunadded = []
@@ -1178,7 +1172,8 @@ else:
if vcs_settings.vcs:
if not (mychanged or mynew or myremoved or (vcs_settings.vcs ==
"hg" and mydeleted)):
- print(green("RepoMan sez:"), "\"Doing nothing is not
always good for QA.\"")
+ utilities.repoman_sez(
+ "\"Doing nothing is not always good for QA.\"")
print()
print("(Didn't find any changed files...)")
print()
@@ -1578,8 +1573,7 @@ else:
portage.util.write_atomic(x, b''.join(mylines),
mode='wb')
if repolevel == 1:
- print(
- green("RepoMan sez:"),
+ utilities.repoman_sez(
"\"You're rather crazy... "
"doing the entire repository.\"\n")
@@ -1696,7 +1690,6 @@ else:
"repoman was too scared"
" by not seeing any familiar version control file"
" that he forgot to commit anything")
- print(
- green("RepoMan sez:"),
+ utilities.repoman_sez(
"\"If everyone were like you, I'd be out of business!\"\n")
sys.exit(0)
diff --git a/pym/repoman/utilities.py b/pym/repoman/utilities.py
index b7b3945..b19d4e1 100644
--- a/pym/repoman/utilities.py
+++ b/pym/repoman/utilities.py
@@ -39,9 +39,10 @@ from portage import shutil
from portage import _encodings
from portage import _unicode_decode
from portage import _unicode_encode
+from portage import util
from portage.localization import _
from portage.process import find_binary
-from portage import util
+from portage.output import green
from repoman.copyrights import update_copyright, update_copyright_year
@@ -126,7 +127,6 @@ def FindPackagesToScan(settings, startdir, reposplit):
path = os.path.join(startdir, cat)
if not os.path.isdir(path):
continue
- pkgdirs = os.listdir(path)
scanlist.extend(AddPackagesInDir(path))
elif repolevel == 2: # category level, startdir = catdir
# We only want 1 segment of the directory,
@@ -586,3 +586,7 @@ def UpdateChangeLog(
except OSError:
pass
return None
+
+
+def repoman_sez(msg):
+ print (green("RepoMan sez:"), msg)
