Merge pull request #435 from bmjen/rel-141

Release 1.4.1

CHANGELOG.md

@@ -4,6 +4,13 @@ All changes to this repo will be documented in this file.
 See the [release notes](https://puppet.com/docs/pdk/latest/release_notes.html) for a high-level summary.
 
 
+## [v1.4.1](https://github.com/puppetlabs/pdk/tree/v1.4.1) (2018-02-22)
+[Full Changelog](https://github.com/puppetlabs/pdk/compare/v1.4.0...v1.4.1)
+
+**Fixed bugs:**
+
+- pdk update and convert fixes [\#433](https://github.com/puppetlabs/pdk/pull/433) ([bmjen](https://github.com/bmjen))
+
 ## [v1.4.0](https://github.com/puppetlabs/pdk/tree/v1.4.0) (2018-02-21)
 [Full Changelog](https://github.com/puppetlabs/pdk/compare/v1.3.2...v1.4.0)
 
@@ -28,6 +35,7 @@ See the [release notes](https://puppet.com/docs/pdk/latest/release_notes.html) f
 
 **Merged pull requests:**
 
+- Release 1.4.0 [\#432](https://github.com/puppetlabs/pdk/pull/432) ([bmjen](https://github.com/bmjen))
 - \(PDK-808\) Fix to pdk update when there are sync.yml changes [\#431](https://github.com/puppetlabs/pdk/pull/431) ([bmjen](https://github.com/bmjen))
 - \(PDK-806\) Update metadata interview text if metadata.json already exists [\#429](https://github.com/puppetlabs/pdk/pull/429) ([rodjek](https://github.com/rodjek))
 - \(FIXUP\) Make `pdk build` overwrite prompt consistent [\#427](https://github.com/puppetlabs/pdk/pull/427) ([scotje](https://github.com/scotje))

lib/pdk/version.rb

@@ -1,4 +1,4 @@
 module PDK
-  VERSION = '1.4.0'.freeze
+  VERSION = '1.4.1'.freeze
   TEMPLATE_REF = VERSION
 end

locales/pdk.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: puppet development kit v1.3.2-69-g30c8e60\n"
+"Project-Id-Version: puppet development kit v1.4.0-4-g1fdbdb1\n"
 "\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2018-02-21 11:30-0700\n"
-"PO-Revision-Date: 2018-02-21 11:30-0700\n"
+"POT-Creation-Date: 2018-02-22 14:11-0700\n"
+"PO-Revision-Date: 2018-02-22 14:11-0700\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "Language: \n"
@@ -738,15 +738,15 @@ msgstr ""
 msgid "Symlinks in modules are not supported and will not be included in the package. Please investigate symlink %{from} -> %{to}."
 msgstr ""
 
-#: ../lib/pdk/module/convert.rb:23
+#: ../lib/pdk/module/convert.rb:23 ../lib/pdk/module/update.rb:17
 msgid "No changes required."
 msgstr ""
 
 #: ../lib/pdk/module/convert.rb:34
 msgid "Module conversion is a potentially destructive action. Ensure that you have committed your module to a version control system or have a backup, and review the changes above before continuing."
 msgstr ""
 
-#: ../lib/pdk/module/convert.rb:39 ../lib/pdk/module/update.rb:26
+#: ../lib/pdk/module/convert.rb:39 ../lib/pdk/module/update.rb:30
 msgid "Do you want to continue and make these changes to your module?"
 msgstr ""
 
@@ -758,20 +758,20 @@ msgstr ""
 msgid "Unable to update module metadata; %{path} exists but it is not a file."
 msgstr ""
 
-#: ../lib/pdk/module/convert.rb:154 ../lib/pdk/module/convert.rb:159 ../lib/pdk/module/convert.rb:163
+#: ../lib/pdk/module/convert.rb:158 ../lib/pdk/module/convert.rb:163 ../lib/pdk/module/convert.rb:167
 msgid ""
 "\n"
 "%{banner}"
 msgstr ""
 
-#: ../lib/pdk/module/convert.rb:165
+#: ../lib/pdk/module/convert.rb:169
 msgid ""
 "\n"
 "%{summary}\n"
 "\n"
 msgstr ""
 
-#: ../lib/pdk/module/convert.rb:175
+#: ../lib/pdk/module/convert.rb:179
 msgid ""
 "\n"
 "You can find a report of differences in %{path}.\n"
@@ -848,15 +848,15 @@ msgstr ""
 msgid "'%{file}' is not a valid YAML file: %{message}"
 msgstr ""
 
-#: ../lib/pdk/module/update.rb:17
+#: ../lib/pdk/module/update.rb:13
 msgid "This module is already up to date with version %{version} of the template."
 msgstr ""
 
-#: ../lib/pdk/module/update.rb:92
+#: ../lib/pdk/module/update.rb:96
 msgid "Updating %{module_name} using the default template, from %{current_version} to %{new_version}"
 msgstr ""
 
-#: ../lib/pdk/module/update.rb:94
+#: ../lib/pdk/module/update.rb:98
 msgid "Updating %{module_name} using the template at %{template_url}, from %{current_version} to %{new_version}"
 msgstr ""