Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64138 discussions

Check_MK Git: check_mk: Merge branch 'master' of git@mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 830fc690e9a3599999a0d812bcdfea43dd380d2d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=830fc690e9a359… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 4 17:52:06 2010 +0100 Merge branch 'master' of git@mathias-kettner.de:check_mk Conflicts: ChangeLog ---

13 years, 10 months

Check_MK Git: check_mk: tcp_conn_stats: Fixed inventory function when no conn stats can be inventoried,

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ccf1301bb0a25d7eec1d5704bcda7988429d8ad5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ccf1301bb0a25d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 4 12:05:00 2010 +0100 tcp_conn_stats: Fixed inventory function when no conn stats can be inventoried, Inventory: Better error handling on invalid inventory result of checks --- ChangeLog | 2 ++ checks/tcp_conn_stats | 1 + modules/check_mk.py | 5 +++++ 3 files changed, 8 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 107cbcb..7192f3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * Packages (MKP): Allow to create and install packages within OMD! Files are installed below ~/local/share/check_mk. No root permissions are neccessary + * Inventory: Better error handling on invalid inventory result of checks Checks & Agents: * megaraid_pdisks: Using the real enclosure number as check item now @@ -26,6 +27,7 @@ power-state of IBM Bladecenter blades * win_dhcp_pools: Several cleanups in check * heartbeat_rscstatus: Catching empty output from agent correctly + * tcp_conn_stats: Fixed inventory function when no conn stats can be inventoried Multisite: * The custom open/close states of custom links are now stored for each diff --git a/checks/tcp_conn_stats b/checks/tcp_conn_stats index e745879..223f872 100644 --- a/checks/tcp_conn_stats +++ b/checks/tcp_conn_stats @@ -43,6 +43,7 @@ tcp_conn_stats_default_levels = { } def inventory_tcp_conn_stats(checkname, info): if len(info) > 0: return [ (None, 'tcp_conn_stats_default_levels') ] + return [] def check_tcp_conn_stats(item, params, info): stats = dict(info) diff --git a/modules/check_mk.py b/modules/check_mk.py index 7d76c07..7d45f4b 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1670,6 +1670,11 @@ def make_inventory(checkname, hostnamelist, check_only=False): sys.stderr.write("%s: Invalid output from agent or invalid configuration: %s\n" % (hostname, e)) continue + if not isinstance(inventory, list): + sys.stderr.write("%s: Check %s returned invalid inventory data: %s\n" % + (hostname, checkname, repr(inventory))) + continue + for entry in inventory: if len(entry) == 2: # comment is now obsolete item, paramstring = entry

13 years, 10 months

Check_MK Git: check_mk: Updated ChangeLog

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: c19d8d51514612729b41a570ee60c0c71554eb17 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c19d8d51514612… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 4 16:50:28 2010 +0100 Updated ChangeLog --- ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 24ae6b6..d3a3559 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,8 @@ * Packages (MKP): Allow to create and install packages within OMD! Files are installed below ~/local/share/check_mk. No root permissions are neccessary + * setup.sh: fix problem with missing package_info (only appears if setup + is called from another directory) Checks & Agents: * megaraid_pdisks: Using the real enclosure number as check item now

13 years, 10 months

Check_MK Git: check_mk: FIX: fix problem with missing package_info at setup .sh

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: c8b4beac20dbe394b65c7449424f86d97ec2338a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8b4beac20dbe3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 4 16:47:05 2010 +0100 FIX: fix problem with missing package_info at setup.sh This appears only, if setup is not called with ./ from the current directory. --- scripts/setup.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/setup.sh b/scripts/setup.sh index 1a2287a..ef5dd4a 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -658,7 +658,7 @@ do fi && mkdir -p $DESTDIR$vardir/packages && - install -m 644 package_info $DESTDIR$vardir/packages/check_mk && + install -m 644 $SRCDIR/package_info $DESTDIR$vardir/packages/check_mk && mkdir -p $DESTDIR$apache_config_dir && if [ ! -e $DESTDIR$apache_config_dir/$NAME -a ! -e $DESTDIR$apache_config_dir/zzz_$NAME.conf ]

13 years, 10 months

Check_MK Git: check_mk: heartbeat_nodes: fix Linux agent for hostnames with upper case letters

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: a3e17cf9e4c9b1a717854ca20644d4a286ec7182 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3e17cf9e4c9b1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 4 16:13:15 2010 +0100 heartbeat_nodes: fix Linux agent for hostnames with upper case letters --- ChangeLog | 2 ++ agents/check_mk_agent.linux | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 107cbcb..24ae6b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,8 @@ power-state of IBM Bladecenter blades * win_dhcp_pools: Several cleanups in check * heartbeat_rscstatus: Catching empty output from agent correctly + * heartbeat_nodes: fix Linux agent for hostname with upper case letters (thanks to + Thorsten Robers) Multisite: * The custom open/close states of custom links are now stored for each diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index c3c2f14..ebcf520 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -287,7 +287,7 @@ if which cl_status > /dev/null 2>&1; then echo '<<<heartbeat_nodes>>>' for NODE in $(cl_status listnodes); do - if [ $NODE != $HOSTNAME ]; then + if [ $NODE != $(echo $HOSTNAME | tr 'A-Z' 'a-z') ]; then STATUS=$(cl_status nodestatus $NODE) echo -n "$NODE $STATUS" for LINK in $(cl_status listhblinks $NODE 2>/dev/null); do

13 years, 10 months

Check_MK Git: check_mk: Merge branch 'master' of git@mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8ab59f0741bc877618a921114db31dd41821804b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ab59f0741bc87… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 3 18:39:48 2010 +0100 Merge branch 'master' of git@mathias-kettner.de:check_mk Conflicts: ChangeLog ---

13 years, 10 months

Check_MK Git: check_mk: heartbeat_rscstatus: Catching empty output from agent correctly

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a245df1865a797e648c20f72cb57461f6ed54e92 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a245df1865a797… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 3 08:48:15 2010 +0100 heartbeat_rscstatus: Catching empty output from agent correctly --- ChangeLog | 4 ++++ checks/heartbeat_rscstatus | 3 +++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 567f5b3..4b2ef27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +1.1.8p1 + Checks & Agents: + * heartbeat_rscstatus: Catching empty output from agent correctly + 1.1.8: Core, Setup, etc.: * setup.sh: turn off Python debugging diff --git a/checks/heartbeat_rscstatus b/checks/heartbeat_rscstatus index 484a34d..03a127e 100644 --- a/checks/heartbeat_rscstatus +++ b/checks/heartbeat_rscstatus @@ -36,6 +36,9 @@ def inventory_heartbeat_rscstatus(checktype, info): return [ (None, '"%s"' % line[0]) for line in info if line[0] != '' ] def check_heartbeat_rscstatus(item, expectedState, info): + if len(info) == 0 or len(info[0]) == 0: + return (3, "UNKNOWN - Got no data from agent") + if info[0][0] == expectedState: return (0, "OK - Current state: %s" % (info[0][0])) else:

13 years, 10 months

Check_MK Git: check_mk: Updated internal doku

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4977edf7e7648357b8fdd5180f8add01d3a71321 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4977edf7e76483… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 3 18:06:41 2010 +0100 Updated internal doku --- LIESMICH.zutun | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/LIESMICH.zutun b/LIESMICH.zutun index 395cd19..57f7413 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -1,7 +1,5 @@ --------------------------------------------------------------------------------- -BUGS beheben bis => 1.1.8 --------------------------------------------------------------------------------- -CHECK_MK: +Doku: Check_MK und OMD: Installieren von MKPs, local-Hierarchie + -------------------------------------------------------------------------------- BUGS beheben ab 1.1.9i1

13 years, 10 months

Check_MK Git: check_mk: MKP's under OMD also honor multisite extensions

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e61d685f87f5019d5ae1fd7a7379b5fdff35800b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e61d685f87f501… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 3 16:37:48 2010 +0100 MKP's under OMD also honor multisite extensions --- web/.f12 | 4 +--- web/htdocs/.f12 | 1 + web/htdocs/config.py | 7 +++++++ web/htdocs/index.py | 9 ++++++++- web/htdocs/sidebar.py | 6 ++++++ web/htdocs/views.py | 7 +++++++ web/plugins/views/perfometer.py | 6 ++++++ 7 files changed, 36 insertions(+), 4 deletions(-) diff --git a/web/.f12 b/web/.f12 index 70026e4..27c68e1 100644 --- a/web/.f12 +++ b/web/.f12 @@ -1,4 +1,2 @@ -sudo rsync -varx --delete --exclude=defaults.py htdocs plugins /usr/share/check_mk/web/ -sudo /etc/init.d/apache2 restart -#sudo /etc/init.d/apache2 reload +sudo cp -prv * /omd/versions/default/share/check_mk/web/ diff --git a/web/htdocs/.f12 b/web/htdocs/.f12 new file mode 100644 index 0000000..6c63611 --- /dev/null +++ b/web/htdocs/.f12 @@ -0,0 +1 @@ +sudo cp -v *.py /omd/versions/default/share/check_mk/web/htdocs diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 89eb3cc..76057d7 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -38,6 +38,13 @@ except NameError: # Base directory of dynamic configuration config_dir = defaults.var_dir + "/web" +# Detect if we are running on OMD +try: + defaults.omd_site +except: + defaults.omd_site = None + defaults.omd_root = None + def load_config(): # reset settings which can be changed at runtime to # default values. Otherwise they stick to their changed diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 15c56cd..27c781b 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. from mod_python import apache,util -import os, livestatus +import os, sys, livestatus from lib import * import config, htmllib, defaults @@ -35,6 +35,13 @@ pagehandlers_dir = defaults.web_dir + "/plugins/pages" for fn in os.listdir(pagehandlers_dir): if fn.endswith(".py"): execfile(pagehandlers_dir + "/" + fn) +if defaults.omd_root: + sys.path.append(defaults.omd_root + "/local/share/check_mk/web/htdocs") + local_pagehandlers_dir = defaults.omd_root + "/local/share/check_mk/web/plugins/pages" + if os.path.exists(local_pagehandlers_dir): + for fn in os.listdir(local_pagehandlers_dir): + if fn.endswith(".py"): + execfile(local_pagehandlers_dir + "/" + fn) def read_get_vars(req): diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 8dec507..7a3b348 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -37,6 +37,12 @@ snapins_dir = defaults.web_dir + "/plugins/sidebar" for fn in os.listdir(snapins_dir): if fn.endswith(".py"): execfile(snapins_dir + "/" + fn) +if defaults.omd_root: + local_snapins_dir = defaults.omd_root + "/local/share/check_mk/web/plugins/sidebar" + if os.path.exists(local_snapins_dir): + for fn in os.listdir(local_snapins_dir): + if fn.endswith(".py"): + execfile(local_snapins_dir + "/" + fn) # Declare permissions: each snapin creates one permission config.declare_permission_section("sidesnap", "Sidebar snapins") diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 37a7be0..c3f147b 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -172,6 +172,12 @@ plugins_path = defaults.web_dir + "/plugins/views" for fn in os.listdir(plugins_path): if fn.endswith(".py"): execfile(plugins_path + "/" + fn) +if defaults.omd_root: + local_plugins_path = defaults.omd_root + "/local/share/check_mk/web/plugins/views" + if os.path.exists(local_plugins_path): + for fn in os.listdir(local_plugins_path): + if fn.endswith(".py"): + execfile(local_plugins_path + "/" + fn) # Declare permissions for builtin views config.declare_permission_section("view", "Builtin views") @@ -816,6 +822,7 @@ def create_view(): def page_view(h): global html html = h + load_views() view_name = html.var("view_name") view = html.available_views.get(view_name) diff --git a/web/plugins/views/perfometer.py b/web/plugins/views/perfometer.py index 9bfd5f3..99564e7 100644 --- a/web/plugins/views/perfometer.py +++ b/web/plugins/views/perfometer.py @@ -65,6 +65,12 @@ perfometer_plugins_dir = defaults.web_dir + "/plugins/perfometer" for fn in os.listdir(perfometer_plugins_dir): if fn.endswith(".py"): execfile(perfometer_plugins_dir + "/" + fn) +if defaults.omd_root: + local_perfometer_plugins_dir = defaults.omd_root + "/local/share/check_mk/web/plugins/perfometer" + if os.path.exists(local_perfometer_plugins_dir): + for fn in os.listdir(local_perfometer_plugins_dir): + if fn.endswith(".py"): + execfile(local_perfometer_plugins_dir + "/" + fn) def paint_perfometer(row):

13 years, 10 months

Check_MK Git: check_mk: Allow to install MKP packages in OMD

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 27292bf35b1729817246172f112f6838f54ab86e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27292bf35b1729… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 3 15:23:10 2010 +0100 Allow to install MKP packages in OMD --- ChangeLog | 3 ++ modules/check_mk.py | 66 +++++++++++++++++++++++++++++++++++++++++-------- modules/packaging.py | 33 +++++++++++++++++------- 3 files changed, 81 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index d769641..d87eb62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,9 @@ then after an error with one of those two agents checks from the other haven't been executed. This is fixed now. Inventory check is still not complete in that error condition. + * Packages (MKP): Allow to create and install packages within OMD! + Files are installed below ~/local/share/check_mk. No root permissions + are neccessary Checks & Agents: * megaraid_pdisks: Using the real enclosure number as check item now diff --git a/modules/check_mk.py b/modules/check_mk.py index b1cd68c..7d76c07 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -43,6 +43,28 @@ else: opt_debug = False opt_config_check = False +# are we running OMD? If yes, honor local/ hierarchy +omd_root = os.getenv("OMD_ROOT", None) +if omd_root: + local_share = omd_root + "/local/share/check_mk" + local_checks_dir = local_share + "/checks" + local_check_manpages_dir = local_share + "/checkman" + local_agents_dir = local_share + "/agents" + local_web_dir = local_share + "/web" + local_pnp_templates_dir = local_share + "/pnp-templates" + local_pnp_rraconf_dir = local_share + "/pnp-rraconf" + local_doc_dir = omd_root + "/local/share/doc/check_mk" +else: + local_checks_dir = None + local_check_manpages_dir = None + local_agents_dir = None + local_web_dir = None + local_pnp_templates_dir = None + local_pnp_rraconf_dir = None + local_doc_dir = None + + + # +----------------------------------------------------------------------+ # | ____ _ _ | # | | _ \ __ _| |_| |__ _ __ __ _ _ __ ___ ___ ___ | @@ -349,7 +371,10 @@ def precompile_filesystem_levels(host, item, params): # Do not read in the checks if check_mk is called as module if __name__ == "__main__": - for f in glob.glob(checks_dir + "/*"): + filelist = glob.glob(checks_dir + "/*") + if local_checks_dir: + filelist += glob.glob(local_checks_dir + "/*") + for f in filelist: if not f.endswith("~"): # ignore emacs-like backup files try: execfile(f) @@ -1809,6 +1834,8 @@ def reread_autochecks(): # +----------------------------------------------------------------------+ def find_check_plugin(checktype): + if local_checks_dir and os.path.exists(local_checks_dir + "/" + checktype): + return local_checks_dir + "/" + checktype filename = checks_dir + "/" + checktype if os.path.exists(filename): return filename @@ -2026,20 +2053,27 @@ def get_tty_size(): return (24, 80) +def all_manuals(): + entries = dict([(fn, check_manpages_dir + "/" + fn) for fn in os.listdir(check_manpages_dir)]) + if local_check_manpages_dir and os.path.exists(local_check_manpages_dir): + entries.update(dict([(fn, local_check_manpages_dir + "/" + fn) for fn in os.listdir(local_check_manpages_dir)])) + return entries + def list_all_manuals(): table = [] - for filename in os.listdir(check_manpages_dir): + for filename, path in all_manuals().items(): if filename.endswith("~"): continue + try: - for line in file(check_manpages_dir + "/" + filename): + for line in file(path): if line.startswith("title:"): table.append((filename, line.split(":", 1)[1].strip())) except: pass table.sort() - print_table(['Check type', 'Title'], [tty_blue, tty_cyan], table) + print_table(['Check type', 'Title'], [tty_bold, tty_normal], table) def show_check_manual(checkname): bg_color = 4 @@ -2054,11 +2088,9 @@ def show_check_manual(checkname): parameters_color = tty(6,4,1) examples_color = tty(6,4,1) - filename = check_manpages_dir + "/" + checkname - try: - f = file(filename) - except: - print "No manpage for %s. Sorry." % checkname + filename = all_manuals().get(checkname) + if not filename: + sys.stdout.write("No manpage for %s. Sorry." % checkname) return sections = {} @@ -2069,7 +2101,7 @@ def show_check_manual(checkname): empty_line_count = 0 try: - for line in f: + for line in file(filename): lineno += 1 if line.startswith(' ') and line.strip() != "": # continuation line empty_line_count = 0 @@ -2100,7 +2132,6 @@ def show_check_manual(checkname): current_variable, restofline = line.split(':', 1) current_section.append((current_variable, restofline.lstrip())) except Exception, e: - print current_section sys.stderr.write("Syntax error in %s line %d (%s).\n" % (filename, lineno, e)) sys.exit(1) @@ -2633,6 +2664,7 @@ def show_paths(): conf = 2 data = 3 pipe = 4 + local = 5 dir = 1 fil = 2 @@ -2671,6 +2703,17 @@ def show_paths(): ( livestatus_unix_socket, fil, pipe, "Socket of Check_MK's livestatus module"), ] + if omd_root: + paths += [ + ( local_checks_dir, dir, local, "Locally installed checks"), + ( local_check_manpages_dir, dir, local, "Locally installed check man pages"), + ( local_agents_dir, dir, local, "Locally installed agents and plugins"), + ( local_web_dir, dir, local, "Locally installed Multisite addons"), + ( local_pnp_templates_dir, dir, local, "Locally installed PNP templates"), + ( local_pnp_rraconf_dir, dir, local, "Locally installed PNP RRA configuration"), + ( local_doc_dir, dir, local, "Locally installed documentation"), + ] + def show_paths(title, t): if t != inst: print @@ -2686,6 +2729,7 @@ def show_paths(): ( "Configuration files edited by you", conf ), ( "Data created by Nagios/Check_MK at runtime", data ), ( "Sockets and pipes", pipe ), + ( "Locally installed addons", local ), ]: show_paths(title, t) diff --git a/modules/packaging.py b/modules/packaging.py index 371a5ff..b241deb 100644 --- a/modules/packaging.py +++ b/modules/packaging.py @@ -34,21 +34,25 @@ class PackageException(Exception): def __str__(self): return self.reason -pac_dir = var_dir + "/packages/" +if omd_root: + pac_dir = omd_root + "/var/check_mk/packages/" +else: + pac_dir = var_dir + "/packages/" try: os.makedirs(pac_dir) except: pass -package_parts = [ - ( "checks", "Checks", checks_dir ), - ( "checkman", "Checks' man pages", check_manpages_dir ), - ( "agents", "Agents", agents_dir ), - ( "web", "Multisite extensions", web_dir ), - ( "pnp-templates", "PNP4Nagios templates", pnp_templates_dir ), - ( "pnp-rraconf", "RRA configuration for PNP", pnp_rraconf_dir ), - ( "doc", "Documentation files", doc_dir ), -] +# in case of local directories (OMD) use those instead +package_parts = [ (part, title, ldir and ldir or dir) for part, title, dir, ldir in [ + ( "checks", "Checks", checks_dir, local_checks_dir), + ( "checkman", "Checks' man pages", check_manpages_dir, local_check_manpages_dir ), + ( "agents", "Agents", agents_dir, local_agents_dir ), + ( "web", "Multisite extensions", web_dir, local_web_dir ), + ( "pnp-templates", "PNP4Nagios templates", pnp_templates_dir, local_pnp_templates_dir ), + ( "pnp-rraconf", "RRA configuration for PNP", pnp_rraconf_dir, local_pnp_rraconf_dir ), + ( "doc", "Documentation files", doc_dir, local_doc_dir ), +]] def packaging_usage(): sys.stdout.write("""Usage: check_mk [-v] -P|--package COMMAND [ARGS] @@ -140,6 +144,8 @@ def show_package(name, show_info = False): package = read_package(name) if not package: raise PackageException("No such package %s." % name) + if show_info: + sys.stdout.write("Package file: %s%s\n" % (pac_dir, name)) except PackageException: raise except Exception, e: @@ -360,6 +366,10 @@ def package_install(args): verbose(" %s%s%s:\n" % (tty_bold, title, tty_normal)) for fn in filenames: verbose(" %s\n" % fn) + # make sure target directory exists + if not os.path.exists(dir): + verbose(" Creating directory %s\n" % dir) + os.makedirs(dir) tarsource = tar.extractfile(part + ".tar") subtar = "tar xf - -C %s %s" % (dir, " ".join(filenames)) tardest = os.popen(subtar, "w") @@ -388,6 +398,9 @@ def package_install(args): def files_in_dir(part, dir, prefix = ""): + if not os.path.exists(dir): + return [] + # Handle case where one part-dir lies below another taboo_dirs = [ d for p, t, d in package_parts if p != part ] if dir in taboo_dirs:

13 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits