diff options
author | Changqing Li <changqing.li@windriver.com> | 2019-08-02 10:43:59 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-08-03 14:47:31 +0100 |
commit | 56f30e5377ebe5cc4544f081e001934706a0d8d3 (patch) | |
tree | 1352f90d4af5449ba4d246438dbd3ad3ea954edc /scripts/runqemu | |
parent | 4669839edbac8e1d3a8267d32ebf259a44938ec7 (diff) | |
download | openembedded-core-contrib-56f30e5377ebe5cc4544f081e001934706a0d8d3.tar.gz |
runqemu: fix get portlock fail for multi users
when runqemu with slirp option on same host with different
users, it will report PermissionError: [Errno 13] Permission
denied: '/tmp/qemu-port-locks/2222.lock'
and during handle this exception, another exception happened since
key not exist. Fix by check if key exist first
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/runqemu')
-rwxr-xr-x | scripts/runqemu | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/scripts/runqemu b/scripts/runqemu index 6fae3d8c5d..9d6a2e86d4 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -235,7 +235,7 @@ class BaseConfig(object): else: return False - def acquire_portlock(self, lockfile, error=True): + def acquire_portlock(self, lockfile): logger.debug("Acquiring lockfile %s..." % lockfile) try: portlock_descriptor = open(lockfile, 'w') @@ -243,11 +243,8 @@ class BaseConfig(object): fcntl.flock(self.portlocks[lockfile], fcntl.LOCK_EX|fcntl.LOCK_NB) except Exception as e: msg = "Acquiring lockfile %s failed: %s" % (lockfile, e) - if error: - logger.error(msg) - else: - logger.info(msg) - if self.portlocks[lockfile]: + logger.info(msg) + if lockfile in self.portlocks.keys() and self.portlocks[lockfile]: self.portlocks[lockfile].close() del self.portlocks[lockfile] return False |