From 90575870ccb0b29b3401a392c3b91db3055e5ac3 Mon Sep 17 00:00:00 2001
From: Tiago Gomes <tiago.gomes@codethink.co.uk>
Date: Thu, 12 Nov 2015 15:48:41 +0000
Subject: morphloader: invert repo/name logic

Getting the `repo` from the given `name` will most likely result on a
not valid git URL.

Change-Id: Iff6cb5abe5a32419a290eca28df4ca2d1f0182aa
---
 morphlib/morphloader.py       |  8 ++++----
 morphlib/morphloader_tests.py | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/morphlib/morphloader.py b/morphlib/morphloader.py
index f9c71384..7bd5c37a 100644
--- a/morphlib/morphloader.py
+++ b/morphlib/morphloader.py
@@ -698,8 +698,8 @@ class MorphologyLoader(object):
 
     def _set_stratum_defaults(self, morph):
         for spec in morph['chunks']:
-            if 'repo' not in spec:
-                spec['repo'] = spec['name']
+            if 'name' not in spec:
+                spec['name'] = spec['repo']
             if 'build-mode' not in spec:
                 spec['build-mode'] = \
                     self._static_defaults['chunk']['build-mode']
@@ -709,8 +709,8 @@ class MorphologyLoader(object):
 
     def _unset_stratum_defaults(self, morph):
         for spec in morph['chunks']:
-            if 'repo' in spec and spec['repo'] == spec['name']:
-                del spec['repo']
+            if 'name' in spec and spec['name'] == spec['repo']:
+                del spec['name']
             if 'build-mode' in spec and spec['build-mode'] == \
                     self._static_defaults['chunk']['build-mode']:
                 del spec['build-mode']
diff --git a/morphlib/morphloader_tests.py b/morphlib/morphloader_tests.py
index 36e94a1a..8039dfc9 100644
--- a/morphlib/morphloader_tests.py
+++ b/morphlib/morphloader_tests.py
@@ -666,7 +666,7 @@ build-system: manual
             'name': 'foo',
             'chunks': [
                 {
-                    'name': 'bar',
+                    'repo': 'bar',
                     "ref": "bar",
                     'build-mode': 'staging',
                     'build-depends': [],
@@ -769,14 +769,14 @@ build-system: manual
                          [{'morph': 'foo'},
                           {'morph': 'bar'}])
 
-    def test_sets_stratum_chunks_repo_from_name(self):
+    def test_sets_stratum_chunks_name_from_repo(self):
         m = morphlib.morphology.Morphology(
             {
                 "name": "foo",
                 "kind": "stratum",
                 "chunks": [
                     {
-                        "name": "le-chunk",
+                        "repo": "le-chunk",
                         "ref": "ref",
                         "build-system": "manual",
                         "build-depends": [],
@@ -786,9 +786,9 @@ build-system: manual
 
         self.loader.set_defaults(m)
         self.loader.validate(m)
-        self.assertEqual(m['chunks'][0]['repo'], 'le-chunk')
+        self.assertEqual(m['chunks'][0]['name'], 'le-chunk')
 
-    def test_collapses_stratum_chunks_repo_from_name(self):
+    def test_collapses_stratum_chunks_name_from_repo(self):
         m = morphlib.morphology.Morphology(
             {
                 "name": "foo",
@@ -806,7 +806,7 @@ build-system: manual
             })
 
         self.loader.unset_defaults(m)
-        self.assertTrue('repo' not in m['chunks'][0])
+        self.assertTrue('name' not in m['chunks'][0])
 
     def test_convertes_max_jobs_to_an_integer(self):
         m = morphlib.morphology.Morphology(
-- 
cgit v1.2.1