Bugfixes for #42160, #40935, #43389

svn path=/; revision=90

diff --git a/trunk/ChangeLog b/trunk/ChangeLog
index 464e4b3a1b8855db72958d8a6068fc7c67f58361..48286aa6aa7e9c17d9d455570d5f9317aa7dd4bb 100644 (file)
--- a/trunk/ChangeLog
+++ b/trunk/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-13 Marius Mauch <genone@gentoo.org>
+       * Added glsa-check and glsa.py, please note:
+               - they are only temporary for testing, so no manpage/ChangeLog
+               - their CVS home is in gentoo-projects
+       * fixed bugs #42160, #40935, #43389
+
 2004-02-08 Karl Trygve Kalleberg <karltk@gentoo.org>
        * Added ebump
        * Added gensync

diff --git a/trunk/src/equery/ChangeLog b/trunk/src/equery/ChangeLog
index 96cdd1e7bdd23dc5a0347da122113f632a365619..0236b3cd808ff8435cb1c05f51e886472ebf9375 100644 (file)
--- a/trunk/src/equery/ChangeLog
+++ b/trunk/src/equery/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-13 Marius Mauch <genone@gentoo.org>
+       * fixing descriptions for local USE flags
+       * more checking on exceptions
+
 2004-01-23 Marius Mauch <genone@gentoo.org>
        * now catches Exceptions thrown by portage
        * minor bugfixes

diff --git a/trunk/src/equery/equery b/trunk/src/equery/equery
index c534a4fac862924b22afa1f1a54f5ec19d57e1e9..44464a171e23588a69de503781a7e22b8b59e9a3 100755 (executable)
--- a/trunk/src/equery/equery
+++ b/trunk/src/equery/equery
@@ -346,7 +346,7 @@ class CmdDisplayUSEs(Command):
                                        desc = usedesc[u]
                                except KeyError:
                                        try:
-                                               desc = uselocaldesc[p][u]
+                                               desc = uselocaldesc[p.get_category()+"/"+p.get_name()][u]
                                        except KeyError:
                                                desc = ""
 
@@ -946,7 +946,8 @@ if __name__ == "__main__":
                try:
                        cmd.perform(local_opts)
                except KeyError, e:
-                       if string.find(e[0], "Specific key requires operator") == 0:
+                       if e and type(e[0]) == types.ListType and \
+                                       string.find(e[0], "Specific key requires operator") == 0:
                                print red("!!!"), "Invalid syntax: missing operator"
                                print red("!!!"), "If you want only specific versions please use one of"
                                print red("!!!"), "the following operators as prefix for the package name:"
@@ -959,7 +960,7 @@ if __name__ == "__main__":
                                        print red("!!!"), e
                        sys.exit(2)
                except ValueError, e:
-                       if type(e[0]) == types.ListType:
+                       if e and type(e[0]) == types.ListType:
                                print red("!!!"), "Ambiguous package name \"%s\"" % local_opts[0]
                                print red("!!!"), "Please use one of the following long names:"
                                for p in e[0]:

diff --git a/trunk/src/etcat/ChangeLog b/trunk/src/etcat/ChangeLog
index a3b808938fbc7c108138f8a6a8cc2759fbc6e121..c5fd64db1482f7687c28a98e0cd98be7555dd746 100644 (file)
--- a/trunk/src/etcat/ChangeLog
+++ b/trunk/src/etcat/ChangeLog
@@ -1,3 +1,6 @@
+2004-03-13 Marius Mauch <genone@gentoo.org>
+       - grouping version in --version output
+
 2004-01-23 Marius Mauch <genone@gentoo.org>
        - now catches exceptions thrown by portage
        - minor bugfixes

diff --git a/trunk/src/etcat/etcat b/trunk/src/etcat/etcat
index 71afdfff7d1e2b50d5c9f6f372e5ef46447802b2..459bd1d4168207efbe177f11a3d81f5b1642ec0e 100755 (executable)
--- a/trunk/src/etcat/etcat
+++ b/trunk/src/etcat/etcat
@@ -253,8 +253,13 @@ def versions(query, matches):
        # FIXME: old version printed result of regex search on name,
        # so "ant" would return app-emacs/semantic, etc...
        
+       last_cp = ""
+
        for pkg in matches:
-               print green("*") + "  " + white(pkg.get_cpv()) + " :"
+               new_cp = pkg.get_category()+"/"+pkg.get_name()
+               if last_cp != new_cp:
+                       print green("*") + "  " + white(new_cp) + " :"
+               last_cp = new_cp
                        
                state = []
                color = green
@@ -292,7 +297,6 @@ def versions(query, matches):
                ver = pkg.get_version()
                slot = pkg.get_env_var("SLOT")
                print " "*8 + "[" + string.join(state,"") + "] " + color(ver) + " (" + color(slot) + ")" + overlay
-               print
 
 # .-------------------------------------------------------.
 # | List USE flags for a single ebuild, if it's installed |
@@ -362,7 +366,7 @@ def uses(query, matches):
                                desc = usedesc[u]
                        except KeyError:
                                try:
-                                       desc = uselocaldesc[p][u]
+                                       desc = uselocaldesc[p.get_category()+"/"+p.get_name()][u]
                                except KeyError:
                                        desc = ""
 

diff --git a/trunk/src/gentoolkit/gentoolkit.py b/trunk/src/gentoolkit/gentoolkit.py
index 9b2eec770e2a417dd654750616f0caf8f1c9ec34..31ea74a477fd517715a224635550aa48496499df 100644 (file)
--- a/trunk/src/gentoolkit/gentoolkit.py
+++ b/trunk/src/gentoolkit/gentoolkit.py
@@ -44,7 +44,7 @@ class Package:
                if not self._scpv:
                        raise Exception("invalid cpv: %s" % cpv)
                self._db = None
-               self._settings = None
+               self._settings = settings.setcpv(self._cpv)
        def get_name(self):
                """Returns base name of package, no category nor version"""
                return self._scpv[1]