Update with trunk and resolve conflicts

1 files changed, 37 insertions, 18 deletions

diff --git a/setup.py b/setup.py
index 3b0af03c..ab72ec18 100755
--- a/setup.py
+++ b/setup.py
@@ -23,6 +23,7 @@
 from glob import glob
 
 import os
+import sys
 
 import setuptools
 from setuptools.command.install import install
@@ -90,6 +91,17 @@ elif os.path.isfile('/etc/redhat-release'):
     USR_LIB_EXEC = "/usr/libexec"
 
 
+# Avoid having datafiles installed in a virtualenv...
+def in_virtualenv():
+    try:
+        if sys.real_prefix == sys.prefix:
+            return False
+        else:
+            return True
+    except AttributeError:
+        return False
+
+
 def get_version():
     cmd = ['tools/read-version']
     (ver, _e) = tiny_p(cmd)
@@ -139,6 +151,29 @@ class InitsysInstallData(install):
         self.distribution.reinitialize_command('install_data', True)
 
 
+if in_virtualenv():
+    data_files = []
+    cmdclass = {}
+else:
+    data_files = [
+        (ETC + '/cloud', glob('config/*.cfg')),
+        (ETC + '/cloud/cloud.cfg.d', glob('config/cloud.cfg.d/*')),
+        (ETC + '/cloud/templates', glob('templates/*')),
+        (USR_LIB_EXEC + '/cloud-init', ['tools/uncloud-init',
+                                        'tools/write-ssh-key-fingerprints']),
+        (USR + '/share/doc/cloud-init', [f for f in glob('doc/*') if is_f(f)]),
+        (USR + '/share/doc/cloud-init/examples',
+            [f for f in glob('doc/examples/*') if is_f(f)]),
+        (USR + '/share/doc/cloud-init/examples/seed', 
+            [f for f in glob('doc/examples/seed/*') if is_f(f)]),
+    ]
+    # Use a subclass for install that handles
+    # adding on the right init system configuration files
+    cmdclass = {
+        'install': InitsysInstallData,
+    }
+
+
 setuptools.setup(name='cloud-init',
       version=get_version(),
       description='EC2 initialisation magic',
@@ -150,23 +185,7 @@ setuptools.setup(name='cloud-init',
                'tools/cloud-init-per',
                ],
       license='GPLv3',
-      data_files=[(ETC + '/cloud', glob('config/*.cfg')),
-                  (ETC + '/cloud/cloud.cfg.d', glob('config/cloud.cfg.d/*')),
-                  (ETC + '/cloud/templates', glob('templates/*')),
-                  (USR_LIB_EXEC + '/cloud-init',
-                    ['tools/uncloud-init',
-                     'tools/write-ssh-key-fingerprints']),
-                  (USR + '/share/doc/cloud-init',
-                   [f for f in glob('doc/*') if is_f(f)]),
-                  (USR + '/share/doc/cloud-init/examples',
-                   [f for f in glob('doc/examples/*') if is_f(f)]),
-                  (USR + '/share/doc/cloud-init/examples/seed',
-                   [f for f in glob('doc/examples/seed/*') if is_f(f)]),
-                 ],
+      data_files=data_files,
       install_requires=read_requires(),
-      cmdclass={
-          # Use a subclass for install that handles
-          # adding on the right init system configuration files
-          'install': InitsysInstallData,
-      },
+      cmdclass=cmdclass,
       )