valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
13,514 Commits 24 Branches 182 Tags 341 MiB
85a8deb3ad
Commit Graph

13514 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
85a8deb3ad Merge pull request #5204 from basepi/missingsls5048 
Output an error if no matching sls file is found, Fix #5048
 2013-05-22 22:26:32 -07:00
Thomas S Hatch
67b1d33ea1 Merge pull request #5206 from l2ol33rt/develop 
Adding argument passing to cmd.script state
 2013-05-22 22:18:04 -07:00
Pedro Algarvio
5e0bdb2c09 Merge pull request #5208 from s0undt3ch/hotfix/yumpkg-fix 
Replace `rpmUtils.arch.getBaseArch()` with `rpmUtils.arch.getCanonArch()`
 2013-05-22 22:06:44 -07:00
Thomas S Hatch
0e71e34763 Merge pull request #5207 from shadowfax-chc/mdadm-shadowing-fix 
Fixed shadowing built-in in mdadm module. Ref #5085
 2013-05-22 21:51:53 -07:00
Thomas S Hatch
921cc3b47f Merge pull request #5205 from shadowfax-chc/npm-fix 
Fixed issue with npm.install for npm>=1.2.21.
 2013-05-22 21:39:17 -07:00
Pedro Algarvio
1e3ffbbd49 Replace rpmUtils.arch.getBaseArch() with rpmUtils.arch.getCanonArch(). 
According to the `rpmUtils.arch` source code, when no argument is passed to `rpmUtils.arch.getBaseArch()`, the result should be the same as `rpmUtils.arch.getCanonArch()`. However, in CentOS 6.4 with yum-3.2.29-40.el6.centos.noarch:

```python
>>> import rpmUtils.arch
>>> rpmUtils.arch.getBaseArch()
'i386'
>>> rpmUtils.arch.getBaseArch(None)
'i386'
>>> rpmUtils.arch.getCanonArch()
'i686'
>>>
```

This little thing made the `pkg.latest` state fail, and also the `pkg.latest_version` module function.
 2013-05-23 03:35:57 +01:00
shadowfax-chc
a48ae43976 Fixed shadowing built-in in mdadm module. Ref #5085 2013-05-22 21:42:22 -04:00
Robert Hernandez
96e7bbbacb Merge remote branch 'upstream/develop' into cmd_script 2013-05-22 17:42:10 -07:00
Robert Hernandez
cf0fabf654 Added argument passing to cmd.script state 2013-05-22 17:41:29 -07:00
shadowfax-chc
9f974d6407 Fixed issue with npm.install for npm>=1.2.21. Closes #5189 2013-05-22 20:27:29 -04:00
Colton Myers
f82654651a Make the error message more readable 2013-05-22 16:42:31 -06:00
Colton Myers
6a1db06edc Fix some pep8 2013-05-22 16:40:49 -06:00
Colton Myers
aa2a474acc Output an error if no matching sls file is found, Fix #5048 2013-05-22 16:39:45 -06:00
Joseph Hall
a53109b31c Merge pull request #5203 from virtua-network/zfs_module 
modules/zfs : add module for zfs command
 2013-05-22 14:14:10 -07:00
mguegan
e776b3d531 modules/zfs : add module for zfs command 
This first version is very basic and partially handles the 'list'
argument.
 2013-05-22 22:03:26 +02:00
Joseph Hall
5503862068 Merge pull request #5196 from basepi/virtrunner5120 
Improve python3 compatibility with next() built-in
 2013-05-22 10:29:33 -07:00
Colton Myers
101811a734 Improve python3 compatibility with next() built-in 2013-05-22 11:15:54 -06:00
Thomas S Hatch
1e50ec0537 Don't import direct function in modules so they are not exposed 2013-05-22 05:34:30 -06:00
Thomas S Hatch
3552bd968f Merge pull request #5188 from geoffgarside/freebsd-xen 
Add Xen DomU detection for FreeBSD.
 2013-05-22 01:12:26 -07:00
Thomas S Hatch
d9e27a165b Merge pull request #5184 from s0undt3ch/develop 
Work around `__file__` `NameError` thrown by `bbfreeze`. Fixes #5172.
 2013-05-21 22:24:03 -07:00
Thomas S Hatch
46980febac Merge pull request #5183 from sibsibsib/develop 
fixed: TypeError in pkg._find_install_targets when version is None
 2013-05-21 22:22:41 -07:00
Thomas S Hatch
fc105cbe55 Merge pull request #5182 from basepi/virtrunner5120 
Use .next() instead of dummy loop, Fix #5120
 2013-05-21 22:21:44 -07:00
Thomas S Hatch
c95d73ccd7 Merge pull request #5169 from iMilnb/develop 
Implemented XenAPI backend as a 'virt' __virtual__ module
 2013-05-21 22:19:31 -07:00
David Boucha
234c2bd932 Merge pull request #5185 from UtahDave/develop 
Get proper Windows full pkg name
 2013-05-21 18:48:14 -07:00
David Boucha
532f9afcc6 Get proper Windows full pkg name 2013-05-21 19:47:12 -06:00
Pedro Algarvio
6996afaf46 Work around __file__ NameError thrown by bbfreeze. Fixes #5172. 2013-05-22 02:00:44 +01:00
sib
3f5b369b65 fixed: TypeError in pkg._find_install_targets when version is None 2013-05-21 21:44:13 -03:00
Colton Myers
757ab836ff Fix my stupidity (leftover :) 2013-05-21 18:14:19 -06:00
Colton Myers
001373052e Use .next() instead of dummy loop, Fix #5120 2013-05-21 18:01:21 -06:00
David Boucha
706566a944 Merge pull request #5181 from UtahDave/develop 
add missing globals for Windows stuff.
 2013-05-21 16:58:25 -07:00
David Boucha
42ecd4295b add missing globals 2013-05-21 17:57:43 -06:00
David Boucha
70c2e56425 Merge pull request #5180 from UtahDave/develop 
Make pkg state work with Windows packages
 2013-05-21 16:56:42 -07:00
Pedro Algarvio
0aeb2af20f Add yum to freezer includes if we can actually freeze it, ie, is it available? 2013-05-22 00:45:54 +01:00
Pedro Algarvio
39631427b4 Double to single quotes. 2013-05-22 00:36:31 +01:00
David Boucha
916e3f02e4 Make pkg state work with Windows packages 2013-05-21 17:23:30 -06:00
Seth House
65234c01e2 Merge pull request #5179 from basepi/retcode5112 
Remove retcode arg from cmd._run, Fix #5112
 2013-05-21 15:41:23 -07:00
Emile 'iMil' Heitor
e5535e93dd Removed useless commands and added Xen dom0 support for NetBSD 2013-05-22 00:22:06 +02:00
Colton Myers
7a0d59bf52 Remove retcode arg from cmd._run, Fix #5112 
Checked for external uses, there are none.  Really not sure what it was
gaining us in the first place, but it's been out of use since the fix
for #2640.
 2013-05-21 15:33:30 -06:00
Joseph Hall
dddb91a12e Merge pull request #5178 from virtua-network/imgadm_feature 
smartos_imgadm : add a *basic* search option and an update function
 2013-05-21 14:25:48 -07:00
mguegan
cc642f9820 smartos_imgadm : add a *basic* search option and an update function 
* update_installed() (aka. imgadm update)

* avail(search=None) : outputs the last occurrence of 'string' from
'''imgadm avail'''
 2013-05-21 23:16:13 +02:00
David Boucha
ca78e5b44b Merge pull request #5176 from basepi/jinjadocs 
Fix syntax error in jinja context examples
 2013-05-21 12:44:04 -07:00
Colton Myers
5971b0e8a8 Fix syntax error in jinja context examples 
Bad indentation meant it would pass in the pieces of context as part of
the **kwargs, rather than as part of the context kwarg.
 2013-05-21 13:42:00 -06:00
David Boucha
0c8e0fc569 Merge pull request #5175 from basepi/context5161 
Make explicit context overwrite kwargs for templating, Fix #5161
 2013-05-21 12:39:48 -07:00
Colton Myers
1287d07aa2 Make explicit context overwrite kwargs for templating, Fix #5161 2013-05-21 12:38:08 -06:00
Colton Myers
48645317fa Merge pull request #5174 from UtahDave/develop 
Fix list_pkgs on Windows.
 2013-05-21 11:29:21 -07:00
David Boucha
58d1f9de5a remove unneeded quotes 2013-05-21 12:27:49 -06:00
Erik Johnson
d15082970e Merge pull request #5173 from terminalmage/quickfix 
Use a deepcopy when assigning list_pkgs results to __context__
 2013-05-21 11:13:32 -07:00
Erik Johnson
0a007f846e Use a deepcopy when assigning list_pkgs results to __context__ 
This fixes a problem that Dave found where a simple assignment caused
the data in the return dict to be linked to __context__['pkg.list_pkgs']
due to a shallow copy, and thus the call to pkg_resource.stringify was
modifying the data in __context__['pkg.list_pkgs']. Dave will be pushing
a commit later on that fixes this in win_pkg.py, this commit fixes it in
the rest.
 2013-05-21 13:10:04 -05:00
David Boucha
664aadcc22 Remove old option to pass in pkg names 2013-05-21 12:07:27 -06:00
David Boucha
e44b584145 do a deep copy of ret. Don't alter original 2013-05-21 12:00:15 -06:00