[gentoo-commits] proj/gentoolkit:master commit in: pym/gentoolkit/enalyze/

2024-02-16 Thread Sam James
commit: f7a80ce2b93f9a65ab7d3383a771d532445c1279
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 16 23:58:53 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 16 23:58:53 2024 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=f7a80ce2

enalyze: placate black

Signed-off-by: Sam James  gentoo.org>

 pym/gentoolkit/enalyze/rebuild.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pym/gentoolkit/enalyze/rebuild.py 
b/pym/gentoolkit/enalyze/rebuild.py
index 074e2f5..f4a348a 100644
--- a/pym/gentoolkit/enalyze/rebuild.py
+++ b/pym/gentoolkit/enalyze/rebuild.py
@@ -167,7 +167,7 @@ class Rebuild(ModuleBase):
 "pretend": False,
 "prefix": False,
 "portage": True,
-"slot": False
+"slot": False,
 # "unset": False
 }
 self.module_opts = {



[gentoo-commits] proj/gentoolkit:master commit in: pym/gentoolkit/enalyze/

2023-06-04 Thread Mike Gilbert
commit: 6e285a2416d5616cc672b5cf15a468e6e4c9de75
Author: Diego Viola  gmail  com>
AuthorDate: Tue Mar 21 19:44:16 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Jun  4 19:01:12 2023 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=6e285a24

enalyze/analyze.py: fix typos

Signed-off-by: Diego Viola  gmail.com>
Closes: https://github.com/gentoo/gentoolkit/pull/27
Signed-off-by: Mike Gilbert  gentoo.org>

 pym/gentoolkit/enalyze/analyze.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pym/gentoolkit/enalyze/analyze.py 
b/pym/gentoolkit/enalyze/analyze.py
index 3a09145..553ba5e 100644
--- a/pym/gentoolkit/enalyze/analyze.py
+++ b/pym/gentoolkit/enalyze/analyze.py
@@ -158,7 +158,7 @@ def gather_keywords_info(
 
 
 class Analyse(ModuleBase):
-"""Installed db analysis tool to query the installed databse
+"""Installed db analysis tool to query the installed database
 and produce/output stats for USE flags or keywords/mask.
 The 'rebuild' action output is in the form suitable for file type output
 to create a new package.use, package.keywords, package.unmask
@@ -201,7 +201,7 @@ class Analyse(ModuleBase):
 "--width": ("width", "int", 80),
 }
 self.formatted_options = [
-("  -h, --help", "Outputs this useage message"),
+("  -h, --help", "Outputs this usage message"),
 (
 "  -u, --unset",
 "Additionally include any unset USE flags and the packages",
@@ -265,7 +265,7 @@ class Analyse(ModuleBase):
 self.warning = (
 "   CAUTION",
 "This is beta software and some features/options are incomplete,",
-"some features may change in future releases includig its name.",
+"some features may change in future releases including its name.",
 "Feedback will be appreciated, http://bugs.gentoo.org;,
 )
 



[gentoo-commits] proj/gentoolkit:master commit in: pym/gentoolkit/enalyze/

2022-07-09 Thread Brian Dolbec
commit: 0db35305e9ff05ef792ae18b9721772f4bdd3efb
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sat Jul  9 23:44:44 2022 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  9 23:44:44 2022 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=0db35305

enalyze: Fix missing newline at end of saved rebuild files

Bug: https://bugs.gentoo.org/626308

Signed-off-by: Brian Dolbec  gentoo.org>

 pym/gentoolkit/enalyze/rebuild.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pym/gentoolkit/enalyze/rebuild.py 
b/pym/gentoolkit/enalyze/rebuild.py
index f341680..e3396f3 100644
--- a/pym/gentoolkit/enalyze/rebuild.py
+++ b/pym/gentoolkit/enalyze/rebuild.py
@@ -401,6 +401,7 @@ class Rebuild(ModuleBase):
 encoding=_encodings["content"],
 ) as output:
 output.write("\n".join(data))
+output.write("\n")
 print("   - Done")
 
 



[gentoo-commits] proj/gentoolkit:master commit in: pym/gentoolkit/enalyze/, pym/gentoolkit/revdep_rebuild/, pym/gentoolkit/eclean/, ...

2020-12-21 Thread Matt Turner
commit: 9601ad3b1b1e44c08f0eb35189cde05dd3a5e58d
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Dec 20 22:12:42 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Dec 20 22:12:42 2020 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=9601ad3b

Remove Python < 3 version checks

Signed-off-by: Matt Turner  gentoo.org>

 pym/gentoolkit/eclean/exclude.py  |  2 --
 pym/gentoolkit/enalyze/rebuild.py |  2 --
 pym/gentoolkit/equery/uses.py |  2 --
 pym/gentoolkit/equery/which.py|  2 --
 pym/gentoolkit/helpers.py |  2 --
 pym/gentoolkit/profile.py |  3 ---
 pym/gentoolkit/revdep_rebuild/analyse.py  |  2 --
 pym/gentoolkit/revdep_rebuild/assign.py   |  6 --
 pym/gentoolkit/revdep_rebuild/cache.py|  7 +--
 pym/gentoolkit/revdep_rebuild/collect.py  | 10 +-
 pym/gentoolkit/revdep_rebuild/settings.py |  9 +
 pym/gentoolkit/test/eclean/creator.py |  2 --
 pym/gentoolkit/test/test_keyword.py   |  2 --
 13 files changed, 3 insertions(+), 48 deletions(-)

diff --git a/pym/gentoolkit/eclean/exclude.py b/pym/gentoolkit/eclean/exclude.py
index ee5e1e1..45ecd52 100644
--- a/pym/gentoolkit/eclean/exclude.py
+++ b/pym/gentoolkit/eclean/exclude.py
@@ -6,8 +6,6 @@
 
 import os
 import sys
-if sys.hexversion < 0x300:
-   from io import open
 import re
 import portage
 from portage import _encodings, _unicode_encode

diff --git a/pym/gentoolkit/enalyze/rebuild.py 
b/pym/gentoolkit/enalyze/rebuild.py
index 4ad571f..3f3f4fd 100644
--- a/pym/gentoolkit/enalyze/rebuild.py
+++ b/pym/gentoolkit/enalyze/rebuild.py
@@ -12,8 +12,6 @@ what packages according to the Installed package database"""
 
 import os
 import sys
-if sys.hexversion < 0x300:
-   from io import open
 
 import gentoolkit
 from gentoolkit.module_base import ModuleBase

diff --git a/pym/gentoolkit/equery/uses.py b/pym/gentoolkit/equery/uses.py
index 1260f56..dfb6f31 100644
--- a/pym/gentoolkit/equery/uses.py
+++ b/pym/gentoolkit/equery/uses.py
@@ -12,8 +12,6 @@ __docformat__ = 'epytext'
 
 import os
 import sys
-if sys.hexversion < 0x300:
-   from io import open
 
 from functools import partial
 from getopt import gnu_getopt, GetoptError

diff --git a/pym/gentoolkit/equery/which.py b/pym/gentoolkit/equery/which.py
index 326e692..c7fabd7 100644
--- a/pym/gentoolkit/equery/which.py
+++ b/pym/gentoolkit/equery/which.py
@@ -14,8 +14,6 @@ __docformat__ = 'epytext'
 
 import os
 import sys
-if sys.hexversion < 0x300:
-   from io import open
 from getopt import gnu_getopt, GetoptError
 
 

diff --git a/pym/gentoolkit/helpers.py b/pym/gentoolkit/helpers.py
index b4cc795..02ac20e 100644
--- a/pym/gentoolkit/helpers.py
+++ b/pym/gentoolkit/helpers.py
@@ -25,8 +25,6 @@ __docformat__ = 'epytext'
 
 import os
 import sys
-if sys.hexversion < 0x300:
-   from io import open
 import re
 from functools import partial
 from itertools import chain

diff --git a/pym/gentoolkit/profile.py b/pym/gentoolkit/profile.py
index 01f823a..dcd02cc 100644
--- a/pym/gentoolkit/profile.py
+++ b/pym/gentoolkit/profile.py
@@ -15,9 +15,6 @@ import os.path
 import portage
 import sys
 
-if sys.hexversion < 0x300:
-   from io import open
-
 from portage import _encodings, _unicode_encode
 
 

diff --git a/pym/gentoolkit/revdep_rebuild/analyse.py 
b/pym/gentoolkit/revdep_rebuild/analyse.py
index 4269ade..6ce1568 100644
--- a/pym/gentoolkit/revdep_rebuild/analyse.py
+++ b/pym/gentoolkit/revdep_rebuild/analyse.py
@@ -6,8 +6,6 @@ import os
 import re
 import time
 import sys
-if sys.hexversion < 0x300:
-   from io import open
 
 from portage import _encodings, _unicode_encode
 from portage.output import bold, blue, yellow, green

diff --git a/pym/gentoolkit/revdep_rebuild/assign.py 
b/pym/gentoolkit/revdep_rebuild/assign.py
index 1e5f3e9..3fa9299 100644
--- a/pym/gentoolkit/revdep_rebuild/assign.py
+++ b/pym/gentoolkit/revdep_rebuild/assign.py
@@ -15,12 +15,6 @@ import portage
 from portage import portdb
 from portage.output import bold, red, yellow, green
 
-# Make all str conversions unicode
-try:
-   str = unicode
-except NameError:
-   pass
-
 
 class _file_matcher(object):
"""

diff --git a/pym/gentoolkit/revdep_rebuild/cache.py 
b/pym/gentoolkit/revdep_rebuild/cache.py
index 66fbd9d..f8b7841 100644
--- a/pym/gentoolkit/revdep_rebuild/cache.py
+++ b/pym/gentoolkit/revdep_rebuild/cache.py
@@ -6,11 +6,6 @@ Functions for reading, saving and verifying the data caches
 from portage import os
 import time
 import sys
-if sys.hexversion < 0x300:
-   from io import open
-   _unicode = unicode  # noqa
-else:
-   _unicode = str
 
 from portage import _encodings, _unicode_encode
 from portage.output import red
@@ -59,7 +54,7 @@ def save_cache(logger, to_save={}, 
temp_path=DEFAULTS['DEFAULT_TMP_DIR']):
try:
_file = 

[gentoo-commits] proj/gentoolkit:master commit in: pym/gentoolkit/enalyze/, pym/gentoolkit/test/equery/, pym/gentoolkit/equery/, ...

2020-12-21 Thread Matt Turner
commit: eeb8a46876d546b64cc7e16f76c6eef4ef524b23
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Dec 20 22:12:39 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Dec 20 22:12:39 2020 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=eeb8a468

Remove $Header$

Signed-off-by: Matt Turner  gentoo.org>

 bin/ekeyword  | 2 --
 bin/enalyze   | 2 --
 bin/epkginfo  | 2 --
 bin/equery| 2 --
 bin/euse  | 2 --
 bin/imlate| 2 --
 bin/revdep-rebuild| 2 --
 pym/gentoolkit/__init__.py| 2 --
 pym/gentoolkit/atom.py| 2 --
 pym/gentoolkit/base.py| 2 --
 pym/gentoolkit/cpv.py | 2 --
 pym/gentoolkit/dbapi.py   | 2 --
 pym/gentoolkit/dependencies.py| 2 --
 pym/gentoolkit/ekeyword/Makefile  | 2 --
 pym/gentoolkit/enalyze/__init__.py| 2 --
 pym/gentoolkit/equery/__init__.py | 2 --
 pym/gentoolkit/equery/belongs.py  | 2 --
 pym/gentoolkit/equery/changes.py  | 2 --
 pym/gentoolkit/equery/check.py| 2 --
 pym/gentoolkit/equery/depends.py  | 2 --
 pym/gentoolkit/equery/depgraph.py | 2 --
 pym/gentoolkit/equery/files.py| 2 --
 pym/gentoolkit/equery/has.py  | 2 --
 pym/gentoolkit/equery/hasuse.py   | 2 --
 pym/gentoolkit/equery/list_.py| 2 --
 pym/gentoolkit/equery/meta.py | 2 --
 pym/gentoolkit/equery/size.py | 2 --
 pym/gentoolkit/equery/uses.py | 2 --
 pym/gentoolkit/equery/which.py| 2 --
 pym/gentoolkit/formatters.py  | 2 --
 pym/gentoolkit/helpers.py | 2 --
 pym/gentoolkit/keyword.py | 2 --
 pym/gentoolkit/metadata.py| 2 --
 pym/gentoolkit/module_base.py | 2 --
 pym/gentoolkit/package.py | 2 --
 pym/gentoolkit/pprinter.py| 2 --
 pym/gentoolkit/query.py   | 2 --
 pym/gentoolkit/sets.py| 2 --
 pym/gentoolkit/test/__init__.py   | 2 --
 pym/gentoolkit/test/eclean/__init__.py| 2 --
 pym/gentoolkit/test/eclean/creator.py | 2 --
 pym/gentoolkit/test/eclean/distsupport.py | 2 --
 pym/gentoolkit/test/eclean/test_clean.py  | 2 --
 pym/gentoolkit/test/eclean/test_search.py | 2 --
 pym/gentoolkit/test/equery/__init__.py| 2 --
 pym/gentoolkit/test/test_atom.py  | 2 --
 pym/gentoolkit/test/test_cpv.py   | 2 --
 pym/gentoolkit/versionmatch.py| 2 --
 48 files changed, 96 deletions(-)

diff --git a/bin/ekeyword b/bin/ekeyword
index 2e3c78e..8767fe3 100755
--- a/bin/ekeyword
+++ b/bin/ekeyword
@@ -2,8 +2,6 @@
 #
 # Copyright 2002-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2 or later
-#
-# $Header$
 
 """Manage KEYWORDS in ebuilds easily.
 

diff --git a/bin/enalyze b/bin/enalyze
index a0bb29a..9e27bed 100755
--- a/bin/enalyze
+++ b/bin/enalyze
@@ -3,8 +3,6 @@
 # Copyright 2010 Brian Dolbec 
 # Copyright 2002-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2 or later
-#
-# $Header$
 
 """'enalyze' is a flexible utility for Gentoo linux which can display various
 information about installed packages, such as the USE flags used and the

diff --git a/bin/epkginfo b/bin/epkginfo
index 4f87176..5d3aab2 100755
--- a/bin/epkginfo
+++ b/bin/epkginfo
@@ -2,8 +2,6 @@
 #
 # Copyright 2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2 or later
-#
-# $Header$
 
 """Shortcut to equery meta"""
 

diff --git a/bin/equery b/bin/equery
index 77371d1..386194d 100755
--- a/bin/equery
+++ b/bin/equery
@@ -2,8 +2,6 @@
 #
 # Copyright 2002-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2 or later
-#
-# $Header$
 
 """equery is a flexible utility for Gentoo linux which can display various
 information about packages, such as the files they own, their USE flags,

diff --git a/bin/euse b/bin/euse
index 263d0f2..c3b6638 100755
--- a/bin/euse
+++ b/bin/euse
@@ -2,8 +2,6 @@
 # Disable globbing because "-*" and such is valid as a use flag.
 set -f
 
-# $Header$
-
 # bash replacement for the original euse by Arun Bhanu
 # Author: Marius Mauch 
 # Jared Hancock (Signigicant rewrite for package.use support)

diff --git a/bin/imlate b/bin/imlate
index 040d19e..cd4f7ab 100755
--- a/bin/imlate
+++ b/bin/imlate
@@ -2,8 +2,6 @@
 #
 # Copyright 2002-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2 or later
-#
-# $Header$
 
 """Manage KEYWORDS in ebuilds easily.
 

diff --git a/bin/revdep-rebuild b/bin/revdep-rebuild
index 24d349e..51783c5 100755
--- a/bin/revdep-rebuild
+++ 

[gentoo-commits] proj/gentoolkit:master commit in: pym/gentoolkit/enalyze/, pym/gentoolkit/equery/, pym/gentoolkit/, /, ...

2018-08-14 Thread Virgil Dupras
commit: 8d0df18f0275376a5c7e6c133abaa99e7c05b737
Author: Virgil Dupras  hardcoded  net>
AuthorDate: Tue Aug 14 15:32:05 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Tue Aug 14 15:32:05 2018 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=8d0df18f

Remove pylint

As of now, pylint checks return a metric ton of warnings, which tells us
that it hasn't been running lately. pylint is replaced by flake8 and its
continuous run will enventually be ensured by a CI running tox on this
project. The immediate goal, for now, is to have an easy command that
checks as much as possible, but that *passes* so that we don't litter
the project with more code that decrease quality.

 README.dev   |  10 +-
 pylintrc | 254 ---
 pym/gentoolkit/atom.py   |   6 -
 pym/gentoolkit/ekeyword/.pylintrc|  36 
 pym/gentoolkit/ekeyword/ekeyword.py  |   1 -
 pym/gentoolkit/ekeyword/ekeyword_unittest.py |   2 -
 pym/gentoolkit/ekeyword/pylint   |  49 --
 pym/gentoolkit/enalyze/output.py |   6 -
 pym/gentoolkit/equery/belongs.py |   2 -
 pym/gentoolkit/equery/depends.py |   2 -
 pym/gentoolkit/equery/files.py   |   2 -
 pym/gentoolkit/equery/meta.py|   6 -
 pym/gentoolkit/helpers.py|   2 -
 pym/gentoolkit/pprinter.py   |   4 -
 14 files changed, 5 insertions(+), 377 deletions(-)

diff --git a/README.dev b/README.dev
index 5348867..e2df152 100644
--- a/README.dev
+++ b/README.dev
@@ -25,12 +25,12 @@ Adding or modifying code:
 - If you add new code, best practice is to write a test for it.
 - If you're modifying code that doesn't have a test and you can write a test
   for it, please do.
-- Before committing your changes to a python file, please make sure it passes
-  pylint with:
-pylint --rcfile=pylintrc yourfile.py
-- If pylint raises a warning or error that you don't agree with, it's probably
+- Before committing your changes, run "tox" to ensure that you didn't break
+  tests or introduced a flake8 error.
+- If flake8 raises a warning or error that you don't agree with, it's probably
   better to just change your code. If you're sure you have a good reason for
-  doing what you're doing, you can add an exception to our pylintrc.
+  doing what you're doing, you can add "# noqa" at the end of the line to
+  silence it.
 
 Creating a release:
 ===

diff --git a/pylintrc b/pylintrc
deleted file mode 100644
index dafdddb..000
--- a/pylintrc
+++ /dev/null
@@ -1,254 +0,0 @@
-# lint Python modules
-
-[MASTER]
-
-# Specify a configuration file.
-#rcfile=
-
-# Python code to execute, usually for sys.path manipulation such as
-# pygtk.require().
-#init-hook=
-
-# Profiled execution.
-profile=no
-
-# Add  to the black list. It should be a base name, not a
-# path. You may set this option multiple times.
-ignore=CVS
-
-# Pickle collected data for later comparisons.
-persistent=yes
-
-# List of plugins (as comma separated values of python modules names) to load,
-# usually to register additional checkers.
-load-plugins=
-
-
-[MESSAGES CONTROL]
-
-# Enable the message, report, category or checker with the given id(s). You can
-# either give multiple identifier separated by comma (,) or put this option
-# multiple time.
-#enable=
-
-# Disable the message, report, category or checker with the given id(s). You
-# can either give multiple identifier separated by comma (,) or put this option
-# multiple time (only on the command line, not in the configuration file where
-# it should appear only once).
-#disable=
-# :W0704: *Except doesn't do anything*
-# :W0231: *__init__ method from base class %r is not called*
-# :R0903: *Too few public methods (%s/%s)*
-disable=W0704,W0231,R0903
-
-
-[REPORTS]
-
-# Set the output format. Available formats are text, parseable, colorized, msvs
-# (visual studio) and html
-# was output-format=text
-output-format=colorized
-
-# Include message's id in output
-# was include-ids=no
-include-ids=yes
-
-# Put messages in a separate file for each module / package specified on the
-# command line instead of printing them on stdout. Reports (if any) will be
-# written in a file name "pylint_global.[txt|html]".
-files-output=no
-
-# Tells whether to display a full report or only the messages
-reports=yes
-
-# Python expression which should return a note less than 10 (10 is the highest
-# note). You have access to the variables errors warning, statement which
-# respectively contain the number of errors / warnings messages and the total
-# number of statements analyzed. This is used by the global evaluation report
-# (RP0004).
-evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / 
statement) * 10)
-
-# Add a comment according to your evaluation note. This is used by the global
-# evaluation 

[gentoo-commits] proj/gentoolkit:master commit in: pym/gentoolkit/enalyze/

2016-07-08 Thread Brian Dolbec
commit: 0c2b748b987d629ba7b9f75756db16758ed426bc
Author: Brian Dolbec  gentoo  org>
AuthorDate: Fri Jul  8 15:20:15 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Fri Jul  8 15:35:38 2016 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=0c2b748b

enalyze: Add width and prepend options

These options are useful for creating preformatted wiki list entries.
Feature request from Fernando Reyes for the livedvd packages list.
This adds a prepend and width setting for any of the analyze keys.

 pym/gentoolkit/enalyze/analyze.py | 32 ++--
 pym/gentoolkit/enalyze/output.py  | 28 ++--
 2 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/pym/gentoolkit/enalyze/analyze.py 
b/pym/gentoolkit/enalyze/analyze.py
index ce83ba6..86f0987 100644
--- a/pym/gentoolkit/enalyze/analyze.py
+++ b/pym/gentoolkit/enalyze/analyze.py
@@ -175,7 +175,9 @@ class Analyse(ModuleBase):
"verbose": False,
"quiet": False,
'prefix': False,
-   'portage': True
+   'portage': True,
+   "width": 80,
+   "prepend": "",
}
self.module_opts = {
"-f": ("flags", "boolean", True),
@@ -188,8 +190,12 @@ class Analyse(ModuleBase):
"--verbose": ("verbose", "boolean", True),
"-p": ("prefix", "boolean", True),
"--prefix": ("prefix", "boolean", True),
+   "-P": ("prepend", "char", None),
+   "--prepend": ("prepend", "char", None),
"-G": ("portage", "boolean", False),
"--portage": ("portage", "boolean", False),
+   "-W": ("width", "int", 80),
+   "--width": ("width", "int", 80),
}
self.formatted_options = [
("  -h, --help",  "Outputs this useage message"),
@@ -201,9 +207,15 @@ class Analyse(ModuleBase):
("  -p, --prefix",
"Used for testing purposes only, runs report using " +
"a prefix keyword and 'prefix' USE flag"),
+   ("  -P, --prepend",
+   "Prepend the string to any list output.  " +
+   "ie: prepend '* ' to the ""front of each package being 
listed."
+   "This is useful for generating preformatted wiki 
text."),
#(" -G, --portage",
#"Use portage directly instead of gentoolkit's Package 
" +
#"object for some operations. Usually a little 
faster."),
+   ("  -W, --width",
+   "Format the output to wrap at 'WIDTH' ie: long line 
output"),
]
self.formatted_args = [
("  use",
@@ -223,8 +235,9 @@ class Analyse(ModuleBase):
("  ",
"for those that need to be unmasked")
]
-   self.short_opts = "huvpG"
-   self.long_opts = ("help", "unset", "verbose", "prefix") #, 
"portage")
+   self.short_opts = "huvpGP:W:"
+   self.long_opts = ("help", "unset", "verbose", "prefix", 
"prepend=",
+   "width=") #, "portage")
self.need_queries = True
self.arg_spec = "Target"
self.arg_options = ['use', 'pkguse','keywords', 'packages', 
'unmask']
@@ -262,10 +275,13 @@ class Analyse(ModuleBase):
@param target: the target to be analyzed, one of ["use", 
"pkguse"]
"""
system_use = portage.settings["USE"].split()
+
self.printer = AnalysisPrinter(
"use",
self.options["verbose"],
-   system_use)
+   system_use,
+   width=self.options["width"],
+   prepend=self.options["prepend"])
if self.options["verbose"]:
cpvs = 
portage.db[portage.root]["vartree"].dbapi.cpv_all()
#cpvs = get_installed_cpvs()
@@ -326,7 +342,9 @@ class Analyse(ModuleBase):
self.printer = AnalysisPrinter(
"keywords",
self.options["verbose"],
-   system_keywords)
+   system_keywords,
+   width=self.options["width"],
+   prepend=self.options["prepend"])
self.analyser = KeywordAnalyser( arch, system_keywords, 

[gentoo-commits] proj/gentoolkit:master commit in: pym/gentoolkit/enalyze/

2016-02-25 Thread Brian Dolbec
commit: b9de1f7b39a1ce43f22018e4a1c03bef6677360c
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Feb 25 21:23:33 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Feb 25 21:24:55 2016 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=b9de1f7b

enalyze/analyze.py: Sort the flags for the analyze packages output

Feature request from: Fernando Reyes

 pym/gentoolkit/enalyze/analyze.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pym/gentoolkit/enalyze/analyze.py 
b/pym/gentoolkit/enalyze/analyze.py
index 2d9c85e..ce83ba6 100644
--- a/pym/gentoolkit/enalyze/analyze.py
+++ b/pym/gentoolkit/enalyze/analyze.py
@@ -429,9 +429,10 @@ class Analyse(ModuleBase):
for cpv in cpvs:
(flag_plus, flag_neg, unset) = flags.analyse_cpv(cpv)
if self.options["unset"]:
-   self.printer(cpv, "", (flag_plus, flag_neg, 
unset))
+   self.printer(cpv, "", (sorted(flag_plus), 
sorted(flag_neg),
+   sorted(unset)))
else:
-   self.printer(cpv, "", (flag_plus, flag_neg, []))
+   self.printer(cpv, "", (sorted(flag_plus), 
sorted(flag_neg), []))
if not self.options['quiet']:

print("===")
print("Total number of installed ebuilds =",