Commit Graph

10246 Commits

Author SHA1 Message Date
Denis Generalov
959ddfb5cb fix version type 2013-01-26 18:04:44 +04:00
Denis Generalov
527bb79c7d update docstring for available_version() 2013-01-26 18:03:39 +04:00
Joseph Hall
6a6127176d Merge pull request #3463 from morganfainberg/pkgrepo-apt-update
Update to the pkgrepo apt functions in apt module
2013-01-26 05:45:50 -08:00
Morgan Fainberg
d5e4caf135 Update to the PKGREPO apt functions in apt module
* URI is was not really a functional feature since
  the uri was the element that the pkgrepo functions
  used as a base for matching internally.  it is essentially
  a new source definition if the URI changes, so the best
  bet is to .absent the repo and add a new one.

* added in ability to manage repo keys to the APT .managed module
  and by nature of how .manage calls apt.mod_repo, the pkg.mod_repo
  can also now add GPG keys for the apt repositories

* added "consolidate" option.  This will smash down the apt repositories
  into as few lines as possible.  It should do some basic cleanup.  This
  function helps (when enabled) to ensure that salt doesn't miss a repo
  when it's not the "first" matched in the .get_repo function for a
  .managed state.

* changed pkgrepo to watch for exceptions from .mod_repo so that if
  there is an error (exception) that is raised (intentionally or
  unintentionally) the error is displayed to the user.

* updated documentation for apt pkgrepo to reflect these changes
2013-01-26 02:31:29 -08:00
Erik Johnson
1bcbceef32 Merge pull request #3462 from archtaku/quickfix
Docstring correction
2013-01-25 23:54:59 -08:00
Erik Johnson
ea45a87e52 Docstring correction
/usr/bin/which is not POSIX
2013-01-26 01:54:01 -06:00
Thomas S Hatch
1f36572381 Merge pull request #3461 from archtaku/quickfix
Send stderr to subprocess.PIPE in version.py
2013-01-25 23:49:01 -08:00
Erik Johnson
7fdda15de0 Send stderr to subprocess.PIPE in version.py
If git is not installed, the stderr output from the shell out to 'which
git' is printed to the console whenever a salt CLI command is run. This
commit sends it to the subprocess pipe to keep it away from the console.

Also, I replaced the call to 'which git' with the POSIX-compliant
'command -v git'. The 'which' command should be avoided as it is not
POSIX-compliant, and doesn't set a nonzero return code on all platforms.
See below for an example of how which does not work as expected on
Solaris. I believe the MacOS version of which also has this problem. On
these platforms, if git was not found, the call to
subprocess.Popen.poll() would not find a nonzero exit status and salt
would therefore continue trying to obtain the current git commit ID.

$ uname -a
SunOS foo.tld 5.10 Generic_139556-08 i86pc i386 i86pc
$ which foo
no foo in /usr/pkg/bin /usr/pkg/sbin /usr/sfw/bin /usr/sfw/sbin /sbin
/usr/sbin /usr/ccs/bin /usr/bin
$ echo $?
0
$ command -v foo
-bash: command: foo: not found
$ echo $?
1
2013-01-26 01:32:37 -06:00
Thomas S Hatch
dd28185763 Merge pull request #3459 from archtaku/tests
Add tests for nested grain/pillar matching
2013-01-25 22:24:42 -08:00
Erik Johnson
77eeb47bea Add tests for nested grain/pillar matching
Also added tests for traditional grain matching when target grain is a
list.
2013-01-26 00:13:51 -06:00
Thomas S Hatch
aec060eeba Fix #3397 2013-01-25 22:54:37 -07:00
Thomas S Hatch
ba7694507a Fix #3367 2013-01-25 22:46:04 -07:00
Thomas S Hatch
a49f5104d9 Merge pull request #3458 from morganfainberg/document-fixes-for-apt-pkrepo
Quick Documentation fixes for APT pkgrepo state
2013-01-25 20:20:02 -08:00
Thomas S Hatch
4c95f0e0ea fix #3449 2013-01-25 21:16:11 -07:00
Morgan Fainberg
f606079c1c Quick Documentation fixes for APT pkgrepo state
* the aptitude repo manager needs the name to be the complete
  entry from the sources.list file.  Documentation modified to
  make this clear (compared to say the YUM version)

* removed a superfluous reference to "deb" in the uri section
2013-01-25 19:15:18 -08:00
Thomas S Hatch
4998a15839 remove travis target in readme 2013-01-25 17:56:31 -07:00
Thomas S Hatch
644d969de9 Merge pull request #3457 from dlindquist/develop
Fix import typo in rpm build patch
2013-01-25 16:50:08 -08:00
Thomas S Hatch
81aa58a0bf Merge pull request #3454 from seanchannel/develop
remove execute bit
2013-01-25 16:43:17 -08:00
Denis Generalov
5958724342 keep up with pkg.latest state 2013-01-26 04:24:30 +04:00
Thomas S Hatch
83ba20fb25 Merge pull request #3445 from gotcha/develop
use zmq.IPC_PATH_MAX_LEN constant
2013-01-25 16:17:55 -08:00
Thomas S Hatch
6cd1a508f3 Merge pull request #3443 from viq/patch-1
Fix docs for makedirs_perms
2013-01-25 16:12:31 -08:00
Thomas S Hatch
4d3dff3d1e minor spacing change 2013-01-25 17:04:11 -07:00
Thomas S Hatch
239a04c4ce Fix #3456 2013-01-25 16:52:23 -07:00
David Lindquist
7cec8e54b6 Fix import typo in rpm build patch 2013-01-25 15:08:31 -08:00
Sean Channel
6cebb2f05d remove execute bit 2013-01-25 12:52:56 -08:00
Joseph Hall
5cf899001a Merge pull request #3452 from seanchannel/develop
install from @madduck
2013-01-25 11:51:10 -08:00
Sean Channel
88249e219f add sysvinit-utils to pinnings 2013-01-25 11:40:24 -08:00
Sean Channel
6a212c5768 install from @madduck 2013-01-25 11:33:43 -08:00
Joseph Hall
5cba5cb2b9 Merge pull request #3451 from giantlock/develop
fix typo in docstring
2013-01-25 10:56:33 -08:00
Denis Generalov
9929dd6d6b fix typo in docstring 2013-01-25 22:50:13 +04:00
Thomas S Hatch
38a002f31b Merge pull request #3448 from techhat/issue3446
Apparently md5 is deprecated in favor of hashlib
2013-01-25 09:59:10 -08:00
Joseph Hall
5eccb88738 Apparently md5 is deprecated in favor of hashlib 2013-01-25 10:55:10 -07:00
Thomas S Hatch
56d1f586fd Remove crypto abstract
The crypto design docs have not yet been finalized, this document
is not entirely accurate and was written early on for the zeromq
team just as an abstract on the crypto routine
2013-01-25 10:53:02 -07:00
David Boucha
7e9c737078 Merge pull request #3447 from techhat/issue3446
Fix timezone state to do more accurate check
2013-01-25 09:37:40 -08:00
Joseph Hall
323f8b85f5 Because I'm feeling nice, fixing punctuation for @giantlock 2013-01-25 10:31:33 -07:00
Joseph Hall
547976f98b PEP-8 fix as per s0undt3ch 2013-01-25 10:30:06 -07:00
Joseph Hall
ebf5d8044b Forgot to actually use md5sum to check zones 2013-01-25 10:15:12 -07:00
Joseph Hall
9fcf7e1fc9 Fix timezone state to do more accurate check 2013-01-25 09:50:41 -07:00
Joseph Hall
1e2d19847a Give FreeBSD a helpful warning on get_zone 2013-01-25 09:43:44 -07:00
Joseph Hall
b61b44efc7 Add function to compare timezones 2013-01-25 09:31:24 -07:00
Joseph Hall
887f21bf23 Update docstring for set_timezone 2013-01-25 09:19:41 -07:00
Godefroid Chapelle
7b84c70477 use zmq.IPC_PATH_MAX_LEN constant
less code duplication
better language
2013-01-25 13:58:43 +01:00
viq
7a6e4ba6e6 Fix docs for makedirs_perms
Make documentation for makedirs_perms show mode 0755 instead of 493
2013-01-25 12:42:19 +01:00
Thomas S Hatch
119c1bc2ac Merge pull request #3429 from giantlock/develop
small fix for states.cron.file()
2013-01-24 22:58:32 -08:00
Thomas S Hatch
6f98d532b6 Add state module name to terse output, fix #3394 2013-01-24 23:55:50 -07:00
Thomas S Hatch
a7532f7ec7 Fix #3395
I realize why I did it the way I did, originally I did not use
a poll in the zeromq process, and the result was that the actual
gathering of the command got dropped when the signal inturuped
the zeromq recv wait, but we should be fine now that we are using
poll.
This may still be a problem though, so we will need to watch this closely
2013-01-24 23:26:12 -07:00
Thomas S Hatch
8dc86b0d62 Finally statements are causing errors in the peer system.
This should fix #3406
2013-01-24 22:07:56 -07:00
Thomas S Hatch
917c36af26 A bunch of finally statements are killing legitimate error messages
Fix #3412 or rather let the real issue float up
2013-01-24 22:02:21 -07:00
Jeff Schroeder
7732899ea7 Add Paul Crews's salt states to the community docs
These states set up an openstack "Load balancer as a service" setup. Thanks HP Cloud Services for teh awesome!
2013-01-24 20:09:26 -08:00
David Boucha
36abc09fc2 Merge pull request #3432 from joehealy/develop
Modified check for existence of hg binary to also work on windows
2013-01-24 16:53:20 -08:00