From: david22swan <david.swan@puppet.com>
Date: Thu, 23 Aug 2018 15:02:02 +0000 (+0100)
Subject: Merge branch 'master' into remove_ppa_source
X-Git-Tag: 6.0.0~2^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3daa01a35e2438a54205a4478625509a4b2e1354;p=puppet-modules%2Fpuppetlabs-apt.git

Merge branch 'master' into remove_ppa_source
---

3daa01a35e2438a54205a4478625509a4b2e1354
diff --cc manifests/ppa.pp
index 4ee08ba,740d596..99af219
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@@ -46,8 -57,8 +57,8 @@@ define apt::ppa
  
      exec { "add-apt-repository-${name}":
        environment => $_proxy_env,
 -      command     => "/usr/bin/add-apt-repository ${options} ${name}",
 +      command     => "/usr/bin/add-apt-repository ${options} ${name} || (rm ${::apt::sources_list_d}/${sources_list_d_filename} && false)",
-       unless      => "/usr/bin/test -f ${::apt::sources_list_d}/${sources_list_d_filename}",
+       unless      => "/usr/bin/test -f ${::apt::sources_list_d}/${sources_list_d_filename} && /usr/bin/test -f ${::apt::trusted_gpg_d}/${trusted_gpg_d_filename}",
        user        => 'root',
        logoutput   => 'on_failure',
        notify      => Class['apt::update'],
diff --cc spec/defines/ppa_spec.rb
index 984c3e8,4c4dddb..fa893b6
--- a/spec/defines/ppa_spec.rb
+++ b/spec/defines/ppa_spec.rb
@@@ -22,8 -22,8 +22,8 @@@ describe 'apt::ppa' d
      it { is_expected.not_to contain_package('python-software-properties') }
      it {
        is_expected.to contain_exec('add-apt-repository-ppa:needs/such.substitution/wow+type').that_notifies('Class[Apt::Update]').with(environment: [],
 -                                                                                                                                      command: '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow+type', # rubocop:disable Metrics/LineLength
 +                                                                                                                                      command: '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow+type || (rm /etc/apt/sources.list.d/needs-such_substitution-wow_type-trusty.list && false)', # rubocop:disable Metrics/LineLength
-                                                                                                                                       unless: '/usr/bin/test -f /etc/apt/sources.list.d/needs-such_substitution-wow_type-trusty.list', # rubocop:disable Metrics/LineLength
+                                                                                                                                       unless: '/usr/bin/test -f /etc/apt/sources.list.d/needs-such_substitution-wow_type-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/needs-such_substitution-wow_type.gpg', # rubocop:disable Metrics/LineLength
                                                                                                                                        user: 'root',
                                                                                                                                        logoutput: 'on_failure')
      }
@@@ -46,8 -46,8 +46,8 @@@
  
      it {
        is_expected.to contain_exec('add-apt-repository-ppa:user/foo').that_notifies('Class[Apt::Update]').with(environment: [],
 -                                                                                                              command: '/usr/bin/add-apt-repository -y ppa:user/foo',
 +                                                                                                              command: '/usr/bin/add-apt-repository -y ppa:user/foo || (rm /etc/apt/sources.list.d/user-ubuntu-foo-wily.list && false)', # rubocop:disable Metrics/LineLength
-                                                                                                               unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-ubuntu-foo-wily.list',
+                                                                                                               unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-ubuntu-foo-wily.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/user_ubuntu_foo.gpg', # rubocop:disable Metrics/LineLength
                                                                                                                user: 'root',
                                                                                                                logoutput: 'on_failure')
      }
@@@ -80,8 -80,8 +80,8 @@@
      it { is_expected.to contain_package('software-properties-common') }
      it {
        is_expected.to contain_exec('add-apt-repository-ppa:needs/such.substitution/wow').that_notifies('Class[Apt::Update]').with('environment' => [],
 -                                                                                                                                 'command'     => '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow', # rubocop:disable Metrics/LineLength
 +                                                                                                                                 'command'     => '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow || (rm /etc/apt/sources.list.d/needs-such_substitution-wow-trusty.list && false)', # rubocop:disable Metrics/LineLength
-                                                                                                                                  'unless'      => '/usr/bin/test -f /etc/apt/sources.list.d/needs-such_substitution-wow-trusty.list', # rubocop:disable Metrics/LineLength
+                                                                                                                                  'unless'      => '/usr/bin/test -f /etc/apt/sources.list.d/needs-such_substitution-wow-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/needs-such_substitution-wow.gpg', # rubocop:disable Metrics/LineLength
                                                                                                                                   'user'        => 'root',
                                                                                                                                   'logoutput'   => 'on_failure')
      }
@@@ -117,8 -117,8 +117,8 @@@
      it { is_expected.not_to contain_package('python-software-properties') }
      it {
        is_expected.to contain_exec('add-apt-repository-ppa:needs/such.substitution/wow').that_notifies('Class[Apt::Update]').with('environment' => [],
 -                                                                                                                                 'command'     => '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow', # rubocop:disable Metrics/LineLength
 +                                                                                                                                 'command'     => '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow || (rm /etc/apt/sources.list.d/needs-such_substitution-wow-trusty.list && false)', # rubocop:disable Metrics/LineLength
-                                                                                                                                  'unless'      => '/usr/bin/test -f /etc/apt/sources.list.d/needs-such_substitution-wow-trusty.list', # rubocop:disable Metrics/LineLength
+                                                                                                                                  'unless'      => '/usr/bin/test -f /etc/apt/sources.list.d/needs-such_substitution-wow-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/needs-such_substitution-wow.gpg', # rubocop:disable Metrics/LineLength
                                                                                                                                   'user'        => 'root',
                                                                                                                                   'logoutput'   => 'on_failure')
      }
@@@ -158,8 -158,8 +158,8 @@@
      it { is_expected.to contain_package('software-properties-common') }
      it {
        is_expected.to contain_exec('add-apt-repository-ppa:user/foo').that_notifies('Class[Apt::Update]').with(environment: [],
 -                                                                                                              command: '/usr/bin/add-apt-repository  ppa:user/foo',
 +                                                                                                              command: '/usr/bin/add-apt-repository  ppa:user/foo || (rm /etc/apt/sources.list.d/user-foo-trusty.list && false)', # rubocop:disable Metrics/LineLength
-                                                                                                               unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-foo-trusty.list',
+                                                                                                               unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-foo-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/user-foo.gpg', # rubocop:disable Metrics/LineLength
                                                                                                                user: 'root',
                                                                                                                logoutput: 'on_failure')
      }
@@@ -193,8 -193,8 +193,8 @@@
      it { is_expected.to contain_package('software-properties-common') }
      it {
        is_expected.to contain_exec('add-apt-repository-ppa:user/foo').that_notifies('Class[Apt::Update]').with(environment: ['http_proxy=http://localhost:8080'],
 -                                                                                                              command: '/usr/bin/add-apt-repository  ppa:user/foo',
 +                                                                                                              command: '/usr/bin/add-apt-repository  ppa:user/foo || (rm /etc/apt/sources.list.d/user-foo-trusty.list && false)', # rubocop:disable Metrics/LineLength
-                                                                                                               unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-foo-trusty.list',
+                                                                                                               unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-foo-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/user-foo.gpg', # rubocop:disable Metrics/LineLength
                                                                                                                user: 'root',
                                                                                                                logoutput: 'on_failure')
      }
@@@ -228,8 -228,8 +228,8 @@@
      it { is_expected.to contain_package('software-properties-common') }
      it {
        is_expected.to contain_exec('add-apt-repository-ppa:user/foo').that_notifies('Class[Apt::Update]').with(environment: ['http_proxy=http://localhost:8180'],
 -                                                                                                              command: '/usr/bin/add-apt-repository  ppa:user/foo',
 +                                                                                                              command: '/usr/bin/add-apt-repository  ppa:user/foo || (rm /etc/apt/sources.list.d/user-foo-trusty.list && false)', # rubocop:disable Metrics/LineLength
-                                                                                                               unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-foo-trusty.list',
+                                                                                                               unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-foo-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/user-foo.gpg', # rubocop:disable Metrics/LineLength
                                                                                                                user: 'root',
                                                                                                                logoutput: 'on_failure')
      }
@@@ -263,8 -263,8 +263,8 @@@
      it { is_expected.to contain_package('software-properties-common') }
      it {
        is_expected.to contain_exec('add-apt-repository-ppa:user/foo').that_notifies('Class[Apt::Update]').with(environment: ['http_proxy=http://localhost:8180', 'https_proxy=https://localhost:8180'],
 -                                                                                                              command: '/usr/bin/add-apt-repository  ppa:user/foo',
 +                                                                                                              command: '/usr/bin/add-apt-repository  ppa:user/foo || (rm /etc/apt/sources.list.d/user-foo-trusty.list && false)', # rubocop:disable Metrics/LineLength
-                                                                                                               unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-foo-trusty.list',
+                                                                                                               unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-foo-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/user-foo.gpg', # rubocop:disable Metrics/LineLength
                                                                                                                user: 'root',
                                                                                                                logoutput: 'on_failure')
      }