Merge lp:~smoser/curtin/trunk.1703755-install-in-virtualenv into lp:~curtin-dev/curtin/trunk

[Scott Moser]

setup.py: fix to allow installation into a virtualenv

This just makes '/usr' not be a full path. It does not fix usage
of things that are are expected to be in /usr/ (the helpers).

The 'in_virtualenv' is the same method we employ for this function
in cloud-init.

To Test:

$ mydir=$(mktemp -d)
$ virtualenv $mydir

$ . $mydir/bin/activate

$ bzr branch lp:~smoser/curtin/trunk.1703755-install-in-virtualenv
$ pip install ./trunk.1703755-install-in-virtualenv
Processing ./trunk.1703755-install-in-virtualenv
Installing collected packages: curtin
  Running setup.py install for curtin ... done
Successfully installed curtin-0.1.0

$ find $mydir/usr -type f
/tmp/tmp.tlpxXpa2ex/usr/share/doc/curtin/Makefile
/tmp/tmp.tlpxXpa2ex/usr/share/doc/curtin/index.rst
/tmp/tmp.tlpxXpa2ex/usr/share/doc/curtin/conf.py
/tmp/tmp.tlpxXpa2ex/usr/lib/curtin/helpers/shell-archive
/tmp/tmp.tlpxXpa2ex/usr/lib/curtin/helpers/smtar
/tmp/tmp.tlpxXpa2ex/usr/lib/curtin/helpers/partition
/tmp/tmp.tlpxXpa2ex/usr/lib/curtin/helpers/install-grub
/tmp/tmp.tlpxXpa2ex/usr/lib/curtin/helpers/common
/tmp/tmp.tlpxXpa2ex/usr/lib/curtin/helpers/list-flash-kernel-packages

[Ryan Harper (raharper)]

Nicely done. Thanks!

review: Approve

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:530
https://jenkins.ubuntu.com/server/job/curtin-ci/640/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/640
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/640
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/640
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/640

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/640/rebuild

review: Approve (continuous-integration)

=== modified file 'setup.py'
--- setup.py	2016-05-20 15:42:08 +0000
+++ setup.py	2017-10-02 20:57:15 +0000
@@ -1,6 +1,7 @@
 from distutils.core import setup
 from glob import glob
 import os
+import sys
 
 import curtin
 
@@ -8,6 +9,19 @@
 def is_f(p):
     return os.path.isfile(p)
 
+
+def in_virtualenv():
+    try:
+        if sys.real_prefix == sys.prefix:
+            return False
+        else:
+            return True
+    except AttributeError:
+        return False
+
+
+USR = "usr" if in_virtualenv() else "/usr"
+
 setup(
     name="curtin",
     description='The curtin installer',
@@ -27,9 +41,9 @@
     ],
     scripts=glob('bin/*'),
     data_files=[
-        ('/usr/share/doc/curtin',
+        (USR + '/share/doc/curtin',
          [f for f in glob('doc/*') if is_f(f)]),
-        ('/usr/lib/curtin/helpers',
+        (USR + '/lib/curtin/helpers',
          [f for f in glob('helpers/*') if is_f(f)])
     ]
 )