valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
8,588 Commits 24 Branches 182 Tags 341 MiB
32b476594a
Commit Graph

8588 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
32b476594a Add multiple version support for FreeBSD 2012-12-09 21:05:26 -06:00
Erik Johnson
141481c97c Add multiple version support to ebuild 2012-12-09 20:56:32 -06:00
Erik Johnson
0645921f34 Add multiple version support to apt 2012-12-09 20:53:05 -06:00
Erik Johnson
bf778b9bee Clean up type checking, add try/except 2012-12-09 14:57:50 -06:00
Erik Johnson
56b6ea0555 Add pkg arch to version numbers in yumpkg{,5} 
This is important because many packages have versions for both x86_64
and i686 installed.
 2012-12-07 23:14:44 -06:00
Erik Johnson
bc772610e0 Add multiple version support to list_pkgs (yumpkg) 
I also switched list_pkgs so that it parses the rpm command's output
instead of using yum. This reduces a lot of yum overhead and speeds up
this function considerably.
 2012-12-07 22:46:20 -06:00
Erik Johnson
d36a6e7e64 Add multiple version support (zypper) 
Also, break out the logic that converts the string value to a list of
strings when there are multiple packages and put it in pkg_resource.py
so that the other package providers can use it.
 2012-12-07 21:55:35 -06:00
Thomas S Hatch
957a64df88 Merge pull request #2836 from UtahDave/fix_issue_2830_dangling_symlink 
Fix exception thrown when symlink target is missing. Fixes #2830
 2012-12-07 16:03:53 -08:00
David Boucha
9ec3db3db8 Fix exception thrown when symlink target is missing 
os.stat() follows symlinks to their targets.
If the target is missing, os.stat() throws an exception when it tries
to stat the symlink.

Switch to using os.lstat(), which works on the actual symlink and acts
on files and directories as usual.

I believe this also closes a potential security issue where someone
could slip a symlink to /etc/passwd, for example and change ownership.

The current behavior will cause file.directory to ONLY do work
on the directory structure specified. Symlinks to files outside the
specified directory are not followed.
 2012-12-07 16:54:24 -07:00
Thomas S Hatch
e4d366b3f5 Merge pull request #2831 from seanchannel/develop 
update options list per cmd
 2012-12-07 15:00:21 -08:00
David Boucha
4b0273d300 Merge pull request #2832 from s0undt3ch/features/SaltReturnAssertsMixIn 
Migrate states tests to use SaltReturnAssertsMixIn
 2012-12-07 11:29:59 -08:00
Pedro Algarvio
5ca7762784 Don't switch assertion case. Fix test. 2012-12-07 19:05:19 +00:00
Pedro Algarvio
871516b4cf Migrated test.integration.modules.state to use SaltReturnAssertsMixIn. 2012-12-07 18:44:06 +00:00
David Boucha
513554726f Merge pull request #2834 from UtahDave/fix_docs 
Move result out of code block
 2012-12-07 10:16:33 -08:00
David Boucha
a3abe7dca0 Move result out of code block 2012-12-07 10:31:56 -07:00
David Boucha
db49b07ad9 Merge pull request #2829 from s0undt3ch/develop 
Adapted `tests.integration.states.ssh` to use `SaltReturnAssertsMixIn`.
 2012-12-07 09:20:50 -08:00
Pedro Algarvio
4348734697 Add integration.SaltReturnAssertsMixIn where it was lacking in previous commits. 2012-12-07 17:13:58 +00:00
Pedro Algarvio
0baa63c19f Remove deprecated tests functions. 
Removed `ModuleCase.assert_success()` and `ModuleCase.state_result()` which are now better tested using `SaltReturnAssertsMixIn`
 2012-12-07 17:09:11 +00:00
Pedro Algarvio
e03a2606a1 Migrated test.integration.states.supervisord to use SaltReturnAssertsMixIn. 2012-12-07 17:03:24 +00:00
Pedro Algarvio
cbea092b0c Migrated test.integration.states.rabbitmq_* to use SaltReturnAssertsMixIn. 2012-12-07 17:01:31 +00:00
Pedro Algarvio
fc3b272809 Migrated test.integration.states.pip to use SaltReturnAssertsMixIn. 
* Added `assertSaltCommentRegexpMatches()` to `SaltReturnAssertsMixIn` to add the ability to match salt comments using regular expressions.
 2012-12-07 16:59:24 +00:00
Pedro Algarvio
156ce07bde Migrated test.integration.states.host to use SaltReturnAssertsMixIn. 2012-12-07 16:35:20 +00:00
Pedro Algarvio
c1c3b31d0b Migrated test.integration.states.git to use SaltReturnAssertsMixIn. 2012-12-07 16:33:38 +00:00
Pedro Algarvio
b210d59eb8 Migrated test.integration.states.file to use SaltReturnAssertsMixIn. 2012-12-07 16:25:26 +00:00
Thomas S Hatch
84ffb7aa03 Merge pull request #2825 from archtaku/develop 
Add multiple version support (pacman)
 2012-12-07 07:02:42 -08:00
Pedro Algarvio
7dc025a891 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-12-07 13:06:43 +00:00
Pedro Algarvio
4b1747468b Adapted tests.integration.states.ssh to use SaltReturnAssertsMixIn. 
* Two new methods were added to `SaltReturnAssertsMixIn`, `SaltReturnAssertsMixIn.assertSaltStateChangesEqual()` and `SaltReturnAssertsMixIn.assertSaltStateChangesNotEqual()`, in order to be able to test salt state returns. These methods, besides asserting that the state was correctly applied using `SaltReturnAssertsMixIn.assertSaltTrueReturn()`, are also able to test for what's in the `changes` key of salt's return, it can even "go inside" the `changes` dictionary, just have a look at what was done in `tests.integration.states.ssh`.
 2012-12-07 12:46:02 +00:00
Erik Johnson
7369eeb5b7 Add multiple version support (pacman) 
pacman doesn't support multiple versions of the same package at this
time, and probably never will, but consider this future-proofing.
Besides, I structured the if/elif/else block so that the if will
resolve to True 100% of the time with the way pacman works, so there's
no impact to performance.
 2012-12-06 22:54:41 -06:00
Sean Channel
6e462d39e4 update options list per cmd 2012-12-06 16:42:09 -08:00
Sean Channel
8ec6f59ae5 Merge pull request #2823 from seanchannel/develop 
fix out/color flags
 2012-12-06 15:25:09 -08:00
David Boucha
9abc6da95d Merge pull request #2821 from tristanhands/develop 
Modified the tomcat.py module's search for CATALINA_HOME
 2012-12-06 13:38:17 -08:00
tristanhands
fe58efb1b4 Changed the tomcat module to dynamically look for the base folder of tomcat independantly of the version. 2012-12-06 21:35:10 +01:00
David Boucha
1692516be2 Merge pull request #2820 from UtahDave/develop 
Small grammar fix. Add a comma.
 2012-12-06 08:54:49 -08:00
David Boucha
9f38d27924 Small grammar fix. Add a comma. 2012-12-06 09:53:55 -07:00
David Boucha
34b45c3cc3 Merge pull request #2816 from holmboe/develop 
Fix for #2803
 2012-12-06 05:49:17 -08:00
Henrik Holmboe
dc5147628a Commit change as per the comment from @thatch45 in #2803. 
The calculated result does not include unauthorized keys (minions_pre) any
more.
 2012-12-06 14:12:25 +01:00
Pedro Algarvio
885a56f42e Merge branch 'develop' of github.com:saltstack/salt into develop 2012-12-06 12:14:35 +00:00
Pedro Algarvio
b1012956fa Fix SaltReqTimeoutError message to show the actual passed seconds. Refs #2676. 2012-12-06 12:14:26 +00:00
Sean Channel
01cccf4d54 fix out/color flags 2012-12-06 01:02:26 -08:00
David Boucha
d4ae5ae76a Merge pull request #2812 from Talksum/spec_no_templates 
removing references to config templates in spec file
 2012-12-05 14:53:34 -08:00
Seth House
d30d92b6a3 Merge pull request #2814 from UtahDave/develop 
Deal with tuples and dicts appropriately. Fixes #2657
 2012-12-05 14:33:30 -08:00
Sean Channel
7c87e594da remove deprecated output flags 2012-12-05 14:20:45 -08:00
David Boucha
c3d0cf9c65 Deal with tuples and dicts appropriately. 2012-12-05 15:17:57 -07:00
Thomas S Hatch
63c090270c Merge pull request #2813 from s0undt3ch/develop 
`test_issue_2731_masterless()` should clean-up after.
 2012-12-05 13:56:50 -08:00
Pedro Algarvio
6c22f65a56 test_issue_2731_masterless() should clean-up after. 2012-12-05 21:24:19 +00:00
Pedro Algarvio
bfa5ab188c Fix endless loop logic in salt.payload.SQRE.send() 2012-12-05 20:53:10 +00:00
Mike Chesnut
673b409e07 removing references to config tampltes in spec file 2012-12-05 12:14:06 -08:00
Thomas S Hatch
b8b11e2691 Merge pull request #2676 from bclermont/small-fixes 
Small fixes and code cleanup
 2012-12-05 11:53:13 -08:00
Thomas S Hatch
ed1723aeed Merge pull request #2805 from giantlock/develop 
fix typo in ssh module and small change in ssh_known_hosts state
 2012-12-05 11:23:53 -08:00
Thomas S Hatch
d4c6e97ebf Merge pull request #2804 from saltstack/fix_i386_on64bit 
Fixes #2649 remove extension before comparing to pkg_list()
 2012-12-05 10:27:38 -08:00