diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-04-10 21:52:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-04-10 21:52:19 +0000 |
| commit | f73dc32a2a1e4e4fb32f1ea80848d868c680b92a (patch) | |
| tree | b9c803e622eacd780aa90e6c1b3577bc61cfaa70 | |
| parent | 7a1957dfe91011510d34b849fadbb973b53d0414 (diff) | |
| parent | 48c191ffeaf2063a338eec21f9e46878e3204e77 (diff) | |
| download | nova-f73dc32a2a1e4e4fb32f1ea80848d868c680b92a.tar.gz nova-f73dc32a2a1e4e4fb32f1ea80848d868c680b92a.tar.xz nova-f73dc32a2a1e4e4fb32f1ea80848d868c680b92a.zip | |
Merge "fix TypeError with unstarted threads in nova-network"
| -rw-r--r-- | Authors | 1 | ||||
| -rw-r--r-- | nova/utils.py | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -75,6 +75,7 @@ Hengqing Hu <hudayou@hotmail.com> Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp> Hisaki Ohara <hisaki.ohara@intel.com> Ilya Alekseyev <ilyaalekseyev@acm.org> +Ionuț Arțăriși <iartarisi@suse.cz> Isaku Yamahata <yamahata@valinux.co.jp> Ivan Kolodyazhny <e0ne@e0ne.info> J. Daniel Schmidt <jdsn@suse.de> diff --git a/nova/utils.py b/nova/utils.py index 1006714cc..e959e544a 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -857,7 +857,7 @@ class GreenLockFile(lockfile.FileLock): t = threading.current_thread() # Thread objects in Python 2.4 and earlier do not have ident # attrs. Worm around that. - ident = getattr(t, "ident", hash(t)) + ident = getattr(t, "ident", hash(t)) or hash(t) gident = corolocal.get_ident() self.tname = "-%x-%x" % (ident & 0xffffffff, gident & 0xffffffff) else: |