Skip to content

Commit

Permalink
Fixed auton and autond arguments.
Browse files Browse the repository at this point in the history
  • Loading branch information
Adrien Delle Cave committed Sep 6, 2019
1 parent 670da2f commit 5eea43f
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 22 deletions.
1 change: 1 addition & 0 deletions VERSION
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0.1.53
28 changes: 14 additions & 14 deletions bin/auton
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ __license__ = """
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
__version__ = '0.1.52'
__version__ = '0.1.53'

import argparse
import os
Expand Down Expand Up @@ -63,51 +63,51 @@ def argv_parse_check():
parser.add_argument("-a",
action = 'append',
dest = 'args',
type = six.u,
type = six.text_type,
default = [],
help = "Passed arguments")
parser.add_argument("-A",
action = 'append',
dest = 'argfiles',
type = six.u,
type = six.text_type,
default = [],
help = "Passed argument files")
parser.add_argument("--multi-args",
action = 'append',
dest = 'margs',
type = six.u,
type = six.text_type,
default = [],
help = "Passed multiple arguments (arguments splitted)")
parser.add_argument("--multi-argsfiles",
action = 'append',
dest = 'margsfiles',
type = six.u,
type = six.text_type,
default = [],
help = "Passed multiple arguments files (arguments splitted)")
parser.add_argument("--uri",
action = 'append',
dest = 'uri',
type = six.u,
type = six.text_type,
default = [],
help = "Auton daemon URI addresses")
parser.add_argument("--uid",
dest = 'uid',
type = six.u,
type = six.text_type,
default = os.environ.get('AUTON_UID') or ("%s" % uuid.uuid4()),
help = "Auton uid")
parser.add_argument("--endpoint",
dest = 'endpoint',
type = six.u,
type = six.text_type,
default = os.environ.get('AUTON_ENDPOINT'),
help = "Auton endpoint")
parser.add_argument("--auth-user",
dest = 'auth_user',
type = six.u,
type = six.text_type,
default = os.environ.get('AUTON_AUTH_USER'),
help = "Auton auth user")
parser.add_argument("--auth-passwd",
dest = 'auth_passwd',
type = six.u,
type = six.text_type,
default = os.environ.get('AUTON_AUTH_PASSWD'),
help = "Auton auth password")
parser.add_argument("--delay",
Expand All @@ -123,19 +123,19 @@ def argv_parse_check():
parser.add_argument("-e",
action = 'append',
dest = 'envvars',
type = six.u,
type = six.text_type,
default = [],
help = "Passed environment variables")
parser.add_argument("--envfile",
action = 'append',
dest = 'envfiles',
type = six.u,
type = six.text_type,
default = [],
help = "Passed envfile parameters")
parser.add_argument("--load-envfile",
action = 'append',
dest = 'load_envfiles',
type = six.u,
type = six.text_type,
default = [],
help = "Load environment variables from file")
parser.add_argument("-l",
Expand All @@ -146,7 +146,7 @@ def argv_parse_check():
"critical, error, warning, info, debug"))
parser.add_argument("--logfile",
dest = 'logfile',
type = six.u,
type = six.text_type,
default = AUTON_LOGFILE,
help = "Use log file <logfile> instead of %(default)s")
parser.add_argument("--no-return-code",
Expand Down
14 changes: 7 additions & 7 deletions bin/autond
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ __license__ = """
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
__version__ = '0.1.52'
__version__ = '0.1.53'

import argparse
import logging
Expand Down Expand Up @@ -85,32 +85,32 @@ def argv_parse_check():
help = "Foreground, don't daemonize")
parser.add_argument("-c",
dest = 'conffile',
type = six.u,
type = six.text_type,
default = '/etc/auton/auton.yml',
help = "Use configuration file <conffile> instead of %(default)s")
parser.add_argument("-p",
dest = 'pidfile',
type = six.u,
type = six.text_type,
default = AUTOND_PIDFILE,
help = "Use PID file <pidfile> instead of %(default)s")
parser.add_argument("-u",
dest = 'username',
type = six.u,
type = six.text_type,
default = AUTON_USER,
help = "Use username for the process instead of %(default)s")
parser.add_argument("-g",
dest = 'groupname',
type = six.u,
type = six.text_type,
default = AUTON_GROUP,
help = "Use groupname for the process instead of %(default)s")
parser.add_argument("--logfile",
dest = 'logfile',
type = six.u,
type = six.text_type,
default = AUTOND_LOGFILE,
help = "Use log file <logfile> instead of %(default)s")
parser.add_argument("--listen-addr",
dest = 'listen_addr',
type = six.u,
type = six.text_type,
help = "Listen on address <listen_addr>")
parser.add_argument("--listen-port",
dest = 'listen_port',
Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
auton (0.1.53) unstable; urgency=medium

* Fixed auton and autond arguments.

-- Adrien DELLE CAVE <adrien.delle.cave@commandersact.com> Fri, 06 Sep 2019 17:09:44 +0200

auton (0.1.52) unstable; urgency=medium

* Fixed auton stdout.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import os
from setuptools import find_packages, setup

version = '0.1.52'
version = '0.1.53'

current_dir = os.path.abspath(os.path.dirname(__file__))

Expand Down

0 comments on commit 5eea43f

Please sign in to comment.