aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Lutomirski <luto@kernel.org>2018-11-02 14:53:08 -0700
committerAndy Lutomirski <luto@kernel.org>2018-11-02 14:53:31 -0700
commit291d880996ac94186bb5edbf9c30de9e7f7018e1 (patch)
tree333b7dad03c5d280d6d6c82c12b574b0ab6e755c
parent0ed24f687fc34a27c29cea86a54948edcac2d8bf (diff)
downloadvirtme-291d880996ac94186bb5edbf9c30de9e7f7018e1.tar.gz
guest_tools: Remove support for guest tools in .../share/...
The guest tools are not always package resources. Signed-off-by: Andy Lutomirski <luto@kernel.org>
-rw-r--r--virtme/guest_tools.py11
1 files changed, 0 insertions, 11 deletions
diff --git a/virtme/guest_tools.py b/virtme/guest_tools.py
index 5dd8d58..96c1cc2 100644
--- a/virtme/guest_tools.py
+++ b/virtme/guest_tools.py
@@ -12,21 +12,10 @@ import pkg_resources
def find_guest_tools():
"""Return the path of the guest tools installed with the running virtme.
-
- This is much more complicated than it deserves to be.
"""
- # First try: look for an ordinary resource. This will succeed when
- # running from the source tree, but it is unlikely to succeed
- # if we're running out of any sort of installation.
if pkg_resources.resource_isdir(__name__, 'guest'):
return pkg_resources.resource_filename(__name__, 'guest')
- # Second try: look for an installed copy. (Sadly, pkg_resources can't
- # see data_files AFAICT.)
- for d in ('/usr/local/share/virtme-guest-0', '/usr/share/virtme-guest-0'):
- if os.path.isdir(d):
- return d
-
# No luck. This is somewhat surprising.
return None