diff options
| author | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-09-20 10:57:44 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-09-20 10:57:44 +0000 |
| commit | 7cb8fb941f09d1ac646be334745f90e16ebd46eb (patch) | |
| tree | bad100ba3461c881ebd388d29a6ac859a8962a1a /bin/quickpkg | |
| parent | e70e41916899163fb28a1f5fa24c0ee2b17707f7 (diff) | |
| download | portage-7cb8fb941f09d1ac646be334745f90e16ebd46eb.tar.gz portage-7cb8fb941f09d1ac646be334745f90e16ebd46eb.tar.bz2 portage-7cb8fb941f09d1ac646be334745f90e16ebd46eb.zip | |
Update syntax of 'except' statements for compatibility with Python 3.
(2to3-3.1 -f except -nw ${FILES})
svn path=/main/trunk/; revision=14289
Diffstat (limited to 'bin/quickpkg')
| -rwxr-xr-x | bin/quickpkg | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/quickpkg b/bin/quickpkg index 53f7e9b27..e0aaf63bd 100755 --- a/bin/quickpkg +++ b/bin/quickpkg @@ -45,7 +45,7 @@ def quickpkg_main(options, args, eout): for arg in args: try: atom = dep_expand(arg, mydb=vardb, settings=vartree.settings) - except ValueError, e: + except ValueError as e: # Multiple matches thrown from cpv_expand eout.eerror("Please use a more specific atom: %s" % \ " ".join(e.args[0])) @@ -83,7 +83,7 @@ def quickpkg_main(options, args, eout): try: restrict = flatten(use_reduce( paren_reduce(restrict), uselist=use)) - except InvalidDependString, e: + except InvalidDependString as e: eout.eerror("Invalid RESTRICT metadata " + \ "for '%s': %s; skipping" % (cpv, str(e))) del e @@ -140,7 +140,7 @@ def quickpkg_main(options, args, eout): binpkg_path = bintree.getname(cpv) try: s = os.stat(binpkg_path) - except OSError, e: + except OSError as e: # Sanity check, shouldn't happen normally. eout.eend(1) eout.eerror(str(e)) |