comment the excepts in a few places

svn path=/main/trunk/; revision=5584

diff --git a/pym/portage_dep.py b/pym/portage_dep.py
index 271c5ef040eaf5c665cd1f298fbc95727c3c115c..cc662d5ca07d5aaccc2bc0641609412eccbeb193 100644 (file)
--- a/pym/portage_dep.py
+++ b/pym/portage_dep.py
@@ -618,7 +618,7 @@ def match_from_list(mydep, candidate_list):
                for x in candidate_list:
                        try:
                                result = pkgcmp(pkgsplit(x), mysplit)
-                       except ValueError:
+                       except ValueError: # pkgcmp may return ValueError during int() conversion
                                writemsg("\nInvalid package name: %s\n" % x, noiselevel=-1)
                                raise
                        if result is None:

diff --git a/pym/portage_exec.py b/pym/portage_exec.py
index 7557ad7244710899973ed52cfe18d1e91e0e183f..252fed2a0f5fa476d561785107c0fc16eaf462ab 100644 (file)
--- a/pym/portage_exec.py
+++ b/pym/portage_exec.py
@@ -84,7 +84,7 @@ def run_exitfuncs():
                        func(*targs, **kargs)
                except SystemExit:
                        exc_info = sys.exc_info()
-               except:
+               except: # No idea what they called, so we need this broad except here.
                        dump_traceback("Error in portage_exec.run_exitfuncs", noiselevel=0)
                        exc_info = sys.exc_info()
 

diff --git a/pym/portage_versions.py b/pym/portage_versions.py
index 6aae094c09141dd89bef697078b0f8f321422245..6a354e0c2665b8fd65af838ae6755edee3af8856 100644 (file)
--- a/pym/portage_versions.py
+++ b/pym/portage_versions.py
@@ -222,7 +222,7 @@ def pkgsplit(mypkg,silent=1):
                try:
                        int(myrev[1:])
                        revok=1
-               except ValueError:
+               except ValueError: # from int()
                        pass
        if revok:
                verPos = -2