[puppetlabs/puppet] 50829f: (PUP-3277) Fix acceptance Gemfile logic for choosi...

[GitHub]

Branch: refs/heads/master
Home: https://github.com/puppetlabs/puppet
Commit: 50829f4ef6ae61be38afc6c7187bdccfa658adf3
https://github.com/puppetlabs/puppet/commit/50829f4ef6ae61be38afc6c7187bdccfa658adf3
Author: Josh Partlow <joshua....@puppetlabs.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)

Changed paths:
M acceptance/Gemfile

Log Message:
-----------
(PUP-3277) Fix acceptance Gemfile logic for choosing gemsource

Since there were no parentheses around the trinary, if GEM_SOURCE was
set, it would be immediately ||'d with OUTSIDE_PUPPETLABS, causing
rubygems.org to be selected as the path instead of GEM_SOURCE. Broke
this bad logic up to make it explicit that GEM_SOURCE takes precedence,
and we only worry about a default if it is not set, then choosing
between two options based on whether the user has set the
OUTSIDE_PUPPETLABS flag.


Commit: a926a970171ba6f5787a9a4d4269466dd35796f3
https://github.com/puppetlabs/puppet/commit/a926a970171ba6f5787a9a4d4269466dd35796f3
Author: Josh Partlow <joshua....@puppetlabs.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)

Changed paths:
M acceptance/Gemfile

Log Message:
-----------
Merge branch 'issue/master/pup-3277-fix-gemfile'


Compare: https://github.com/puppetlabs/puppet/compare/c6031e2f0d00...a926a970171b