Bug #192341 - When the chflags command does not exit successfully,

try to generate an informative error. First, use stat or lstat to
try and generate an ENOENT error.  It the path exists, verify that
the chflags binary exists and raise CommandNotFound if necessary.
Finally, simply generate an EPERM OSError with the output of the
command since we're not sure exactly why it failed or what the
real errno was. (trunk r7834)

svn path=/main/branches/2.1.2/; revision=7836

diff --git a/pym/portage.py b/pym/portage.py
index c7766e7c087676b98015edc20a177940e7a81f48..b2a2e4a2c2fddf3b3f0875fc6b31117253b20bb0 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -49,11 +49,20 @@ if os.uname()[0] in ["FreeBSD"]:
        def _chflags(path, flags, opts=""):
                cmd = "chflags %s %o '%s'" % (opts, flags, path)
                status, output = commands.getstatusoutput(cmd)
-               retval = os.WEXITSTATUS(status)
-               if os.WIFEXITED(status) and retval == os.EX_OK:
+               if os.WIFEXITED(status) and os.WEXITSTATUS(status) == os.EX_OK:
                        return
-               e = OSError(retval, output)
-               e.errno = retval
+               # Try to generate an ENOENT error if appropriate.
+               if "h" in opts:
+                       os.lstat(path)
+               else:
+                       os.stat(path)
+               # Make sure the binary exists.
+               if not portage_exec.find_binary("chflags"):
+                       raise portage_exception.CommandNotFound("chflags")
+               # Now we're not sure exactly why it failed or what
+               # the real errno was, so just report EPERM.
+               e = OSError(errno.EPERM, output)
+               e.errno = errno.EPERM
                e.filename = path
                e.message = output
                raise e