diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-01-12 03:17:13 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-01-12 03:17:13 +0000 |
| commit | b10afa45d5cf97d47fc2e7bf7c7939996b83cb94 (patch) | |
| tree | 9473dd155b73382fcb8451ea5a0926324251e1cc | |
| parent | 2fbc075ff110ef15a9a41dac321f330887e725ad (diff) | |
| download | portage-b10afa45d5cf97d47fc2e7bf7c7939996b83cb94.tar.gz portage-b10afa45d5cf97d47fc2e7bf7c7939996b83cb94.tar.bz2 portage-b10afa45d5cf97d47fc2e7bf7c7939996b83cb94.zip | |
For bug #147512, don't print a cryptic error message when an EnvironmentError occurs. Also, allow the user to get a traceback via --debug.
svn path=/main/trunk/; revision=5580
| -rwxr-xr-x | bin/emerge | 2 | ||||
| -rw-r--r-- | pym/portage.py | 33 |
2 files changed, 25 insertions, 10 deletions
diff --git a/bin/emerge b/bin/emerge index f65176b1d..06b75c84f 100755 --- a/bin/emerge +++ b/bin/emerge @@ -4964,6 +4964,8 @@ def emerge_main(): # together with EMERGE_DEFAULT_OPTS (which may vary depending on the # the value of --config-root). myaction, myopts, myfiles = parse_opts(sys.argv[1:], silent=True) + if "--debug" in myopts: + os.environ["PORTAGE_DEBUG"] = "1" if "--config-root" in myopts: os.environ["PORTAGE_CONFIGROOT"] = myopts["--config-root"] diff --git a/pym/portage.py b/pym/portage.py index 0952bd5f8..be8f58e5a 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -895,6 +895,8 @@ class config: @type local_config: Boolean """ + debug = os.environ.get("PORTAGE_DEBUG") == "1" + self.already_in_regenerate = 0 self.locked = 0 @@ -1134,9 +1136,12 @@ class config: except SystemExit, e: raise except Exception, e: + if debug: + raise writemsg("!!! %s\n" % (e), noiselevel=-1) - writemsg("!!! Incorrect multiline literals can cause this. Do not use them.\n", noiselevel=-1) - writemsg("!!! Errors in this file should be reported on bugs.gentoo.org.\n") + if not isinstance(e, EnvironmentError): + writemsg("!!! Incorrect multiline literals can cause " + \ + "this. Do not use them.\n", noiselevel=-1) sys.exit(1) self.configlist.append(self.mygcfg) self.configdict["globals"]=self.configlist[-1] @@ -1158,13 +1163,18 @@ class config: except SystemExit, e: raise except Exception, e: + if debug: + raise writemsg("!!! %s\n" % (e), noiselevel=-1) - writemsg("!!! 'rm -Rf /usr/portage/profiles; emerge sync' may fix this. If it does\n", - noiselevel=-1) - writemsg("!!! not then please report this to bugs.gentoo.org and, if possible, a dev\n", - noiselevel=-1) - writemsg("!!! on #gentoo (irc.freenode.org)\n", - noiselevel=-1) + if not isinstance(e, EnvironmentError): + writemsg("!!! 'rm -Rf /usr/portage/profiles; " + \ + "emerge sync' may fix this. If it does\n", + noiselevel=-1) + writemsg("!!! not then please report this to " + \ + "bugs.gentoo.org and, if possible, a dev\n", + noiselevel=-1) + writemsg("!!! on #gentoo (irc.freenode.org)\n", + noiselevel=-1) sys.exit(1) self.configlist.append(self.mygcfg) self.configdict["defaults"]=self.configlist[-1] @@ -1178,9 +1188,12 @@ class config: except SystemExit, e: raise except Exception, e: + if debug: + raise writemsg("!!! %s\n" % (e), noiselevel=-1) - writemsg("!!! Incorrect multiline literals can cause this. Do not use them.\n", - noiselevel=-1) + if not isinstance(e, EnvironmentError): + writemsg("!!! Incorrect multiline literals can cause " + \ + "this. Do not use them.\n", noiselevel=-1) sys.exit(1) # Allow ROOT setting to come from make.conf if it's not overridden |