diff options
Diffstat (limited to 'scripts/lib')
| -rw-r--r-- | scripts/lib/devtool/__init__.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/scripts/lib/devtool/__init__.py b/scripts/lib/devtool/__init__.py index 396e8025b7..717a60c039 100644 --- a/scripts/lib/devtool/__init__.py +++ b/scripts/lib/devtool/__init__.py | |||
| @@ -66,7 +66,7 @@ def exec_watch(cmd, **options): | |||
| 66 | sys.stdout.write(out) | 66 | sys.stdout.write(out) |
| 67 | sys.stdout.flush() | 67 | sys.stdout.flush() |
| 68 | buf += out | 68 | buf += out |
| 69 | elif out == '' and process.poll() != None: | 69 | elif out == '' and process.poll() is not None: |
| 70 | break | 70 | break |
| 71 | 71 | ||
| 72 | if process.returncode != 0: | 72 | if process.returncode != 0: |
| @@ -74,13 +74,6 @@ def exec_watch(cmd, **options): | |||
| 74 | 74 | ||
| 75 | return buf, None | 75 | return buf, None |
| 76 | 76 | ||
| 77 | def exec_fakeroot(d, cmd, **kwargs): | ||
| 78 | """Run a command under fakeroot (pseudo, in fact) so that it picks up the appropriate file permissions""" | ||
| 79 | # Grab the command and check it actually exists | ||
| 80 | fakerootcmd = d.getVar('FAKEROOTCMD') | ||
| 81 | fakerootenv = d.getVar('FAKEROOTENV') | ||
| 82 | exec_fakeroot_no_d(fakerootcmd, fakerootenv, cmd, kwargs) | ||
| 83 | |||
| 84 | def exec_fakeroot_no_d(fakerootcmd, fakerootenv, cmd, **kwargs): | 77 | def exec_fakeroot_no_d(fakerootcmd, fakerootenv, cmd, **kwargs): |
| 85 | if not os.path.exists(fakerootcmd): | 78 | if not os.path.exists(fakerootcmd): |
| 86 | logger.error('pseudo executable %s could not be found - have you run a build yet? pseudo-native should install this and if you have run any build then that should have been built') | 79 | logger.error('pseudo executable %s could not be found - have you run a build yet? pseudo-native should install this and if you have run any build then that should have been built') |
