diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-27 14:25:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-27 14:25:46 +0000 |
| commit | bf77ba39e5b181590d8e67b7f8446f04b0df3506 (patch) | |
| tree | 108eac0ddaaa11f1589d6bb033fb39b0c3463365 | |
| parent | 82fab9a0110e0ed5e2410c6d02468ff3a0a2feda (diff) | |
| parent | 1fcebf22a6541d0179251d850a98f657ca4482be (diff) | |
| download | nova-bf77ba39e5b181590d8e67b7f8446f04b0df3506.tar.gz nova-bf77ba39e5b181590d8e67b7f8446f04b0df3506.tar.xz nova-bf77ba39e5b181590d8e67b7f8446f04b0df3506.zip | |
Merge "xenapi: Improve cross-device linking error message."
| -rw-r--r-- | plugins/xenserver/xenapi/etc/xapi.d/plugins/utils.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/utils.py b/plugins/xenserver/xenapi/etc/xapi.d/plugins/utils.py index 95f01bba3..a15ace92a 100644 --- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/utils.py +++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/utils.py @@ -46,7 +46,13 @@ def _link(src, dst): def _rename(src, dst): LOG.info("Renaming file '%s' -> '%s'" % (src, dst)) - os.rename(src, dst) + try: + os.rename(src, dst) + except OSError, e: + if e.errno == errno.EXDEV: + LOG.error("Invalid cross-device link. Perhaps %s and %s should " + "be symlinked on the same filesystem?" % (src, dst)) + raise def make_subprocess(cmdline, stdout=False, stderr=False, stdin=False, |