Thomas S Hatch
23ef18923d
Merge pull request #5126 from hulu/stat-shadowing
...
safe_walk: stat -> status, to avoid shadowing the imported 'stat' module
2013-05-17 20:38:40 -07:00
Thomas S Hatch
7aaae9c40d
Merge pull request #5125 from hulu/avoid-double-sort
...
State.order_chunks(): sort only once instead of twice
2013-05-17 20:37:04 -07:00
Jason R. McNeil
9f0e418b17
Add options parameter to brew module.
...
Adds additional support for the many brew packages that can be installed with options. Brew itself however does not handle the reinstall process if you want to change the options after install. Brew currently forces you to do an uninstall followed by a install.
I imagine that we could automate the updating of options as the `brew info <pkg name>` command does contain info about what the last install options were. However parsing that and comparing to the state options is a bit much for me to take on right now.
2013-05-17 20:32:24 -07:00
Thomas S Hatch
aac8cb0f63
Merge pull request #5122 from cvrebert/patch-2
...
rm unused salt.utils import from openbsdpkg module
2013-05-17 20:31:51 -07:00
Chris Rebert
cc9f58f40d
rename running -> runnings to avoid shadowing; use comprehension
2013-05-17 18:31:45 -07:00
Chris Rebert
c33d112550
file state: comment -> comment_, to avoid shadowing outer func
2013-05-17 18:09:21 -07:00
Chris Rebert
bead76bd74
safe_walk: stat -> status, to avoid shadowing the imported 'stat' module
2013-05-17 18:01:02 -07:00
Chris Rebert
e46dcdf9d2
State.order_chunks(): sort only once instead of twice
2013-05-17 17:55:30 -07:00
Chris Rebert
a6818c7f3d
rm unused salt.utils import from openbsdpkg module
2013-05-17 18:22:23 -06:00
Pedro Algarvio
b9194a89bc
Merge pull request #5107 from cvrebert/patch-4
...
fix spelling
2013-05-17 16:09:37 -07:00
Pedro Algarvio
74a4fc3d77
Merge pull request #5111 from hulu/config-shadowing
...
include_config -> configuration, to avoid shadowing same-named func
2013-05-17 16:08:57 -07:00
Chris Rebert
49be514b5b
include_config -> configuration, to avoid shadowing same-named func
2013-05-17 15:23:39 -07:00
Pedro Algarvio
89c396f31c
Merge pull request #5106 from cvrebert/patch-3
...
have pylint ignore __env__ too
2013-05-17 15:17:50 -07:00
Chris Rebert
febbc85c84
fix spelling
2013-05-17 15:56:11 -06:00
Chris Rebert
18bdf193d3
have pylint ignore __env__ too
2013-05-17 15:50:02 -06:00
Thomas S Hatch
0e29824030
Merge pull request #5104 from cvrebert/patch-2
...
runners.manage: rm unused import of shutil
2013-05-17 14:12:38 -07:00
Thomas S Hatch
5529602428
Merge pull request #5103 from cvrebert/patch-1
...
pkgin mod: rm unused import of the os module
2013-05-17 14:12:26 -07:00
Thomas S Hatch
adb44411f1
Merge pull request #5099 from virtua-network/smartos_features
...
grains/core : add useful information from SmartOS zone
2013-05-17 14:11:34 -07:00
Thomas S Hatch
5796e870e8
Merge pull request #5097 from hulu/debian-packaging-shebang
...
/usr/bin/env python -> /usr/bin/python in scripts
2013-05-17 14:10:31 -07:00
Thomas S Hatch
0f558dc1fd
Merge pull request #5095 from binarydud/fix-activate-venv-for-pip
...
fixes #5093
2013-05-17 14:09:38 -07:00
Thomas S Hatch
a7e785fe7a
Merge pull request #5090 from timl/develop
...
yumpkg5: Comment indicates this is used on python >= 2.6 instead of < 2....
2013-05-17 14:08:58 -07:00
Thomas S Hatch
487fb648cb
Single quotes
2013-05-17 15:04:06 -06:00
Thomas S Hatch
3dc8034157
Merge pull request #5088 from virtua-network/grains_hostname
...
grains/core : fix fqdn / domain return on SunOS systems
2013-05-17 14:07:48 -07:00
Thomas S Hatch
6d93dce458
Fix #5105
2013-05-17 15:02:31 -06:00
Thomas S Hatch
583590f5ca
Add docstring per #5105
2013-05-17 15:01:38 -06:00
Thomas S Hatch
59be3e316f
Add docstring per #5105
2013-05-17 15:00:49 -06:00
Chris Rebert
73d5c8acae
runners.manage: rm unused import of shutil
2013-05-17 14:10:17 -06:00
Chris Rebert
1d90fd9c0e
pkgin mod: rm unused import of the os module
2013-05-17 13:07:57 -07:00
Colton Myers
88f88b70f3
Merge pull request #5081 from hulu/file-comment-shadowing
...
file state: refactor to avoid shadowing comment() func; optimization too
2013-05-17 12:56:01 -07:00
Chris Rebert
0f5965ef84
actually stop shadowing
2013-05-17 12:54:52 -07:00
Colton Myers
bc2664b414
Merge pull request #5101 from cvrebert/patch-1
...
netbsdservice mod: add space after comma to satisfy pylint
2013-05-17 12:52:14 -07:00
Chris Rebert
6f3c54f0cd
netbsdservice mod: add space after comma to satisfy pylint
2013-05-17 13:48:13 -06:00
David Boucha
62a46a398c
Merge pull request #5100 from cvrebert/patch-1
...
reg mod: add space after comma to satisfy pylint
2013-05-17 12:47:03 -07:00
Chris Rebert
d5d50aa827
reg mod: add space after comma to satisfy pylint
2013-05-17 13:45:38 -06:00
mguegan
0d10d7b6b4
grains/core : add useful information from SmartOS zone
...
This patch is intended for SmartOS users who are using OS
virtualization. You can now have access to :
- pkgsrcversion
- imageversion
2013-05-17 21:28:48 +02:00
David Boucha
e7c4a9ad74
Merge pull request #5096 from basepi/rebase4767
...
Use the 'rev' arg in git.rebase, Fix #4767
2013-05-17 12:05:27 -07:00
Colton Myers
720d312a0d
Add to doc examples for remote rebases
2013-05-17 13:01:14 -06:00
Colton Myers
16ce27f85b
Use the 'rev' arg in git.rebase, Fix #4767
2013-05-17 13:01:08 -06:00
Matt George
ecdff63b6e
added ability to activate a virtualenv before
...
running pip install
2013-05-17 13:56:09 -05:00
Kirill Timofeev
c59a1fb9bf
/usr/bin/env python -> /usr/bin/python in scripts
2013-05-17 11:44:35 -07:00
Thomas S Hatch
5200ed71fd
Fallback to base per #5092
2013-05-17 11:52:40 -06:00
Thomas S Hatch
43a3e7bf25
Fix #5092
2013-05-17 11:52:07 -06:00
Thomas S Hatch
9483a570a6
Merge pull request #5087 from s0undt3ch/issues/5017
...
Handle lower msgpack versions which can't handle `OrderedDict`'s.
2013-05-17 10:46:04 -07:00
Thomas S Hatch
5855dd2f6d
Merge pull request #5089 from shintonik/develop
...
Bugfix: NPM module and state (support for JSON Arrays)
2013-05-17 10:43:54 -07:00
Tim Laszlo
a8e2153be4
yumpkg5: Comment indicates this is used on python >= 2.6 instead of < 2.6
2013-05-17 08:50:23 -05:00
shintonik
8d21142a4d
bugfix: NPM may return JSON arrays which were not supported by the NPM module and the NPM state.
2013-05-17 14:52:13 +02:00
mguegan
c720ee241b
grains/core : fix fqdn / domain return on SunOS systems
...
getfqdn() on Solaris platforms returns the unqualified hostname. In
that case, using gethostname() could be a solution.
Tested on SmartOS / Solaris 11
2013-05-17 14:06:59 +02:00
Pedro Algarvio
f68b3ace7d
Handle lower msgpack versions which can't handle OrderedDict's. Fixes #5017 .
...
Dictionary subclasses were only added to msgpack after 0.2.0(inclusive).
Since `isinstance(OrderedDict(), dict)` returns true, of course, msgpack's custom type handling cannot be used.
The solution is to iterate through the data and convert `OrderedDict`'s to `dict`'s since that's what msgpack also does.
For now, the iteration is a top level one, ie, only first child descendants are evaluated. We won't go deeper unless we get the same failure a little deeper in the nested data.
2013-05-17 11:51:54 +01:00
Thomas S Hatch
16042592ee
fix #4985
2013-05-17 00:02:47 -06:00
Thomas S Hatch
92bec045bb
Fix #4955
2013-05-16 23:52:52 -06:00
