Skip to content

Commit

Permalink
Rubocop fixes and i18n update
Browse files Browse the repository at this point in the history
  • Loading branch information
@eimlav
eimlav committed Sep 20, 2018
1 parent 8f4da7c commit 7f1348e
Show file tree
Hide file tree
Showing 7 changed files with 82 additions and 208 deletions.
30 changes: 16 additions & 14 deletions lib/puppet/provider/apt_key/apt_key.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def self.instances
end
key_array.compact!
end

def self.prefetch(resources)
apt_keys = instances
resources.each_key do |name|
Expand Down Expand Up @@ -181,27 +181,29 @@ def tempfile(content)

# Update a key if it is expired
def update_expired_key
# Return without doing anything if expired is false
return unless (resource[:refresh] == true && resource[:expired] == true)
# Return without doing anything if refresh or expired is false
return unless resource[:refresh] == true && resource[:expired] == true

# Execute command to update key
command = []
if resource[:source].nil? && resource[:content].nil?
# Breaking up the command like this is needed because it blows up
# if --recv-keys isn't the last argument.
command.push('adv', '--keyserver', resource[:server])
unless resource[:options].nil?
command.push('--keyserver-options', resource[:options])
end
command.push('--recv-keys', resource[:id])
else

unless resource[:source].nil? && resource[:content].nil?
raise(_('an unexpected condition occurred while trying to add the key: %{_resource}') % { _resource: resource[:id] })
end

# Breaking up the command like this is needed because it blows up
# if --recv-keys isn't the last argument.
command.push('adv', '--keyserver', resource[:server])
unless resource[:options].nil?
command.push('--keyserver-options', resource[:options])
end
command.push('--recv-keys', resource[:id])
end

def exists?
update_expired_key()
update_expired_key
# report expired keys as non-existing when refresh => true
@property_hash[:ensure] == :present && !(resource[:refresh] && @property_hash[:expired])
@property_hash[:ensure] == :present && !(resource[:refresh] && @property_hash[:expired])
end

def create
Expand Down
4 changes: 2 additions & 2 deletions lib/puppet/type/apt_key.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

validate do
if self[:refresh] == true && self[:ensure] == :absent
fail('ensure => absent and refresh => true are mutually exclusive')
raise(_('ensure => absent and refresh => true are mutually exclusive'))
end
if self[:content] && self[:source]
raise(_('The properties content and source are mutually exclusive.'))
Expand Down Expand Up @@ -75,7 +75,7 @@
desc 'Additional options to pass to apt-key\'s --keyserver-options.'
end

newparam(:refresh, :boolean => true, :parent => Puppet::Parameter::Boolean) do
newparam(:refresh, boolean: true, parent: Puppet::Parameter::Boolean) do
desc 'When true, recreate an existing expired key'
end

Expand Down
194 changes: 36 additions & 158 deletions locales/puppetlabs-apt.pot
View file
Original file line number Diff line number Diff line change
@@ -1,132 +1,49 @@
# #-#-#-#-# accounts.pot (PACKAGE VERSION) #-#-#-#-#
# #-#-#-#-# accounts.pot (PACKAGE VERSION) #-#-#-#-#
# #-#-#-#-# puppetlabs-apt.pot (puppetlabs-apt 6.0.0-9-g1d5c598) #-#-#-#-#
# SOME DESCRIPTIVE TITLE.
# Copyright (C) 2018 Puppet, Inc.
# This file is distributed under the same license as the puppetlabs-apt package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
#
# #-#-#-#-# puppetlabs-apt.pot (PACKAGE VERSION) #-#-#-#-#
# #-#-#-#-# puppetlabs-apt_metadata.pot (PACKAGE VERSION) #-#-#-#-#
#
# #-#-#-#-# puppetlabs-apt.pot (puppetlabs-apt 6.0.0-9-g1d5c598) #-#-#-#-#
# SOME DESCRIPTIVE TITLE.
# Copyright (C) 2018 Puppet, Inc.
# This file is distributed under the same license as the puppetlabs-apt package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
#
# #-#-#-#-# puppetlabs-apt_metadata.pot (PACKAGE VERSION) #-#-#-#-#
#
# #-#-#-#-# puppetlabs-apt.pot (puppetlabs-apt 6.0.0-9-g1d5c598) #-#-#-#-#
# SOME DESCRIPTIVE TITLE.
# Copyright (C) 2018 Puppet, Inc.
# This file is distributed under the same license as the puppetlabs-apt package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
#
# #-#-#-#-# puppetlabs-apt_metadata.pot (PACKAGE VERSION) #-#-#-#-#
#
#, fuzzy
msgid ""
msgstr ""
"#-#-#-#-# accounts.pot (PACKAGE VERSION) #-#-#-#-#\n"
"#-#-#-#-# accounts.pot (PACKAGE VERSION) #-#-#-#-#\n"
"#-#-#-#-# puppet.pot (PACKAGE VERSION) #-#-#-#-#\n"
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-30 14:54:05 +0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 2.0.0\n"
"#-#-#-#-# puppetlabs-apt.pot (puppetlabs-apt 6.0.0-9-g1d5c598) #-#-#-#-#\n"
"Project-Id-Version: puppetlabs-apt 6.0.0-9-g1d5c598\n"
"\n"
"Report-Msgid-Bugs-To: docs@puppet.com\n"
"POT-Creation-Date: 2018-08-30 14:48+0100\n"
"PO-Revision-Date: 2018-08-30 14:48+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
"#-#-#-#-# puppetlabs-apt_metadata.pot (PACKAGE VERSION) #-#-#-#-#\n"
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To:\n"
"POT-Creation-Date: 2018-08-30T14:54:45+01:00\n"
"POT-Creation-Date: 2018-09-20 10:58:13 +0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 2.0.0\n"
"#-#-#-#-# puppetlabs-apt.pot (PACKAGE VERSION) #-#-#-#-#\n"
"#-#-#-#-# puppet.pot (PACKAGE VERSION) #-#-#-#-#\n"
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-30 14:54:05 +0100\n"
"POT-Creation-Date: 2018-09-20 10:58:13 +0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 2.0.0\n"
"#-#-#-#-# puppetlabs-apt.pot (puppetlabs-apt 6.0.0-9-g1d5c598) #-#-#-#-#\n"
"Project-Id-Version: puppetlabs-apt 6.0.0-9-g1d5c598\n"
"\n"
"Report-Msgid-Bugs-To: docs@puppet.com\n"
"POT-Creation-Date: 2018-08-30 14:48+0100\n"
"PO-Revision-Date: 2018-08-30 14:48+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
"#-#-#-#-# puppetlabs-apt_metadata.pot (PACKAGE VERSION) #-#-#-#-#\n"
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To:\n"
"POT-Creation-Date: 2018-08-30T14:54:45+01:00\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 2.0.0\n"
"#-#-#-#-# puppet.pot (PACKAGE VERSION) #-#-#-#-#\n"
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-30 16:09:57 +0100\n"
"POT-Creation-Date: 2018-09-20T10:56:25+01:00\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 2.0.0\n"
"#-#-#-#-# puppetlabs-apt.pot (puppetlabs-apt 6.0.0-9-g1d5c598) #-#-#-#-#\n"
"Project-Id-Version: puppetlabs-apt 6.0.0-9-g1d5c598\n"
"\n"
"Report-Msgid-Bugs-To: docs@puppet.com\n"
"POT-Creation-Date: 2018-08-30 16:09+0100\n"
"PO-Revision-Date: 2018-08-30 16:09+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
"#-#-#-#-# puppetlabs-apt_metadata.pot (PACKAGE VERSION) #-#-#-#-#\n"
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To:\n"
"POT-Creation-Date: 2018-08-30T14:54:45+01:00\n"
"POT-Creation-Date: 2018-09-20T10:56:25+01:00\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand All @@ -135,132 +52,93 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 2.0.0\n"

#. ./manifests/backports.pp:36
#. ./manifests/backports.pp:69
msgid ""
"If not on Debian or Ubuntu, you must explicitly pass location, release, "
"repos, and key"
msgstr ""

#. ./manifests/backports.pp:50
#. ./manifests/backports.pp:95
msgid "pin must be either a string, number or hash"
msgstr ""

#. ./manifests/conf.pp:11
#. ./manifests/conf.pp:25
msgid "Need to pass in content parameter"
msgstr ""

#. ./manifests/init.pp:37 - ./manifests/params.pp:5
#. ./manifests/key.pp:46
msgid "key with id %{_id} already ensured as absent"
msgstr ""

#. ./manifests/key.pp:89
msgid "key with id %{_id} already ensured as present"
msgstr ""

#. ./manifests/key.pp:105
msgid "Invalid 'ensure' value '%{_ensure}' for apt::key"
msgstr ""

#. ./manifests/params.pp:8 ./manifests/init.pp:143
msgid "This module only works on Debian or derivatives like Ubuntu"
msgstr ""

#. ./manifests/params.pp:97
msgid "Unable to determine value for fact os['name']"
#. ./manifests/params.pp:100
msgid "Unable to determine value for fact os[\"name\"]"
msgstr ""

#. ./manifests/pin.pp:52
#. ./manifests/pin.pp:84
msgid "parameters release, origin, and version are mutually exclusive"
msgstr ""

#. ./manifests/pin.pp:56
#. ./manifests/pin.pp:88
msgid "parameter version cannot be used in general form"
msgstr ""

#. ./manifests/pin.pp:59
#. ./manifests/pin.pp:91
msgid "parameters release and origin are mutually exclusive"
msgstr ""

#. ./manifests/ppa.pp:10 - ./manifests/source.pp:25
#. ./manifests/ppa.pp:30 ./manifests/source.pp:79
msgid "lsbdistcodename fact not available: release parameter required"
msgstr ""

#. ./manifests/ppa.pp:14
#. ./manifests/ppa.pp:34
msgid "apt::ppa is not currently supported on Debian."
msgstr ""

#. ./manifests/setting.pp:11
#. ./manifests/setting.pp:31
msgid "apt::setting cannot have both content and source"
msgstr ""

#. ./manifests/setting.pp:15
#. ./manifests/setting.pp:35
msgid "apt::setting needs either of content or source"
msgstr ""

#. ./manifests/setting.pp:23
#. ./manifests/setting.pp:43
msgid ""
"apt::setting resource name/title must start with either 'conf-', 'pref-' or "
"'list-'"
msgstr ""

#. ./manifests/setting.pp:29
#. ./manifests/setting.pp:49
msgid "apt::setting priority must be an integer or a zero-padded integer"
msgstr ""

#. ./manifests/source.pp:33
#. ./manifests/source.pp:87
msgid "cannot create a source entry without specifying a location"
msgstr ""

#. ./manifests/source.pp:47
#. ./manifests/source.pp:101
msgid "key hash must contain at least an id entry"
msgstr ""

#. ./manifests/source.pp:86
#. ./manifests/source.pp:140
msgid "Received invalid value for pin parameter"
msgstr ""

#: ../lib/puppet/provider/apt_key/apt_key.rb:122
msgid "The file %{_value} does not exist"
msgstr ""

#: ../lib/puppet/provider/apt_key/apt_key.rb:218
msgid "This is a read-only property."
msgstr ""

#: ../lib/puppet/type/apt_key.rb:23
msgid "The properties content and source are mutually exclusive."
msgstr ""

#. metadata.json
#: .summary
msgid ""
"Provides an interface for managing Apt source, key, and definitions with "
"Puppet"
msgstr ""

#. ./manifests/params.pp:97
msgid "Unable to determine value for fact os[\"name\"]"
msgstr ""

#. ./manifests/key.pp:29
msgid "key with id %{_id} already ensured as absent"
msgstr ""

#. ./manifests/key.pp:62
msgid "key with id %{_id} already ensured as present"
msgstr ""

#. ./manifests/key.pp:78
msgid "Invalid 'ensure' value '%{_ensure}' for apt::key"
msgstr ""

#: ../lib/puppet/provider/apt_key/apt_key.rb:142
msgid "%{_e} for %{_resource}"
msgstr ""

#: ../lib/puppet/provider/apt_key/apt_key.rb:144
msgid "could not resolve %{_resource}"
msgstr ""

#: ../lib/puppet/provider/apt_key/apt_key.rb:171
msgid ""
"The id in your manifest %{_resource} and the fingerprint from content/source "
"don't match. Check for an error in the id and content/source is legitimate."
msgstr ""

#: ../lib/puppet/provider/apt_key/apt_key.rb:202
msgid ""
"an unexpected condition occurred while trying to add the key: %{_resource}"
msgstr ""

#: ../lib/puppet/type/apt_key.rb:26
msgid "The id should be a full fingerprint (40 characters), see README."
msgstr ""
9 changes: 0 additions & 9 deletions manifests/key.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,6 @@
options => $options,
} -> anchor { "apt_key ${id} present": }

/* if $ensure == 'refreshed' {
notify { "Executing update of key ${id}": }
exec { "apt-key ${id}":
path => '/bin:/usr/bin',
unless => "apt-key list | grep '${id}' | grep expired",
command => "apt-key adv --keyserver ${server} --recv-keys ${id}",
}
}
*/
case $facts['os']['name'] {
'Debian': {
if versioncmp($facts['os']['release']['major'], '9') >= 0 {
Expand Down
Loading

0 comments on commit 7f1348e

Please sign in to comment.