From: Alina Quereilhac <alina.quereilhac@inria.fr>
Date: Mon, 8 Jul 2013 02:38:36 +0000 (-0700)
Subject: Fixing Makefile
X-Git-Tag: nepi-3.0.0~82
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ccf7cd2fbace39a064cdc5920af8a96f3ed21667;hp=d46c1ec2e83b28a96699f90718bd17d6de0512f1;p=nepi.git

Fixing Makefile
---

diff --git a/Makefile b/Makefile
index cc56b5ef..4909c6cb 100644
--- a/Makefile
+++ b/Makefile
@@ -21,10 +21,10 @@ COVERAGE = $(or $(shell which coverage), $(shell which python-coverage), \
 	   coverage)
 
 all:
-	./setup.py build
+	PYTHONPATH="$(PYTHONPATH):$(SRCDIR)" ./setup.py build
 
 install: all
-	./setup.py install
+	PYTHONPATH="$(PYTHONPATH):$(SRCDIR)" ./setup.py install
 
 test: all
 	retval=0; \
diff --git a/src/nepi/resources/linux/interface.py b/src/nepi/resources/linux/interface.py
index 68c46eb0..f5f7025d 100644
--- a/src/nepi/resources/linux/interface.py
+++ b/src/nepi/resources/linux/interface.py
@@ -240,7 +240,7 @@ class LinuxInterface(ResourceManager):
                 self.discover()
                 self.provision()
             except:
-                self._state = ResourceState.FAILED
+                self.fail()
                 raise
 
             super(LinuxInterface, self).deploy()