Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move Package['python-software-properties'] to apt:ppa #40

Closed
wants to merge 1 commit into from
Closed

Move Package['python-software-properties'] to apt:ppa #40

wants to merge 1 commit into from

Conversation

tbroyer
Copy link

@tbroyer tbroyer commented Mar 31, 2012

python-software-properties is only needed by apt::ppa, not any of the other puppet-apt types or classes, so let's move it to apt:ppa, so it only gets installed if needed.

This also allows dependencies like this one, where the apt-proxy, sources.list et al., and the apt-get update, are guaranteed to be set/have run prior to installing the package:

class { 'apt':
   # set proxy or whatever other option here
}
apt::ppa { 'ppa:...':
   require => Class['apt']
}

Also updates the apt-update in Apt::Ppa to use $apt::params::provider instead of aptitude.

@@ -13,7 +13,7 @@
}

exec { "apt-update-${name}":
command => '/usr/bin/aptitude update',
command => '${apt::params::provider} update',
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this needs to be in double quotes so that the variable apt::params::provider is interpolated
also, for clarity, I would be explicit about the namespace

"${::apt::params::provider} update"

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, of course!

Commit amended. Also changed other apt::params variables to be explicit about the namespace.

Also updates the apt-update in Apt::Ppa to use $apt::params::provider
instead of aptitude.
@branan
Copy link

branan commented May 4, 2012

This no longer merges cleanly. I've opened #54 which contains a rebased version of this request.

@branan branan closed this May 4, 2012
@tbroyer tbroyer deleted the python-software-properties-in-apt-ppa branch March 8, 2024 18:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants