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

update puppet 3.0 for archlinux #998

Closed
wants to merge 23 commits into from
Closed

update puppet 3.0 for archlinux #998

wants to merge 23 commits into from

Conversation

aboe76
Copy link
Contributor

@aboe76 aboe76 commented Aug 2, 2012

This will ensure puppet 3.0 will work with archlinux and updates systemd compatiblity.

Niels Abspoel and others added 16 commits August 2, 2012 21:23
If a type uses a composite namevar and none of the supplied title
patterns matched, #parse_title would return a nonsensical array value.
This would lead to unexpected behavior like output like:

    /usr/lib/ruby/1.8/puppet/puppet/resource.rb:235:in `to_hash': undefined method `merge' for #<Array:0x007ffba3d80d78> (NoMethodError)

If a type overrides the title_patterns method and nothing matched,
there's no possible way to recover from this. To prevent misleading
errors from being thrown, this patch raises an error if none of the
title patterns matched.
After trying out having apply pluginsync there have been several
unwanted side effects. This commit removes the apply command from
pluginsyncing and so leaves only agent and device still performing
pluginsync.
Previously the Configurer took a parameter, :skip_plugin_download, which
whould cause it to not trigger a pluginsync. At the same time the
pluginsync code (Downloader) would look at Puppet[:pluginsync] to decide
whether it should actually pluginsync or not.

This changes it so that there is only Pupppet[:pluginsync] which is
passed through to the Configurer as a :pluginsync parameter when the
Configurer is called. Now all callers can be explicit about doing the
pluginsync and the Configurer is less dependent on Puppet settings.
The previous version of this test relied on using puppet apply to check
that the module path order was preserved in deciding the files to use
from a pluginsync. Without apply performaning a pluginsync that was not
possible anymore, but this test is still useful.

This replaces the previous test with a new one that uses the master and
the agent for performing a pluginsync and checking what files the agent
recieves.
The previous CONTRIBUTING.md was verbose and prone to change as branches
changed. After discussion on puppet-dev I've cut it down a lot and changed the
policy for which branch to target to be a "prefer master" policy where it is up
to the merger to make sure it will go on the right branch.
Just noticed some whitespace errors.  This is a whitespace only change
that removes trailing whitespace from CONTRIBUTING.md
Without this patch it's not very clear how to create a topic branch.
This has been a problem in the past because we often get pull requests
from the master branch to the master branch which can be confusing when
working outside of the GitHub Web UI.

This patch addresses the problem by providing a concrete example of how
to create a reasonable topic branch and start using it with two
commands.
Without this patch applied the example commit message in the CONTRIBUTING
document is not a concrete example.  This is a problem because the
contributor is left to imagine what the commit message should look like
based on a description rather than an example.  This patch fixes the
problem by making the example concrete and imperative.

The first line is a real life imperative statement with a ticket number
from our issue tracker.  The body describes the behavior without the patch,
why this is a problem, and how the patch fixes the problem when applied.
@@ -0,0 +1,64 @@
# Manage systemd services using /bin/systemctl
Copy link
Contributor

Choose a reason for hiding this comment

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

@aboe76 Hi Niels, did you really mean to include this file? It this looks like an emacs backup.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You're right this is a backup file from vim.

@joshcooper
Copy link
Contributor

@aboe76 Hi Niels, I noticed there are other commits in your pull request. I or any other developer would be happy to help you sort this out. Best place to find us is #puppet-dev on irc

@aboe76
Copy link
Contributor Author

aboe76 commented Aug 10, 2012

Hi Josh,

Thanks for the feedback and would love some help with this, will get to irc
soon, to discuss it.

Niels,

2012/8/10 Josh Cooper notifications@github.com

@aboe76 https://github.com/aboe76 Hi Niels, I noticed there are other
commits in your pull request. I or any other developer would be happy to
help you sort this out. Best place to find us is #puppet-dev on irc


Reply to this email directly or view it on GitHubhttps://github.com//pull/998#issuecomment-7650546.

@aboe76
Copy link
Contributor Author

aboe76 commented Aug 10, 2012

Only thing left to figure out is lib/puppet/provider/package/pacman.rb
The change I made works with ruby 1.9.3 from archlinux repo.
This will fix the followingError: Could not run: no block given
see Bug #14843 http://projects.puppetlabs.com/journals/diff/64342?detail_id=64329

@aboe76 aboe76 closed this Aug 16, 2012
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.

None yet

5 participants