From d885152bedbdd289f7d6a3d24ab875fd4393bdff Mon Sep 17 00:00:00 2001 From: Łukasz 'sil2100' Zemczak Date: Thu, 15 Feb 2018 14:28:59 +0100 Subject: Import patches-unapplied version 2.2.21+really2.2.20-0ubuntu1~16.04.1 to ubuntu/xenial-proposed Imported using git-ubuntu import. Changelog parent: bdfe3a4fa9bd487ec5f40e829742e127476d2c8a New changelog entries: * Backport bionic version to xenial. * Revert to an older upstream release: 2.2.20 (LP: #1749589). - Rename upstream tarball to 2.2.21+really2.2.20 to end up with a temporarily higher version number than what's in the archive. * debian/patches/disable_import_test.patch: refreshed patch. --- azurelinuxagent/agent.py | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'azurelinuxagent/agent.py') diff --git a/azurelinuxagent/agent.py b/azurelinuxagent/agent.py index 4ab7aa0..e99f7be 100644 --- a/azurelinuxagent/agent.py +++ b/azurelinuxagent/agent.py @@ -63,9 +63,6 @@ class Agent(object): path="/var/log/waagent.log") logger.add_logger_appender(logger.AppenderType.CONSOLE, level, path="/dev/console") - logger.add_logger_appender(logger.AppenderType.TELEMETRY, - logger.LogLevel.WARNING, - path=event.add_log_event) ext_log_dir = conf.get_ext_log_dir() try: @@ -147,7 +144,7 @@ def main(args=[]): if command == "version": version() elif command == "help": - print(usage()) + usage() elif command == "start": start(conf_file_path=conf_file_path) else: @@ -231,16 +228,15 @@ def version(): def usage(): """ - Return agent usage message + Show agent usage """ - s = "\n" - s += ("usage: {0} [-verbose] [-force] [-help] " + print("") + print((("usage: {0} [-verbose] [-force] [-help] " "-configuration-path:" "-deprovision[+user]|-register-service|-version|-daemon|-start|" - "-run-exthandlers|-show-configuration]" - "").format(sys.argv[0]) - s += "\n" - return s + "-run-exthandlers]" + "").format(sys.argv[0]))) + print("") def start(conf_file_path=None): """ -- cgit v1.2.3