Commit Graph

51565 Commits

Author SHA1 Message Date
Justin Findlay
775bee936a Merge pull request #22909 from virtua-network/fix_pkgin_parser
Fix compatibility with pkgin > 0.7
2015-04-21 22:48:43 -06:00
Justin Findlay
a0e253df95 Merge pull request #22927 from jfindlay/merge_22922
[develop] lint fixes
2015-04-21 22:19:36 -06:00
Pedro Algarvio
f7e6f716e3 Make PEP-8 checker happier 2015-04-21 20:35:14 -06:00
Pedro Algarvio
b831d14bfc Properly indent comments 2015-04-21 20:35:14 -06:00
Pedro Algarvio
5f7ab3dc36 Another PEP-8 preciosity disabled 2015-04-21 20:35:14 -06:00
Pedro Algarvio
4617f03dda Make PEP-8 happier 2015-04-21 20:35:14 -06:00
Pedro Algarvio
23ad161531 Additionally ignore import-error 2015-04-21 20:35:14 -06:00
Pedro Algarvio
492c6513bb Fix W1504(unidiomatic-typecheck)
Using type() instead of isinstance() for a typecheck.
2015-04-21 20:35:14 -06:00
Justin Findlay
d34e7c0585 Merge pull request #22926 from rallytime/pylint-dev
Python 3 compat for salt/auth/pam.py
2015-04-21 20:30:45 -06:00
rallytime
f61abb0c37 Python 3 compat for salt/auth/pam.py 2015-04-21 19:24:55 -06:00
Nicole Thomas
f870f75b46 Merge pull request #22920 from cachedout/dns_check_err
Better err handling for unresoveable master addr
2015-04-21 19:00:00 -06:00
Mike Place
bac22b1261 Better err handling for unresoveable master addr 2015-04-21 17:14:51 -06:00
Colton Myers
d23ee2f80a Merge pull request #22915 from basepi/boto_rds.version_added
Update versionadded for boto_rds modules
2015-04-21 16:06:14 -06:00
Colton Myers
073f79adb1 Update versionadded for boto_rds modules 2015-04-21 16:06:05 -06:00
Thomas S Hatch
ac582030e6 Merge pull request #22895 from aletourneau/pam_tally2.fix
pam_tally counter was not reset to 0 after a succesfull login
2015-04-21 12:50:27 -06:00
mguegan
c37d70af34 Fix compatibility with pkgin > 0.7
- Add testing for parsing ability
- Fix broken parser for :
  - pkg.list_pkgs
  - pkg.search

Sample of bad parsing :

[INFO    ] Executing command '/usr/sbin/zfs help || :' in directory '/root'
[INFO    ] Executing command '/opt/local/bin/pkgin -v' in directory '/root'
[INFO    ] Executing command '/opt/local/bin/pkgin se ^memcached$' in directory
'/root'

local:
     ----------
     memcached-1.4.21;=;High:
         performance
2015-04-21 20:26:40 +02:00
Justin Findlay
3565816876 Merge pull request #22900 from basepi/merge-forward-develop
Merge forward from 2015.2 to develop
2015-04-21 12:01:39 -06:00
Alexandre Letourneau
0f4fbe9306 Fixed pylint issues 2015-04-21 13:05:57 -04:00
Colton Myers
bd6ecdfd43 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    doc/topics/installation/windows.rst
    doc/topics/tutorials/gitfs.rst
    salt/pillar/pepa.py
    salt/states/artifactory.py
    salt/states/pip_state.py
    salt/transport/__init__.py
2015-04-21 10:42:22 -06:00
Nicole Thomas
f7ccbac1f2 Merge pull request #22884 from jfindlay/merge_22847
Merge 22847
2015-04-21 10:15:31 -06:00
Thomas S Hatch
7ad8d790c0 Merge pull request #22875 from nmadhok/grains-patch
Revert #22562
2015-04-21 09:57:27 -06:00
Justin Findlay
8b2e60127d Merge pull request #22893 from s0undt3ch/hotfix/lint-2015.2
[2015.2] Lint Fixes
2015-04-21 09:24:49 -06:00
Justin Findlay
c2a5d59fb7 Merge pull request #22890 from jayeshka/postfix-unit-test
adding postfix unit test case
2015-04-21 09:01:18 -06:00
Justin Findlay
3640fa59bc Merge pull request #22889 from jayeshka/blockdev-states-unit-test
adding states/blockdev unit test case
2015-04-21 08:48:06 -06:00
Justin Findlay
910af016ab Merge pull request #22888 from jayeshka/aws_sqs-states-unit-test
adding states/aws_sqs unit test case
2015-04-21 08:47:03 -06:00
Alexandre Letourneau
508f704511 Cleaned up pull request 2015-04-21 10:40:13 -04:00
Justin Findlay
7899914dbe fix deprecated artifactory state code 2015-04-21 08:38:23 -06:00
Alexandre Letourneau
d8fe360565 pam_tally counter was not reset to 0 after a succesfull login 2015-04-21 10:22:33 -04:00
Pedro Algarvio
62ae9e061a Forgot to add the code 2015-04-21 15:08:42 +01:00
Pedro Algarvio
3ae68c4f7b Minor cosmetic changes in order not to disable the PEP8 PyLint code all together 2015-04-21 15:03:47 +01:00
Pedro Algarvio
8565e9fe1c Ignore no name in module for distutils.version 2015-04-21 14:53:21 +01:00
Joseph Hall
ce58de87b2 Merge pull request #22885 from dmuntean/fix-aws-plus-sign-encoding
Encode spaces with %20 instead of plus sign in AWS request query strings
2015-04-21 07:52:54 -06:00
Pedro Algarvio
4002d90e19 Disable W1307 (invalid-format-index)
Using invalid lookup key '%s' in format specifier "0['%s']"
2015-04-21 14:51:54 +01:00
Pedro Algarvio
ae2bca1f6f Fix W1504(unidiomatic-typecheck 2015-04-21 14:02:17 +01:00
Pedro Algarvio
7f1954bea9 Fix False comparison 2015-04-21 14:00:46 +01:00
Pedro Algarvio
3dc9b0129b Fix comparison to None 2015-04-21 14:00:00 +01:00
Pedro Algarvio
a37502f0f6 Remove bad PyLint options 2015-04-21 13:54:21 +01:00
Pedro Algarvio
3d058759dc Ignore no name in module for distutils.version 2015-04-21 13:52:13 +01:00
Pedro Algarvio
8a0e042787 Fix PyLint W1504(unidiomatic-typecheck) Using type() instead of isinstance() for a typecheck. 2015-04-21 13:49:45 +01:00
Chris Rebert
cb50a7dcc3 use isinstance() instead of type() for typechecks
************* Module salt.modules.mdadm
/Users/chris/code/salt/salt/modules/mdadm.py:340: [W1504(unidiomatic-typecheck), assemble] Using type() instead of isinstance() for a typecheck.
************* Module salt.states.pip_state
/Users/chris/code/salt/salt/states/pip_state.py:476: [W1504(unidiomatic-typecheck), installed.<lambda>] Using type() instead of isinstance() for a typecheck.
************* Module salt.states.pkg
/Users/chris/code/salt/salt/states/pkg.py:227: [W1504(unidiomatic-typecheck), _find_install_targets] Using type() instead of isinstance() for a typecheck.
************* Module salt.pillar.pepa
/Users/chris/code/salt/salt/pillar/pepa.py:462: [W1504(unidiomatic-typecheck), ext_pillar] Using type() instead of isinstance() for a typecheck.
/Users/chris/code/salt/salt/pillar/pepa.py:464: [W1504(unidiomatic-typecheck), ext_pillar] Using type() instead of isinstance() for a typecheck.
2015-04-21 13:49:15 +01:00
Chris Rebert
03ae55c284 use is instead of == for class equality checks
************* Module salt.pillar.pepa
/Users/chris/code/salt/salt/pillar/pepa.py:460: [W1504(unidiomatic-typecheck), ext_pillar] Using type() instead of isinstance() for a typecheck.
************* Module salt.utils.process
/Users/chris/code/salt/salt/utils/process.py:225: [W1504(unidiomatic-typecheck), ProcessManager.add_process] Using type() instead of isinstance() for a typecheck.
2015-04-21 13:45:35 +01:00
Jayesh Kariya
2cfd1a4395 adding postfix unit test case 2015-04-21 17:36:07 +05:30
Jayesh Kariya
4aac4904b4 adding states/blockdev unit test case 2015-04-21 17:32:30 +05:30
Jayesh Kariya
7674fee99f adding states/aws_sqs unit test case 2015-04-21 17:30:48 +05:30
Dmitri Muntean
19f5d7e4e9 Remove duplicate and unused code in aws utils package
The code for canonical request and payload hash generation is duplicate.
timestamp is not used at all.
2015-04-21 15:46:15 +10:00
Dmitri Muntean
5a14389839 Encode spaces with %20 instead of plus sign in AWS request query strings
It is currently not possible to set tag values (or any other values in AWS query string)
to strings that contain spaces.

urlencode function from urllib replaces spaces with '+' (plus sign) to produce
application/x-www-form-urlencoded format, but AWS signing process document
explicitly talks about encoding spaces with %20 rather than '+' (see
http://docs.aws.amazon.com/general/latest/gr/sigv4-create-canonical-request.html)

There is an exiting issue raised in python bug tracker to have an ability to modify
this behaivour of urlencode (see https://bugs.python.org/issue13866). But until
it is resolved, this looks like the best way to go.
2015-04-21 15:33:49 +10:00
Justin Findlay
bf52ba77fd Merge pull request #22829 from F30/gen_locale-return-value
Always return a boolean in gen_locale()
2015-04-20 21:58:43 -06:00
Justin Findlay
7fe3efa0f9 Merge pull request #22848 from jayeshka/apache-states-unit-test
adding states/apache unit test case
2015-04-20 21:44:42 -06:00
Justin Findlay
15e869d540 Merge pull request #22849 from jayeshka/apt-states-unit-test
adding states/apt unit test case
2015-04-20 21:44:15 -06:00
Justin Findlay
42761ee346 Merge pull request #22846 from jayeshka/at-states-unit-test
adding states/at unit test case
2015-04-20 21:33:28 -06:00