From 272b8aae291b4b177fb6340aba9907e89bd0905c Mon Sep 17 00:00:00 2001
From: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
Date: Wed, 23 Jul 2014 17:50:45 +0100
Subject: more

---
 packages/debian/rules                              | 4 +---
 tests/unittests/test_datasource/test_azure.py      | 2 +-
 tests/unittests/test_datasource/test_maas.py       | 2 +-
 tests/unittests/test_datasource/test_nocloud.py    | 2 +-
 tests/unittests/test_datasource/test_opennebula.py | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/debian/rules b/packages/debian/rules
index 6c3bf526..3bec7267 100755
--- a/packages/debian/rules
+++ b/packages/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 INIT_SYSTEM ?= upstart,systemd
+export PYBUILD_INSTALL_ARGS=--init-system=$(INIT_SYSTEM)
 
 %:
 	dh $@ --with python2,systemd --buildsystem pybuild
@@ -12,6 +13,3 @@ override_dh_install:
 
 override_dh_auto_test:
 	http_proxy= dh_auto_test -- --test-nose
-
-override_dh_auto_install:
-	dh_auto_install -- --init-system=$(INIT_SYSTEM)
diff --git a/tests/unittests/test_datasource/test_azure.py b/tests/unittests/test_datasource/test_azure.py
index c7c977bd..88c82d5e 100644
--- a/tests/unittests/test_datasource/test_azure.py
+++ b/tests/unittests/test_datasource/test_azure.py
@@ -1,7 +1,7 @@
 from cloudinit import helpers
 from cloudinit.util import load_file
 from cloudinit.sources import DataSourceAzure
-from ...helpers import populate_dir
+from ..helpers import populate_dir
 
 import base64
 import crypt
diff --git a/tests/unittests/test_datasource/test_maas.py b/tests/unittests/test_datasource/test_maas.py
index 0b616c64..c157beb8 100644
--- a/tests/unittests/test_datasource/test_maas.py
+++ b/tests/unittests/test_datasource/test_maas.py
@@ -3,7 +3,7 @@ import os
 
 from cloudinit.sources import DataSourceMAAS
 from cloudinit import url_helper
-from ...helpers import populate_dir
+from ..helpers import populate_dir
 
 import mocker
 
diff --git a/tests/unittests/test_datasource/test_nocloud.py b/tests/unittests/test_datasource/test_nocloud.py
index c106e639..14274562 100644
--- a/tests/unittests/test_datasource/test_nocloud.py
+++ b/tests/unittests/test_datasource/test_nocloud.py
@@ -1,7 +1,7 @@
 from cloudinit import helpers
 from cloudinit.sources import DataSourceNoCloud
 from cloudinit import util
-from ...helpers import populate_dir
+from ..helpers import populate_dir
 
 from mocker import MockerTestCase
 import os
diff --git a/tests/unittests/test_datasource/test_opennebula.py b/tests/unittests/test_datasource/test_opennebula.py
index 287aceba..b4fd1f4d 100644
--- a/tests/unittests/test_datasource/test_opennebula.py
+++ b/tests/unittests/test_datasource/test_opennebula.py
@@ -2,7 +2,7 @@ from cloudinit import helpers
 from cloudinit.sources import DataSourceOpenNebula as ds
 from cloudinit import util
 from mocker import MockerTestCase
-from ...helpers import populate_dir
+from ..helpers import populate_dir
 
 from base64 import b64encode
 import os
-- 
cgit v1.2.3