Merge pull request #96 from martindurant/absolute_env

Fix for env not within usual directory

knit/env.py

@@ -237,15 +237,20 @@ def zip_env(self, env_path):
         zFile = os.path.join(env_dir, fname)
 
         # ZipFile does not have a contextmanager in Python 2.6
-        f = zipfile.ZipFile(zFile, 'w')
+        f = zipfile.ZipFile(zFile, 'w', allowZip64=True)
         try:
+            logger.info('Creating: %s' % zFile)
             for root, dirs, files in os.walk(env_path):
                 for file in files:
                     relfile = os.path.join(
-                        os.path.relpath(root, self.conda_envs), file)
+                        os.path.relpath(root, env_dir), file)
                     absfile = os.path.join(root, file)
+                    try:
+                        os.stat(absfile)
+                    except OSError:
+                        logger.info('Skipping zip for %s' % absfile)
+                        continue
                     f.write(absfile, relfile)
             return zFile
-
         finally:
             f.close()

knit/yarn_api.py

@@ -57,7 +57,7 @@ def app_attempts(self, app_id):
         r = requests.get(self.url + 'cluster/apps/{}/appattempts'.format(
                 app_id), timeout=self.timeout)
         self._verify_response(r)
-        return r.json()['appAttempts']['appAttempt']
+        return r.json().get('appAttempts', {'app_attempt': []})['appAttempt']
 
     def app_containers(self, app_id=None, info=None):
         """
@@ -259,7 +259,8 @@ def kill(self, app_id):
     def _verify_response(self, r):
         if not r.ok:
             try:
-                raise YARNException(r.json()['RemoteException']['message'])
+                ex = r.json()['RemoteException']
+                raise YARNException(ex.get('message', str(ex)))
             except (ValueError, IndexError):
                 raise YARNException(r.text)