r10k 3.6.0 → 3.9.2

data/lib/r10k/settings.rb

@@ -12,6 +12,8 @@ module R10K
     class << self
       # Path to puppet executable
       attr_accessor :puppet_path
+      # Path to puppet.conf
+      attr_accessor :puppet_conf
     end
 
     def self.git_settings
@@ -35,6 +37,11 @@ module R10K
                     Only used by the 'rugged' Git provider.",
         }),
 
+        Definition.new(:oauth_token, {
+          :desc => "The path to a token file for Git OAuth remotes.
+                    Only used by the 'rugged' Git provider."
+        }),
+
         URIDefinition.new(:proxy, {
           :desc => "An optional proxy server to use when interacting with Git sources via HTTP(S).",
           :default => :inherit,
@@ -52,11 +59,17 @@ module R10K
               :default => :inherit,
             }),
 
+            Definition.new(:oauth_token, {
+              :desc => "The path to a token file for Git OAuth remotes.
+                        Only used by the 'rugged' Git provider.",
+              :default => :inherit
+            }),
+
             URIDefinition.new(:proxy, {
               :desc => "An optional proxy server to use when interacting with Git sources via HTTP(S).",
               :default => :inherit,
             }),
-            
+
             Definition.new(:ignore_branch_prefixes, {
               :desc => "Array of strings used to prefix branch names that will not be deployed as environments.",
             }),
@@ -109,11 +122,16 @@ module R10K
           end,
         }),
 
-        Definition.new(:purge_whitelist, {
+        Definition.new(:purge_allowlist, {
           :desc => "A list of filename patterns to be excluded from any purge operations. Patterns are matched relative to the root of each deployed environment, if you want a pattern to match recursively you need to use the '**' glob in your pattern. Basic shell style globs are supported.",
           :default => [],
         }),
 
+        Definition.new(:purge_whitelist, {
+          :desc => "Deprecated; please use purge_allowlist instead. This setting will be removed in a future version.",
+          :default => [],
+        }),
+
         Definition.new(:generate_types, {
           :desc => "Controls whether to generate puppet types after deploying an environment. Defaults to false.",
           :default => false,
@@ -131,6 +149,15 @@ module R10K
             end
           end
         }),
+        Definition.new(:puppet_conf, {
+          :desc => "Path to puppet.conf. Defaults to /etc/puppetlabs/puppet/puppet.conf.",
+          :default => '/etc/puppetlabs/puppet/puppet.conf',
+          :validate => lambda do |value|
+            unless File.readable? value
+              raise ArgumentError, "The specified puppet.conf #{value} is not readable"
+            end
+          end
+        }),
       ])
     end
 

data/lib/r10k/source/base.rb

@@ -1,8 +1,12 @@
+require 'r10k/logging'
+
 # This class defines a common interface for source implementations.
 #
 # @since 1.3.0
 class R10K::Source::Base
 
+  include R10K::Logging
+
   # @!attribute [r] basedir
   #   @return [String] The path this source will place environments in
   attr_reader :basedir
@@ -31,10 +35,15 @@ class R10K::Source::Base
   # @option options [Boolean, String] :prefix If a String this becomes the prefix.
   #   If true, will use the source name as the prefix. All sources should respect this option.
   #   Defaults to false for no environment prefix.
+  # @option options [String] :strip_component If a string, this value will be
+  #   removed from the beginning of each generated environment's name, if
+  #   present. If the string is contained within two "/" characters, it will
+  #   be treated as a regular expression.
   def initialize(name, basedir, options = {})
     @name    = name
     @basedir = Pathname.new(basedir).cleanpath.to_s
     @prefix  = options.delete(:prefix)
+    @strip_component = options.delete(:strip_component)
     @puppetfile_name = options.delete(:puppetfile_name)
     @options = options
   end

data/lib/r10k/source/git.rb

@@ -11,8 +11,6 @@ require 'r10k/environment/name'
 # @since 1.3.0
 class R10K::Source::Git < R10K::Source::Base
 
-  include R10K::Logging
-
   R10K::Source.register(:git, self)
   # Register git as the default source
   R10K::Source.register(nil, self)
@@ -99,12 +97,22 @@ class R10K::Source::Git < R10K::Source::Base
     envs = []
     branch_names.each do |bn|
       if bn.valid?
-        envs << R10K::Environment::Git.new(bn.name, @basedir, bn.dirname,
-                                       {:remote => remote, :ref => bn.name, :puppetfile_name => puppetfile_name })
+        envs << R10K::Environment::Git.new(bn.name,
+                                           @basedir,
+                                           bn.dirname,
+                                           {remote: remote,
+                                            ref: bn.name,
+                                            puppetfile_name: puppetfile_name,
+                                            overrides: @options[:overrides]})
       elsif bn.correct?
        logger.warn _("Environment %{env_name} contained non-word characters, correcting name to %{corrected_env_name}") % {env_name: bn.name.inspect, corrected_env_name: bn.dirname}
-        envs << R10K::Environment::Git.new(bn.name, @basedir, bn.dirname,
-                                       {:remote => remote, :ref => bn.name, :puppetfile_name => puppetfile_name})
+        envs << R10K::Environment::Git.new(bn.name,
+                                           @basedir,
+                                           bn.dirname,
+                                           {remote: remote,
+                                            ref: bn.name,
+                                            puppetfile_name: puppetfile_name,
+                                            overrides: @options[:overrides]})
       elsif bn.validate?
        logger.error _("Environment %{env_name} contained non-word characters, ignoring it.") % {env_name: bn.name.inspect}
       end
@@ -145,7 +153,10 @@ class R10K::Source::Git < R10K::Source::Base
   private
 
   def branch_names
-    opts = {:prefix => @prefix, :invalid => @invalid_branches, :source => @name}
+    opts = {prefix: @prefix,
+            invalid: @invalid_branches,
+            source: @name,
+            strip_component: @strip_component}
     branches = @cache.branches
     if @ignore_branch_prefixes && !@ignore_branch_prefixes.empty?
       branches = filter_branches_by_regexp(branches, @ignore_branch_prefixes)

data/lib/r10k/source/hash.rb

@@ -120,8 +120,6 @@
 #
 class R10K::Source::Hash < R10K::Source::Base
 
-  include R10K::Logging
-
   # @param hash [Hash] A hash to validate.
   # @return [Boolean] False if the hash is obviously invalid. A true return
   #   means _maybe_ it's valid.
@@ -152,8 +150,10 @@ class R10K::Source::Hash < R10K::Source::Base
       R10K::Util::SymbolizeKeys.symbolize_keys!(opts)
       memo.merge({ 
         name => opts.merge({
-          :basedir => @basedir,
-          :dirname => R10K::Environment::Name.new(name, {prefix: @prefix, source: @name}).dirname
+          basedir: @basedir,
+          dirname: R10K::Environment::Name.new(name, {prefix: @prefix,
+                                                      source: @name,
+                                                      strip_component: @strip_component}).dirname
         })
       })
     end
@@ -168,7 +168,7 @@ class R10K::Source::Hash < R10K::Source::Base
 
   def environments
     @environments ||= environments_hash.map do |name, hash|
-      R10K::Environment.from_hash(name, hash)
+      R10K::Environment.from_hash(name, hash.merge({overrides: @options[:overrides]}))
     end
   end
 

data/lib/r10k/source/svn.rb

@@ -103,8 +103,6 @@ class R10K::Source::SVN < R10K::Source::Base
     @environments.map {|env| env.dirname }
   end
 
-  include R10K::Logging
-
   def filter_branches(branches, ignore_prefixes)
     filter = Regexp.new("^(#{ignore_prefixes.join('|')})")
     branches = branches.reject do |branch|
@@ -121,7 +119,11 @@ class R10K::Source::SVN < R10K::Source::Base
 
   def names_and_paths
     branches = []
-    opts = {:prefix => @prefix, :correct => false, :validate => false, :source => @name}
+    opts = {prefix: @prefix,
+            correct: false,
+            validate: false,
+            source: @name,
+            strip_component: @strip_component}
     branches << [R10K::Environment::Name.new('production', opts), "#{@remote}/trunk"]
     additional_branch_names = @svn_remote.branches
     if @ignore_branch_prefixes && !@ignore_branch_prefixes.empty?

data/lib/r10k/util/cleaner.rb

@@ -0,0 +1,21 @@
+require 'r10k/logging'
+require 'r10k/util/purgeable'
+
+module R10K
+  module Util
+    class Cleaner
+
+      include R10K::Logging
+      include R10K::Util::Purgeable
+
+      attr_reader :managed_directories, :desired_contents, :purge_exclusions
+
+      def initialize(managed_directories, desired_contents, purge_exclusions = [])
+        @managed_directories = managed_directories
+        @desired_contents    = desired_contents
+        @purge_exclusions    = purge_exclusions
+      end
+
+    end
+  end
+end

data/lib/r10k/util/setopts.rb

@@ -7,6 +7,10 @@ module R10K
     # supports Ruby 1.8.7+ we cannot use that functionality.
     module Setopts
 
+      class Ignore; end
+
+      include R10K::Logging
+
       private
 
       # @param opts [Hash]
@@ -31,22 +35,39 @@ module R10K
       #   setopts(opts, allowed)
       #   @trace # => nil
       #
-      def setopts(opts, allowed)
+      def setopts(opts, allowed, raise_on_unhandled: true)
+        processed_vars = {}
         opts.each_pair do |key, value|
           if allowed.key?(key)
-            rhs = allowed[key]
-            case rhs
-            when NilClass, FalseClass
-              # Ignore nil options
-            when :self, TrueClass
-              # tr here is because instance variables cannot have hyphens in their names.
-              instance_variable_set("@#{key}".tr('-','_').to_sym, value)
-            else
-              # tr here same as previous
-              instance_variable_set("@#{rhs}".tr('-','_').to_sym, value)
+            # Ignore nil options and explicit ignore param
+            next unless rhs = allowed[key]
+            next if rhs == ::R10K::Util::Setopts::Ignore
+
+            var = case rhs
+                  when :self, TrueClass
+                    # tr here is because instance variables cannot have hyphens in their names.
+                    "@#{key}".tr('-','_').to_sym
+                  else
+                    # tr here same as previous
+                    "@#{rhs}".tr('-','_').to_sym
+                  end
+
+            if processed_vars.include?(var)
+              # This should be a raise, but that would be a behavior change and
+              # should happen on a SemVer boundry.
+              logger.warn _("%{class_name} parameters '%{a}' and '%{b}' conflict. Specify one or the other, but not both" \
+                            % {class_name: self.class.name, a: processed_vars[var], b: key})
             end
+
+            instance_variable_set(var, value)
+            processed_vars[var] = key
           else
-            raise ArgumentError, _("%{class_name} cannot handle option '%{key}'") % {class_name: self.class.name, key: key}
+            err_str = _("%{class_name} cannot handle option '%{key}'") % {class_name: self.class.name, key: key}
+            if raise_on_unhandled
+              raise ArgumentError, err_str
+            else
+              logger.warn(err_str)
+            end
           end
         end
       end

data/lib/r10k/version.rb

@@ -2,5 +2,5 @@ module R10K
   # When updating to a new major (X) or minor (Y) version, include `#major` or
   # `#minor` (respectively) in your commit message to trigger the appropriate
   # release. Otherwise, a new patch (Z) version will be released.
-  VERSION = '3.6.0'
+  VERSION = '3.9.2'
 end

data/locales/r10k.pot

@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2020 Puppet, Inc.
+# Copyright (C) 2021 Puppet, Inc.
 # This file is distributed under the same license as the r10k package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: r10k 3.4.1-57-g2eb088a\n"
+"Project-Id-Version: r10k 3.4.1-231-g5574915\n"
 "\n"
 "Report-Msgid-Bugs-To: docs@puppetlabs.com\n"
-"POT-Creation-Date: 2020-07-22 16:41+0000\n"
-"PO-Revision-Date: 2020-07-22 16:41+0000\n"
+"POT-Creation-Date: 2021-05-10 23:18+0000\n"
+"PO-Revision-Date: 2021-05-10 23:18+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -31,68 +31,60 @@ msgstr ""
 msgid "Reason: %{write_lock}"
 msgstr ""
 
-#: ../lib/r10k/action/deploy/environment.rb:57
+#: ../lib/r10k/action/deploy/environment.rb:109
 msgid "Environment(s) \\'%{environments}\\' cannot be found in any source and will not be deployed."
 msgstr ""
 
-#: ../lib/r10k/action/deploy/environment.rb:85
+#: ../lib/r10k/action/deploy/environment.rb:139
 msgid "Environment %{env_dir} does not match environment name filter, skipping"
 msgstr ""
 
-#: ../lib/r10k/action/deploy/environment.rb:93
+#: ../lib/r10k/action/deploy/environment.rb:147
 msgid "Deploying environment %{env_path}"
 msgstr ""
 
-#: ../lib/r10k/action/deploy/environment.rb:96
+#: ../lib/r10k/action/deploy/environment.rb:150
 msgid "Environment %{env_dir} is now at %{env_signature}"
 msgstr ""
 
-#: ../lib/r10k/action/deploy/environment.rb:100
+#: ../lib/r10k/action/deploy/environment.rb:154
 msgid "Environment %{env_dir} is new, updating all modules"
 msgstr ""
 
-#: ../lib/r10k/action/deploy/environment.rb:143
-msgid "Deploying %{origin} content %{path}"
+#: ../lib/r10k/action/deploy/module.rb:78
+msgid "Only updating modules in environment(s) %{opt_env} skipping environment %{env_path}"
 msgstr ""
 
-#: ../lib/r10k/action/deploy/module.rb:49
-msgid "Only updating modules in environment %{opt_env} skipping environment %{env_path}"
-msgstr ""
-
-#: ../lib/r10k/action/deploy/module.rb:51
+#: ../lib/r10k/action/deploy/module.rb:80
 msgid "Updating modules %{modules} in environment %{env_path}"
 msgstr ""
 
-#: ../lib/r10k/action/deploy/module.rb:63
-msgid "Deploying module %{mod_path}"
-msgstr ""
-
-#: ../lib/r10k/action/deploy/module.rb:70
-msgid "Only updating modules %{modules}, skipping module %{mod_name}"
+#: ../lib/r10k/action/puppetfile/check.rb:16
+msgid "Syntax OK"
 msgstr ""
 
-#: ../lib/r10k/action/puppetfile/check.rb:14
-msgid "Syntax OK"
+#: ../lib/r10k/action/runner.rb:54 ../lib/r10k/deployment/config.rb:42
+msgid "Overriding config file setting '%{key}': '%{old_val}' -> '%{new_val}'"
 msgstr ""
 
-#: ../lib/r10k/action/puppetfile/install.rb:30
-msgid "Updating module %{mod_path}"
+#: ../lib/r10k/action/runner.rb:91
+msgid "Reading configuration from %{config_path}"
 msgstr ""
 
-#: ../lib/r10k/action/puppetfile/install.rb:33
-msgid "Cannot track control repo branch for content '%{name}' when not part of a 'deploy' action, will use default if available."
+#: ../lib/r10k/action/runner.rb:94
+msgid "No config file explicitly given and no default config file could be found, default settings will be used."
 msgstr ""
 
-#: ../lib/r10k/action/runner.rb:53 ../lib/r10k/deployment/config.rb:42
-msgid "Overriding config file setting '%{key}': '%{old_val}' -> '%{new_val}'"
+#: ../lib/r10k/content_synchronizer.rb:13
+msgid "Updating modules with %{pool_size} threads"
 msgstr ""
 
-#: ../lib/r10k/action/runner.rb:86
-msgid "Reading configuration from %{config_path}"
+#: ../lib/r10k/content_synchronizer.rb:24
+msgid "Error during concurrent deploy of a module: %{message}"
 msgstr ""
 
-#: ../lib/r10k/action/runner.rb:89
-msgid "No config file explicitly given and no default config file could be found, default settings will be used."
+#: ../lib/r10k/content_synchronizer.rb:52
+msgid "Module thread %{id} exiting: %{message}"
 msgstr ""
 
 #: ../lib/r10k/deployment.rb:90
@@ -103,16 +95,24 @@ msgstr ""
 msgid "Unable to load sources; the supplied configuration does not define the 'sources' key"
 msgstr ""
 
-#: ../lib/r10k/environment/base.rb:61 ../lib/r10k/environment/base.rb:77 ../lib/r10k/environment/base.rb:86 ../lib/r10k/source/base.rb:64
+#: ../lib/r10k/environment/base.rb:65 ../lib/r10k/environment/base.rb:81 ../lib/r10k/environment/base.rb:90 ../lib/r10k/source/base.rb:69
 msgid "%{class} has not implemented method %{method}"
 msgstr ""
 
-#: ../lib/r10k/environment/with_modules.rb:104
-msgid "Puppetfile cannot contain module names defined by environment %{name}"
+#: ../lib/r10k/environment/name.rb:78
+msgid "Improper configuration value given for strip_component setting in %{src} source. Value must be a string, a /regex/, false, or omitted. Got \"%{val}\" (%{type})"
 msgstr ""
 
-#: ../lib/r10k/environment/with_modules.rb:106
-msgid "Remove the conflicting definitions of the following modules: %{conflicts}"
+#: ../lib/r10k/environment/with_modules.rb:60
+msgid "Environment and %{src} both define the \"%{name}\" module"
+msgstr ""
+
+#: ../lib/r10k/environment/with_modules.rb:61
+msgid "#{msg_error}. The %{src} definition will be ignored"
+msgstr ""
+
+#: ../lib/r10k/environment/with_modules.rb:71
+msgid "Unexpected value for `module_conflicts` setting in %{env} environment: %{val}"
 msgstr ""
 
 #: ../lib/r10k/feature.rb:27
@@ -187,11 +187,11 @@ msgstr ""
 msgid "Cannot write %{file}; parent directory does not exist"
 msgstr ""
 
-#: ../lib/r10k/git/cache.rb:55
+#: ../lib/r10k/git/cache.rb:65
 msgid "%{class}#path is deprecated; use #git_dir"
 msgstr ""
 
-#: ../lib/r10k/git/cache.rb:84
+#: ../lib/r10k/git/cache.rb:94
 msgid "Creating new git cache for %{remote}"
 msgstr ""
 
@@ -227,15 +227,31 @@ msgstr ""
 msgid "Unable to use SSH key auth for %{url}: private key %{private_key} is missing or unreadable"
 msgstr ""
 
-#: ../lib/r10k/git/rugged/credentials.rb:80
+#: ../lib/r10k/git/rugged/credentials.rb:84
+msgid "Using OAuth token from stdin for URL %{url}"
+msgstr ""
+
+#: ../lib/r10k/git/rugged/credentials.rb:87
+msgid "Using OAuth token from %{token_path} for URL %{url}"
+msgstr ""
+
+#: ../lib/r10k/git/rugged/credentials.rb:89
+msgid "%{path} is missing or unreadable, cannot load OAuth token"
+msgstr ""
+
+#: ../lib/r10k/git/rugged/credentials.rb:93
+msgid "Supplied OAuth token contains invalid characters."
+msgstr ""
+
+#: ../lib/r10k/git/rugged/credentials.rb:117
 msgid "URL %{url} includes the username %{username}, using that user for authentication."
 msgstr ""
 
-#: ../lib/r10k/git/rugged/credentials.rb:83
+#: ../lib/r10k/git/rugged/credentials.rb:120
 msgid "URL %{url} did not specify a user, using %{user} from configuration"
 msgstr ""
 
-#: ../lib/r10k/git/rugged/credentials.rb:86
+#: ../lib/r10k/git/rugged/credentials.rb:123
 msgid "URL %{url} did not specify a user, using current user %{user}"
 msgstr ""
 
@@ -255,31 +271,31 @@ msgstr ""
 msgid "Found local modifications in %{file_path}"
 msgstr ""
 
-#: ../lib/r10k/git/stateful_repository.rb:40
+#: ../lib/r10k/git/stateful_repository.rb:44
 msgid "Unable to sync repo to unresolvable ref '%{ref}'"
 msgstr ""
 
-#: ../lib/r10k/git/stateful_repository.rb:47
+#: ../lib/r10k/git/stateful_repository.rb:51
 msgid "Cloning %{repo_path} and checking out %{ref}"
 msgstr ""
 
-#: ../lib/r10k/git/stateful_repository.rb:50
+#: ../lib/r10k/git/stateful_repository.rb:54
 msgid "Replacing %{repo_path} and checking out %{ref}"
 msgstr ""
 
-#: ../lib/r10k/git/stateful_repository.rb:54 ../lib/r10k/git/stateful_repository.rb:59
+#: ../lib/r10k/git/stateful_repository.rb:58 ../lib/r10k/git/stateful_repository.rb:63
 msgid "Updating %{repo_path} to %{ref}"
 msgstr ""
 
-#: ../lib/r10k/git/stateful_repository.rb:58
+#: ../lib/r10k/git/stateful_repository.rb:62
 msgid "Overwriting local modifications to %{repo_path}"
 msgstr ""
 
-#: ../lib/r10k/git/stateful_repository.rb:62
+#: ../lib/r10k/git/stateful_repository.rb:66
 msgid "Skipping %{repo_path} due to local modifications"
 msgstr ""
 
-#: ../lib/r10k/git/stateful_repository.rb:65
+#: ../lib/r10k/git/stateful_repository.rb:69
 msgid "%{repo_path} is already at Git ref %{ref}"
 msgstr ""
 
@@ -303,23 +319,31 @@ msgstr ""
 msgid "Module %{name} with args %{args} doesn't have an implementation. (Are you using the right arguments?)"
 msgstr ""
 
-#: ../lib/r10k/module/base.rb:110
+#: ../lib/r10k/module/base.rb:75
+msgid "Deploying module to %{path}"
+msgstr ""
+
+#: ../lib/r10k/module/base.rb:78
+msgid "Only updating modules %{modules}, skipping module %{name}"
+msgstr ""
+
+#: ../lib/r10k/module/base.rb:134
 msgid "Module name (%{title}) must match either 'modulename' or 'owner/modulename'"
 msgstr ""
 
-#: ../lib/r10k/module/forge.rb:70 ../lib/r10k/module/forge.rb:99
+#: ../lib/r10k/module/forge.rb:88 ../lib/r10k/module/forge.rb:117
 msgid "The module %{title} does not exist on %{url}."
 msgstr ""
 
-#: ../lib/r10k/module/forge.rb:174
-msgid "Forge module names must match 'owner/modulename'"
+#: ../lib/r10k/module/forge.rb:192
+msgid "Forge module names must match 'owner/modulename', instead got #{title}"
 msgstr ""
 
-#: ../lib/r10k/module/git.rb:97
-msgid "Unhandled options %{unhandled} specified for %{class}"
+#: ../lib/r10k/module/git.rb:66
+msgid "Cannot track control repo branch for content '%{name}' when not part of a git-backed environment, will use default if available."
 msgstr ""
 
-#: ../lib/r10k/module/local.rb:34
+#: ../lib/r10k/module/local.rb:35
 msgid "Module %{title} is a local module, always indicating synced."
 msgstr ""
 
@@ -327,39 +351,27 @@ msgstr ""
 msgid "Could not read metadata.json"
 msgstr ""
 
-#: ../lib/r10k/puppetfile.rb:57
+#: ../lib/r10k/puppetfile.rb:73
 msgid "Using Puppetfile '%{puppetfile}'"
 msgstr ""
 
-#: ../lib/r10k/puppetfile.rb:71
+#: ../lib/r10k/puppetfile.rb:87
 msgid "Puppetfile %{path} missing or unreadable"
 msgstr ""
 
-#: ../lib/r10k/puppetfile.rb:84
+#: ../lib/r10k/puppetfile.rb:100
 msgid "Failed to evaluate %{path}"
 msgstr ""
 
-#: ../lib/r10k/puppetfile.rb:98
+#: ../lib/r10k/puppetfile.rb:114
 msgid "Puppetfiles cannot contain duplicate module names."
 msgstr ""
 
-#: ../lib/r10k/puppetfile.rb:100
+#: ../lib/r10k/puppetfile.rb:116
 msgid "Remove the duplicates of the following modules: %{dupes}"
 msgstr ""
 
-#: ../lib/r10k/puppetfile.rb:192
-msgid "Updating modules with %{pool_size} threads"
-msgstr ""
-
-#: ../lib/r10k/puppetfile.rb:203
-msgid "Error during concurrent deploy of a module: %{message}"
-msgstr ""
-
-#: ../lib/r10k/puppetfile.rb:225
-msgid "Module thread %{id} exiting: %{message}"
-msgstr ""
-
-#: ../lib/r10k/puppetfile.rb:282
+#: ../lib/r10k/puppetfile.rb:276
 msgid "unrecognized declaration '%{method}'"
 msgstr ""
 
@@ -450,19 +462,19 @@ msgstr ""
 msgid "Unable to determine current branches for Git source '%{name}' (%{basedir})"
 msgstr ""
 
-#: ../lib/r10k/source/git.rb:105
+#: ../lib/r10k/source/git.rb:110
 msgid "Environment %{env_name} contained non-word characters, correcting name to %{corrected_env_name}"
 msgstr ""
 
-#: ../lib/r10k/source/git.rb:109
+#: ../lib/r10k/source/git.rb:119
 msgid "Environment %{env_name} contained non-word characters, ignoring it."
 msgstr ""
 
-#: ../lib/r10k/source/git.rb:128 ../lib/r10k/source/svn.rb:113
+#: ../lib/r10k/source/git.rb:138 ../lib/r10k/source/svn.rb:113
 msgid "Branch %{branch} filtered out by ignore_branch_prefixes %{ibp}"
 msgstr ""
 
-#: ../lib/r10k/source/git.rb:139
+#: ../lib/r10k/source/git.rb:149
 msgid "Branch `%{name}:%{branch}` filtered out by filter_command %{cmd}"
 msgstr ""
 
@@ -526,7 +538,11 @@ msgstr ""
 msgid "Unable to remove unmanaged path: %{path}"
 msgstr ""
 
-#: ../lib/r10k/util/setopts.rb:49
+#: ../lib/r10k/util/setopts.rb:58
+msgid "%{class_name} parameters '%{a}' and '%{b}' conflict. Specify one or the other, but not both"
+msgstr ""
+
+#: ../lib/r10k/util/setopts.rb:65
 msgid "%{class_name} cannot handle option '%{key}'"
 msgstr ""