diff options
| -rw-r--r-- | morphlib/morphset.py | 1 | ||||
| -rw-r--r-- | morphlib/morphset_tests.py | 8 | ||||
| -rw-r--r-- | tests.branching/edit-updates-stratum-build-depends.stdout | 16 | ||||
| -rw-r--r-- | tests.branching/edit-updates-stratum.stdout | 10 | ||||
| -rw-r--r-- | tests.branching/workflow.stdout | 1 |
5 files changed, 24 insertions, 12 deletions
diff --git a/morphlib/morphset.py b/morphlib/morphset.py index 7118b702..c256760e 100644 --- a/morphlib/morphset.py +++ b/morphlib/morphset.py @@ -138,6 +138,7 @@ class MorphologySet(object): def change_specs(specs, m): for spec in specs: if wanted_spec(spec): + spec['unpetrify-ref'] = spec['ref'] spec['ref'] = new_ref m.dirty = True diff --git a/morphlib/morphset_tests.py b/morphlib/morphset_tests.py index 7dbc861a..65fe2058 100644 --- a/morphlib/morphset_tests.py +++ b/morphlib/morphset_tests.py @@ -127,7 +127,8 @@ class MorphologySetTests(unittest.TestCase): { 'repo': 'test:morphs', 'ref': 'new-ref', - 'morph': 'foo-stratum' + 'morph': 'foo-stratum', + 'unpetrify-ref': 'master', }) def test_changes_stratum_ref_in_build_depends(self): @@ -140,6 +141,7 @@ class MorphologySetTests(unittest.TestCase): 'repo': self.stratum.repo_url, 'ref': self.stratum.ref, 'morph': self.stratum['name'], + 'unpetrify-ref': 'master', }, ] }) @@ -157,7 +159,8 @@ class MorphologySetTests(unittest.TestCase): { 'repo': 'test:morphs', 'ref': 'new-ref', - 'morph': 'foo-stratum' + 'morph': 'foo-stratum', + 'unpetrify-ref': 'master', }) def test_changes_chunk_ref(self): @@ -175,6 +178,7 @@ class MorphologySetTests(unittest.TestCase): 'repo': 'test:foo-chunk', 'ref': 'new-ref', 'morph': 'foo-chunk', + 'unpetrify-ref': 'master', } ]) diff --git a/tests.branching/edit-updates-stratum-build-depends.stdout b/tests.branching/edit-updates-stratum-build-depends.stdout index 00b303bd..1c6eb8e3 100644 --- a/tests.branching/edit-updates-stratum-build-depends.stdout +++ b/tests.branching/edit-updates-stratum-build-depends.stdout @@ -1,46 +1,50 @@ diff --git a/hello-stratum.morph b/hello-stratum.morph -index 73ed482..3731d63 100644 +index 73ed482..475fe0f 100644 --- a/hello-stratum.morph +++ b/hello-stratum.morph -@@ -2,7 +2,7 @@ chunks: +@@ -2,7 +2,8 @@ chunks: - build-depends: [] build-mode: test name: hello - ref: master + ref: newbranch repo: test:hello ++ unpetrify-ref: master kind: stratum name: hello-stratum diff --git a/hello-system.morph b/hello-system.morph -index 721473c..94c1837 100644 +index 721473c..1537f53 100644 --- a/hello-system.morph +++ b/hello-system.morph -@@ -3,9 +3,8 @@ kind: system +@@ -3,9 +3,9 @@ kind: system name: hello-system strata: - morph: hello-stratum - ref: master + ref: newbranch repo: test:morphs ++ unpetrify-ref: master - morph: xyzzy-stratum ref: master repo: test:morphs -system-kind: rootfs-tarball diff --git a/xyzzy-stratum.morph b/xyzzy-stratum.morph -index e302037..97f7208 100644 +index e302037..bcf5b57 100644 --- a/xyzzy-stratum.morph +++ b/xyzzy-stratum.morph -@@ -1,11 +1,11 @@ +@@ -1,11 +1,13 @@ build-depends: - morph: hello-stratum - ref: master + ref: newbranch repo: test:morphs ++ unpetrify-ref: master chunks: - build-depends: [] name: hello - ref: master + ref: newbranch repo: test:hello ++ unpetrify-ref: master kind: stratum name: xyzzy-stratum diff --git a/tests.branching/edit-updates-stratum.stdout b/tests.branching/edit-updates-stratum.stdout index e84dbe09..32eb820d 100644 --- a/tests.branching/edit-updates-stratum.stdout +++ b/tests.branching/edit-updates-stratum.stdout @@ -1,21 +1,22 @@ diff --git a/hello-stratum.morph b/hello-stratum.morph -index 73ed482..3731d63 100644 +index 73ed482..475fe0f 100644 --- a/hello-stratum.morph +++ b/hello-stratum.morph -@@ -2,7 +2,7 @@ chunks: +@@ -2,7 +2,8 @@ chunks: - build-depends: [] build-mode: test name: hello - ref: master + ref: newbranch repo: test:hello ++ unpetrify-ref: master kind: stratum name: hello-stratum diff --git a/hello-system.morph b/hello-system.morph -index b0fed3b..801a955 100644 +index b0fed3b..199c924 100644 --- a/hello-system.morph +++ b/hello-system.morph -@@ -3,6 +3,5 @@ kind: system +@@ -3,6 +3,6 @@ kind: system name: hello-system strata: - morph: hello-stratum @@ -23,3 +24,4 @@ index b0fed3b..801a955 100644 + ref: newbranch repo: test:morphs -system-kind: rootfs-tarball ++ unpetrify-ref: master diff --git a/tests.branching/workflow.stdout b/tests.branching/workflow.stdout new file mode 100644 index 00000000..65985486 --- /dev/null +++ b/tests.branching/workflow.stdout @@ -0,0 +1 @@ +WARNING: chunk "hello-system.hello-stratum.hello" is now petrified |