From 4d0949e7be4cd5cf8ea26e0ce147a70d05cd4e2b Mon Sep 17 00:00:00 2001 Message-Id: <4d0949e7be4cd5cf8ea26e0ce147a70d05cd4e2b.1374922645.git.hahn@univention.de> From: Philipp Hahn Date: Sat, 27 Jul 2013 12:56:17 +0200 Subject: [PATCH] Bug #32098: UVMM Fix storage pool detection Organization: Univention GmbH, Bremen, Germany Change prefix check to honor directory boundaries. --- .../univention-virtual-machine-manager-daemon/debian/changelog | 6 ++++++ .../umc/python/uvmm/storages.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/branches/ucs-3.2/ucs-3.2-0/virtualization/univention-virtual-machine-manager-daemon/debian/changelog b/branches/ucs-3.2/ucs-3.2-0/virtualization/univention-virtual-machine-manager-daemon/debian/changelog index a5ca9ec..9728f00 100644 --- a/branches/ucs-3.2/ucs-3.2-0/virtualization/univention-virtual-machine-manager-daemon/debian/changelog +++ b/branches/ucs-3.2/ucs-3.2-0/virtualization/univention-virtual-machine-manager-daemon/debian/changelog @@ -1,3 +1,9 @@ +univention-virtual-machine-manager-daemon (3.0.6-6) unstable; urgency=low + + * Fix storage pool detection (Bug #32098) + + -- Philipp Hahn Sat, 27 Jul 2013 11:56:31 +0200 + univention-virtual-machine-manager-daemon (3.0.6-5) unstable; urgency=low * Ignore Text in Form for validation (Bug #32097) diff --git a/branches/ucs-3.2/ucs-3.2-0/virtualization/univention-virtual-machine-manager-daemon/umc/python/uvmm/storages.py b/branches/ucs-3.2/ucs-3.2-0/virtualization/univention-virtual-machine-manager-daemon/umc/python/uvmm/storages.py index b4797f6..1452c1a 100644 --- a/branches/ucs-3.2/ucs-3.2-0/virtualization/univention-virtual-machine-manager-daemon/umc/python/uvmm/storages.py +++ b/branches/ucs-3.2/ucs-3.2-0/virtualization/univention-virtual-machine-manager-daemon/umc/python/uvmm/storages.py @@ -364,7 +364,7 @@ class Storages(object): if pool_path: for _uri, pool in pools.items(): - if pool_path.startswith(pool['path']): + if not os.path.relpath(pool_path, pool['path']).startswith('../'): return pool return None -- 1.7.10.4