Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: puppetlabs/puppetlabs-apt
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6.1.0
Choose a base ref
...
head repository: puppetlabs/puppetlabs-apt
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6.1.1
Choose a head ref
  • 5 commits
  • 3 files changed
  • 3 contributors

Commits on Oct 1, 2018

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f3850ff View commit details
  2. Merge pull request #808 from puppetlabs/revert-801-modules6408

    Revert "(MODULES-6408) - Fix dirmngr install failing"
    pmcmaw authored Oct 1, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    68168a1 View commit details
  3. Merge pull request #807 from puppetlabs/release

    (MODULES-7873) - 6.1.0 Merge Back
    eimlav authored Oct 1, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    1848229 View commit details
  4. Copy the full SHA
    381b563 View commit details
  5. Merge pull request #809 from pmcmaw/MODULES-8020

    (MODULES-8020) - Release Prep 6.1.1
    da-ar authored Oct 1, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    a5905de View commit details
Showing with 13 additions and 9 deletions.
  1. +9 −1 CHANGELOG.md
  2. +3 −7 manifests/init.pp
  3. +1 −1 metadata.json
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -2,7 +2,15 @@

All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).

## [6.1.0](https://github.com/puppetlabs/puppetlabs-apt/tree/6.1.0) (2018-09-27)
## [6.1.1](https://github.com/puppetlabs/puppetlabs-apt/tree/6.1.1) (2018-10-01)

[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/6.1.0...6.1.1)

### Fixed

- Revert "\(MODULES-6408\) - Fix dirmngr install failing" [\#808](https://github.com/puppetlabs/puppetlabs-apt/pull/808) ([eimlav](https://github.com/eimlav))

## [6.1.0](https://github.com/puppetlabs/puppetlabs-apt/tree/6.1.0) (2018-09-28)

[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/6.0.0...6.1.0)

10 changes: 3 additions & 7 deletions manifests/init.pp
Original file line number Diff line number Diff line change
@@ -208,13 +208,6 @@
content => "${confheadertmp}${updatestamptmp}",
}

# Required for adding GPG keys on Debian 9 (and derivatives)
$apt_files = [ 'sources.list', 'sources.list.d', 'preferences', 'preferences.d', '/etc/apt/auth.conf' ]
package { 'dirmngr':
ensure => present,
before => [File[$apt_files]]
}

file { 'sources.list':
ensure => file,
path => $::apt::sources_list,
@@ -296,4 +289,7 @@
if $pins {
create_resources('apt::pin', $pins)
}

# required for adding GPG keys on Debian 9 (and derivatives)
ensure_packages(['dirmngr'])
}
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "puppetlabs-apt",
"version": "6.1.0",
"version": "6.1.1",
"author": "puppetlabs",
"summary": "Provides an interface for managing Apt source, key, and definitions with Puppet",
"license": "Apache-2.0",