From 38e5d2b2cbcad75a54a3550d577b89f7da4a3eb9 Mon Sep 17 00:00:00 2001 From: Markus Gattol Date: Mon, 14 Nov 2011 15:49:06 +0000 Subject: [PATCH] file permissions: from 775 to 755 Signed-off-by: Markus Gattol --- scripts/salt | 1 + scripts/salt-call | 1 + scripts/salt-cp | 1 + scripts/salt-key | 2 ++ scripts/salt-master | 4 +++- scripts/salt-minion | 4 +++- scripts/salt-run | 1 + scripts/salt-syndic | 4 +++- setup.py | 9 +++++---- 9 files changed, 20 insertions(+), 7 deletions(-) diff --git a/scripts/salt b/scripts/salt index 485d0b7f297..6d97d6c51b8 100644 --- a/scripts/salt +++ b/scripts/salt @@ -5,6 +5,7 @@ Publish commands to the salt system from the command line on the master. import salt.cli + def main(): ''' The main function diff --git a/scripts/salt-call b/scripts/salt-call index 6bbf3919c7c..c2e929064ad 100644 --- a/scripts/salt-call +++ b/scripts/salt-call @@ -6,6 +6,7 @@ minion to run. import salt.cli + def main(): ''' The main function diff --git a/scripts/salt-cp b/scripts/salt-cp index f07747707ae..0c5ea0b0402 100644 --- a/scripts/salt-cp +++ b/scripts/salt-cp @@ -5,6 +5,7 @@ Publish commands to the salt system from the command line on the master. import salt.cli + def main(): ''' The main function diff --git a/scripts/salt-key b/scripts/salt-key index 1b51116db71..852366de0f7 100644 --- a/scripts/salt-key +++ b/scripts/salt-key @@ -2,8 +2,10 @@ ''' Manage the authentication keys with salt-key ''' + import salt.cli + def main(): ''' The main function diff --git a/scripts/salt-master b/scripts/salt-master index de9ae8d5549..e409281e5ce 100644 --- a/scripts/salt-master +++ b/scripts/salt-master @@ -1,9 +1,11 @@ #!/usr/bin/env python2 ''' -Start the salt-master +Start the salt-master ''' + import salt + def main(): ''' The main function diff --git a/scripts/salt-minion b/scripts/salt-minion index 0fdd223530f..6992f17a95d 100644 --- a/scripts/salt-minion +++ b/scripts/salt-minion @@ -2,8 +2,10 @@ ''' This script is used to kick off a salt minion daemon ''' -import salt + import os +import salt + def main(): ''' diff --git a/scripts/salt-run b/scripts/salt-run index 42be949e17a..3fff3d08faa 100644 --- a/scripts/salt-run +++ b/scripts/salt-run @@ -5,6 +5,7 @@ Execute a salt convenience routine import salt.cli + def main(): ''' The main function diff --git a/scripts/salt-syndic b/scripts/salt-syndic index 84ff3cb269e..b122993bfac 100644 --- a/scripts/salt-syndic +++ b/scripts/salt-syndic @@ -2,8 +2,10 @@ ''' This script is used to kick off a salt syndic daemon ''' -import salt + import os +import salt + def main(): ''' diff --git a/setup.py b/setup.py index 6f6f7a83335..e4b762e0e46 100755 --- a/setup.py +++ b/setup.py @@ -2,14 +2,15 @@ ''' The setup script for salt ''' -import os -import sys + +from Cython.Distutils import build_ext from distutils import log from distutils.cmd import Command from distutils.core import setup from distutils.extension import Extension from distutils.sysconfig import get_python_lib, PREFIX -from Cython.Distutils import build_ext +import os +import sys from salt import __version__ @@ -41,7 +42,7 @@ setup( author='Thomas S Hatch', author_email='thatch45@gmail.com', url='https://github.com/thatch45/salt', - classifiers = [ + classifiers=[ 'Programming Language :: Python', 'Programming Language :: Cython', 'Programming Language :: Python :: 2.6',