Jack Kuan
51145866b3
Merge branch 'develop' of github.com:saltstack/salt into develop
2013-01-06 05:48:03 -05:00
Erik Johnson
2fd13fb327
Add mutli-pkg support for pkg.latest (yumpkg5)
...
Also made some docstring tweaks to a few other files.
2013-01-05 22:47:15 -06:00
Thomas S Hatch
ad5a4630d0
Write the refresh file flag for the running minion
2013-01-05 20:07:40 -07:00
Thomas S Hatch
36e39aead2
Add loading grains from a file in /etc/salt called grains
2013-01-05 20:04:13 -07:00
Thomas S Hatch
baa730b457
Merge pull request #3165 from archtaku/brew_multipkg
...
Rudimentary multi-pkg support for homebrew
2013-01-05 18:55:27 -08:00
Erik Johnson
7abe502daf
Rudimentary multi-pkg support for homebrew
...
This got left out when implementing multi-pkg support. This commit adds
support for "pkgs" but not "sources". I'm unable to test it currently
but would like to improve this in the future. But as it is, this commit
will prevent a few tracebacks in pkg states for Mac users, and that's a
good first step.
2013-01-05 20:40:11 -06:00
Thomas S Hatch
76dbca0f24
Merge pull request #3164 from archtaku/issue2906
...
Add multiple pkg support to pkg.latest (pacman)
2013-01-05 17:32:13 -08:00
Erik Johnson
e47bdaae4c
Add multiple pkg support to pkg.latest (pacman)
...
Also tweaked the changes made to the pkg state in 306cc74
2013-01-05 19:24:25 -06:00
Thomas S Hatch
f6759fb3a0
Merge pull request #3163 from archtaku/issue2906
...
Add multiple-package support to pkg.latest state
2013-01-05 15:05:01 -08:00
Erik Johnson
c48a27aa5c
Fix import
...
The import of distutils here should have been of distutils.version.
2013-01-05 17:02:20 -06:00
Erik Johnson
869185a341
Removed notify-upower.sh
...
This was mistakenly added in my last commit.
2013-01-05 16:47:33 -06:00
Erik Johnson
306cc74d83
Add multiple-package support to pkg.latest state
...
Currently only apt is supported, will work on the rest in the coming
days.
As part of this commit, a new function has been added to pkg_resource
called "compare". This will do version-checking where a specific package
provider does not provide a means of reliably comparing versions. This
was made necessary by the fact that distutils.LooseVersion does not
properly handle Ubuntu's weird version strings (like '1.2.3-0ubuntu1').
apt now has its own "compare" function which uses dpkg --compare-versions
to do the comparison. (thanks @thekuffs!)
As I start adding multiple package support for pkg.latest in other
platforms, I will (where possible) create provider-specific "compare"
functions. This should make version checking more reliable, and moving
forward should also make the audit of version support in pkg.installed
much easier to accomplish for providers which don't allow you to install
a package using the following syntax: pkgname>=1.2.3
2013-01-05 15:54:01 -06:00
Joseph Hall
d45d85b3c2
Merge pull request #3162 from shadowfax-chc/makeconf-state
...
Added makeconf state
2013-01-05 13:47:17 -08:00
shadowfax-chc
85298a94f9
Added makeconf state
2013-01-05 15:52:04 -05:00
Thomas S Hatch
52e6eab897
Fix typo in pre-passing opts to localclient
2013-01-05 12:02:14 -07:00
David Boucha
89d6703b1e
Merge pull request #3161 from alejandrogomez/patch-1
...
Fix typo in example
2013-01-05 10:14:53 -08:00
Alejandro Gómez
3b6af979bc
Fix typo in example
2013-01-05 19:06:31 +01:00
Joseph Hall
c378c0e155
Merge pull request #3159 from shadowfax-chc/makeconf
...
Makeconf
2013-01-05 04:47:48 -08:00
Joseph Hall
bed875e1e7
Merge pull request #3160 from shadowfax-chc/layman
...
Layman bug fixes
2013-01-05 04:42:39 -08:00
shadowfax-chc
583fa7c9a9
Updated layman.add and layman.delete to adjust make.conf
...
When the first overlay is added, the make.conf needs to source layman's
make.conf so that emerge sees the packages in the overlay. Likewise,
when the last overlay is deleted, the make.conf needs to no longer
source layman's make.conf as it will cause emerge to break.
2013-01-05 02:56:13 -05:00
shadowfax-chc
ffd6a38408
Fixed bug in layman.list_local
...
If no overlays had been added, layman.list_local would fail with
IndexError
2013-01-05 02:26:46 -05:00
shadowfax-chc
8216c07b20
Added docs for makeconf module
2013-01-05 02:14:08 -05:00
shadowfax-chc
7bc215f5b7
Added functions for common variables in make.conf
2013-01-05 02:11:45 -05:00
shadowfax-chc
943fef6179
Made var_contains actually work
2013-01-05 01:27:39 -05:00
shadowfax-chc
0b083b8dca
Added cflags functions to modify cflags variable
2013-01-05 01:07:14 -05:00
shadowfax-chc
584bd8c07e
Added functions to append and trim vars in makeconf
2013-01-05 00:43:47 -05:00
Thomas S Hatch
cc1591e3a4
Merge pull request #3154 from torhve/develop
...
Pass on the given env
2013-01-04 21:40:31 -08:00
shadowfax-chc
e4c08cf62a
Added makeconf module
...
Manages setting values in the Gentoo make.conf file
2013-01-04 23:10:11 -05:00
David Boucha
a93f30d5cb
Update doc/topics/event/index.rst
...
default sock_dir was changed. Updated this doc to work with new location.
2013-01-04 18:40:27 -07:00
Joseph Hall
8b1cd6e6f8
Merge pull request #3153 from shadowfax-chc/timezone
...
Added Gentoo support for timezone module
2013-01-04 16:01:04 -08:00
Tor Hveem
00b2ac89f8
Pass on the given env
2013-01-05 00:51:58 +01:00
David Boucha
d7d40f8334
Update doc/ref/peer.rst
...
Fix typo
2013-01-04 15:13:11 -07:00
shadowfax-chc
7c4268ce3e
Added Gentoo support for timezone module
2013-01-04 17:03:09 -05:00
Joseph Hall
69580572e9
Merge pull request #3152 from shadowfax-chc/keymap
...
Added Gentoo support to keyboard module
2013-01-04 12:40:22 -08:00
shadowfax-chc
e8dae7ebac
Added Gentoo support to keybpard module
2013-01-04 19:51:03 +00:00
Joseph Hall
793b93d91d
Merge pull request #3151 from shadowfax-chc/locale
...
Locale for Gentoo
2013-01-04 10:55:10 -08:00
Thomas S Hatch
3afb744add
Merge pull request #3146 from s0undt3ch/issues/3135
...
Redirect warnings to the logging system on python versions >= 2.6 Refs #3135
2013-01-04 10:42:54 -08:00
Thomas S Hatch
97153c3c0d
Fix indents to make @s0ndt3ch happy
2013-01-04 11:40:59 -07:00
David Boucha
be50743e2b
Add service dependency
2013-01-04 11:29:58 -07:00
shadowfax-chc
f61baece83
Fixed return for get_locale if os is Gentoo
2013-01-04 17:51:20 +00:00
shadowfax-chc
b916355a05
Fixed return for set_locale when os is Gentoo
2013-01-04 17:49:11 +00:00
Pedro Algarvio
f8073a08eb
Warn about low mock version instead of mock not available.
2013-01-04 17:45:06 +00:00
shadowfax-chc
e978fc0148
Added Gentoo support to locale
2013-01-04 17:32:58 +00:00
Seth House
458f48fced
Merge pull request #3149 from techhat/repo
...
Delete yum repo, or key from yum repo
2013-01-04 08:28:10 -08:00
Joseph Hall
88fcfcde66
Add the ability to delete a yum repo
2013-01-04 11:17:49 -05:00
Joseph Hall
e2276318f5
Be able to delete a key/value pair by specifying a key with an empty value
2013-01-04 11:17:35 -05:00
David Boucha
42972a8cb0
Add Windows Installer Package resources.
2013-01-04 08:57:30 -07:00
Pedro Algarvio
7be63d73fc
Fix python version checking. Refs #3135
2013-01-04 11:51:26 +00:00
Pedro Algarvio
179d8d11a4
Merge branch 'develop' of github.com:saltstack/salt into develop
2013-01-04 11:42:21 +00:00
Pedro Algarvio
fa23799ca2
Typo.
2013-01-04 11:41:50 +00:00
