Joseph Hall
fd037eca93
Merge branch 'develop' of github.com:saltstack/salt into develop
2013-01-29 17:29:32 -05:00
Joseph Hall
7371594048
Merge branch 'develop' of github.com:saltstack/salt into develop
2013-01-29 17:27:18 -05:00
David Boucha
44fdabb2c1
Merge pull request #3509 from techhat/yumpkg
...
Adding list_pkgs() to rpm.py
2013-01-29 14:26:24 -08:00
Thomas S Hatch
854f317bb4
Fix #3405
2013-01-29 15:20:01 -07:00
Joseph Hall
9b28baa8ac
Adding list_pkgs() to rpm.py
2013-01-29 17:19:39 -05:00
Thomas S Hatch
b345b73d50
Merge pull request #3508 from techhat/apt
...
Should be called dpkg.py, not deb.py
2013-01-29 14:09:41 -08:00
Joseph Hall
5ea35708e6
Should be called dpkg.py, not deb.py
2013-01-29 15:06:54 -07:00
Thomas S Hatch
f4148c0859
Merge pull request #3507 from techhat/apt
...
Adding list_pkgs() to lowpkg for deb
2013-01-29 13:55:44 -08:00
Thomas S Hatch
fad140f905
Merge pull request #3505 from techhat/yumpkg
...
Make adding file_dict() to yumpkg.py
2013-01-29 13:55:20 -08:00
Joseph Hall
d87bff70c8
Fixing docstrings (pkg -> lowpkg)
2013-01-29 14:38:09 -07:00
Joseph Hall
eef8a6224b
Adding list_pkgs() to lowpkg for deb
2013-01-29 14:34:37 -07:00
Joseph Hall
8b2a104480
Make adding file_dict() to yumpkg.py
2013-01-29 15:59:37 -05:00
Thomas S Hatch
150d903e6d
Merge pull request #3504 from techhat/yumpkg
...
Adding file_dict() to rpm, to match deb and pacman functionality
2013-01-29 12:53:31 -08:00
Joseph Hall
3aea845a62
Adding file_dict() to rpm, to match deb and pacman functionality
2013-01-29 15:52:15 -05:00
Thomas S Hatch
e8ea7b4877
Merge pull request #3503 from techhat/apt
...
Implementing lowpkg module for apt/deb
2013-01-29 12:47:50 -08:00
Joseph Hall
83396c5c2f
Switch over file_list() and file_dict() in apt.py to use lowpkg
2013-01-29 13:03:10 -07:00
Joseph Hall
ea603e435b
Adding lowpkg module for deb packages
2013-01-29 13:01:41 -07:00
Thomas S Hatch
993ee201f3
More finally closures, may help with #3434
2013-01-29 12:45:47 -07:00
Thomas S Hatch
587d166230
Merge pull request #3502 from gthb/virtualenv.managed-index-args
...
virtualenv.managed args index_url, extra_index_url
2013-01-29 11:29:34 -08:00
Thomas S Hatch
a52957a0af
kill a zmq finally
2013-01-29 12:25:39 -07:00
Gunnlaugur Þór Briem
4ac6fcef61
virtualenv.managed args index_url, extra_index_url
...
Pass index_url and extra_index_url along to pip module when installing
requirements in virtualenv.managed state.
2013-01-29 19:18:43 +00:00
Thomas S Hatch
2680b0bba9
Merge pull request #3501 from techhat/yumpkg
...
Implementing lowpkg module for yum/rpm
2013-01-29 10:27:55 -08:00
Joseph Hall
056206034d
Switch yumpkg.py to use lowpkg for verify()
2013-01-29 13:13:33 -05:00
Joseph Hall
eed774b599
Switch yumpkg.py to use lowpkg for file_list()
2013-01-29 13:12:17 -05:00
Joseph Hall
cae16d0c57
Breaking out rpm.py into lowpkg
2013-01-29 13:10:18 -05:00
Thomas S Hatch
5be9469708
Merge pull request #3496 from MTecknology/develop
...
Added rcS to modules/debian_service.py get_enabled().
2013-01-29 09:51:50 -08:00
Thomas S Hatch
dedb9669ea
Merge pull request #3498 from s0undt3ch/develop
...
Re-factored cli options merging with the config into it's own mix-in. Refs #2563 .
2013-01-29 09:50:58 -08:00
Pedro Algarvio
3d3f22ea8a
Update the remaining parsers to use MergeConfigMixIn. Refs #2563 .
2013-01-29 17:29:09 +00:00
Thomas S Hatch
a6df51ab1a
Fix test failure due to update in the default nested outputter
2013-01-29 10:23:22 -07:00
Pedro Algarvio
8187e96826
Re-factored cli options merging with the config into it's own mix-in. Refs #2563 .
...
This will be useful in `salt-cloud` which copied this functionality over.
2013-01-29 17:23:22 +00:00
Thomas S Hatch
a58202c2f7
Add compound matcher tests
2013-01-29 10:20:02 -07:00
Thomas S Hatch
193a64e33e
Add check for bad not eval in compound matcher
2013-01-29 10:16:37 -07:00
Michael Lustfield
f827ac2101
Added rcS to modules/debian_service.py get_enabled().
2013-01-29 11:09:31 -06:00
Thomas S Hatch
cf06b34125
Fix issues with resolve_dns change
2013-01-29 09:35:07 -07:00
David Boucha
d9788f3977
Merge pull request #3465 from s0undt3ch/hotfix/git-describe-single-call
...
Support git describe versioning on windows and also one less subprocess. Refs #3461 .
2013-01-29 08:19:26 -08:00
Joseph Hall
5d71392a06
Merge pull request #3494 from giantlock/develop
...
fix markup in docstring
2013-01-29 08:06:49 -08:00
Pedro Algarvio
f872195062
Improved git describe exception handling.
...
Previously we were catching the same exception in two places because on Windows the `child_traceback` attribute is not set on the exception, so, the initial exception catching we had was just working properly on Linux. Now we just check for the proper `errno` value, if it's not 2(The system cannot find the file specified), we still raise the exception so we can properly fix and handle it.
2013-01-29 12:19:46 +00:00
Denis Generalov
ea3d262735
fix markup in docstring
2013-01-29 15:28:42 +04:00
Thomas S Hatch
6116d20ea0
Merge pull request #3493 from archtaku/issue3492
...
fix refs to pkg.compare
2013-01-28 22:29:22 -08:00
Erik Johnson
fb2cb3f552
fix refs to pkg.compare
2013-01-29 00:24:21 -06:00
Thomas S Hatch
76f32d1a15
Merge pull request #3491 from archtaku/issue3488
...
fix apt.py refresh_db (issue #3488 )
2013-01-28 21:52:42 -08:00
Erik Johnson
ed3af46308
fix apt.py refresh_db (issue #3488 )
2013-01-28 23:11:47 -06:00
Thomas S Hatch
804fe7c766
Move dns resolution into the minion, fix #3402
2013-01-28 17:00:41 -07:00
Thomas S Hatch
b12564796d
clean up some newlines
2013-01-28 16:56:28 -07:00
Thomas S Hatch
598d715d28
remove resolution of master ip from the config seq
2013-01-28 16:55:55 -07:00
Pedro Algarvio
7f18c0eb6a
We can just catch OSError.
...
See http://mail.python.org/pipermail/python-list/2009-November/558704.html
2013-01-28 23:25:25 +00:00
Pedro Algarvio
e306e6302d
Mimic WindowsError in linux to avoid errors.
2013-01-28 23:23:44 +00:00
Pedro Algarvio
0d3db03195
Don't fail on Windows if git is not installed or not on PATH.
2013-01-28 23:14:50 +00:00
Thomas S Hatch
af8cdb6196
Merge pull request #3487 from techhat/apt
...
Adding file_list() and file_dict() to apt.py
2013-01-28 14:08:23 -08:00
Thomas S Hatch
3c86a89fd9
Merge pull request #3486 from techhat/pacman
...
Pacman doesn't use an rpm database
2013-01-28 14:08:01 -08:00
