From c71ab584e9562af23cf2a7600ecdde837dc9a918 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Tue, 14 Jul 2015 11:12:21 +0100
Subject: Migrations with ruamel.yaml after my first blank lines patch

Change-Id: I59f47b5c970dc415c96c7ad4cc943a0f11098ad2
---
 strata/chef/erubis-master.morph  | 4 ++--
 strata/chef/hoe-master.morph     | 1 -
 strata/chef/libyajl2-1.0.1.morph | 4 ++--
 strata/chef/plist-master.morph   | 1 -
 4 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'strata/chef')

diff --git a/strata/chef/erubis-master.morph b/strata/chef/erubis-master.morph
index f15e0968..05d1a9f9 100644
--- a/strata/chef/erubis-master.morph
+++ b/strata/chef/erubis-master.morph
@@ -1,4 +1,3 @@
----
 name: erubis-master
 kind: chunk
 build-system: manual
@@ -10,7 +9,8 @@ configure-commands:
 # Manually do what it seems like the 'rook' build system would do, if it worked
 # Values taken from 'Rookbook.props'.
 - find -type f -exec sed -e 's/\$Release\$/2.7.0/g' -i \{} \;
-- find -type f -exec sed -e 's/\$Copyright\$/copyright(c) 2006-2011 kuwata-lab.com all rights reserved./g' -i \{} \;
+- find -type f -exec sed -e 's/\$Copyright\$/copyright(c) 2006-2011 kuwata-lab.com
+  all rights reserved./g' -i \{} \;
 build-commands:
 - gem build erubis.gemspec
 install-commands:
diff --git a/strata/chef/hoe-master.morph b/strata/chef/hoe-master.morph
index 9fe7ff8e..1a468789 100644
--- a/strata/chef/hoe-master.morph
+++ b/strata/chef/hoe-master.morph
@@ -1,4 +1,3 @@
----
 name: hoe-master
 kind: chunk
 build-system: manual
diff --git a/strata/chef/libyajl2-1.0.1.morph b/strata/chef/libyajl2-1.0.1.morph
index d85d1567..7a21831d 100644
--- a/strata/chef/libyajl2-1.0.1.morph
+++ b/strata/chef/libyajl2-1.0.1.morph
@@ -9,5 +9,5 @@ build-commands:
 - USE_SYSTEM_LIBYAJL2=yes gem build libyajl2.gemspec
 install-commands:
 - mkdir -p "$DESTDIR/$(gem environment home)"
-- USE_SYSTEM_LIBYAJL2=yes gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin"
-  --ignore-dependencies --local ./libyajl2-1.0.1.gem
+- USE_SYSTEM_LIBYAJL2=yes gem install --install-dir "$DESTDIR/$(gem environment home)"
+  --bindir "$DESTDIR/$PREFIX/bin" --ignore-dependencies --local ./libyajl2-1.0.1.gem
diff --git a/strata/chef/plist-master.morph b/strata/chef/plist-master.morph
index bef39f7d..7cf7cbb6 100644
--- a/strata/chef/plist-master.morph
+++ b/strata/chef/plist-master.morph
@@ -1,4 +1,3 @@
----
 name: plist-master
 kind: chunk
 build-system: manual
-- 
cgit v1.2.1