From d9780453ff411a45804cdb3fc25964c3f046a4a0 Mon Sep 17 00:00:00 2001 From: Tim Laszlo Date: Mon, 18 Mar 2013 18:53:31 -0500 Subject: Revert last change --- src/lib/Bcfg2/settings.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src') diff --git a/src/lib/Bcfg2/settings.py b/src/lib/Bcfg2/settings.py index 5300d068f..9e6a815c7 100644 --- a/src/lib/Bcfg2/settings.py +++ b/src/lib/Bcfg2/settings.py @@ -27,10 +27,7 @@ DATABASE_PASSWORD = None DATABASE_HOST = None DATABASE_PORT = None -if HAS_DJANGO and django.VERSION[0] == 1 and django.VERSION[1] < 2: - TIME_ZONE = 'America/Chicago' -else: - TIME_ZONE = None +TIME_ZONE = None DEBUG = False TEMPLATE_DEBUG = DEBUG -- cgit v1.2.3-1-g7c22 From b4533e6cd9159f4d7e526978914c35e883ca3113 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Tue, 19 Mar 2013 09:36:23 -0500 Subject: Logger: Fix encoding traceback (#1140) Signed-off-by: Sol Jerome --- src/lib/Bcfg2/Logger.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/lib/Bcfg2/Logger.py b/src/lib/Bcfg2/Logger.py index c2eac1e60..89fa9fb79 100644 --- a/src/lib/Bcfg2/Logger.py +++ b/src/lib/Bcfg2/Logger.py @@ -105,7 +105,11 @@ class FragmentingSysLogHandler(logging.handlers.SysLogHandler): (self.encodePriority(self.facility, newrec.levelname.lower()), self.format(newrec)) try: - self.socket.send(msg.encode('ascii')) + try: + encoded = msg.encode('utf-8') + except UnicodeDecodeError: + encoded = msg + self.socket.send(encoded) except socket.error: for i in range(10): # pylint: disable=W0612 try: -- cgit v1.2.3-1-g7c22 From db29a7c5e8d8f4361d11df895ee5b34e2c21ae54 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Tue, 19 Mar 2013 09:43:07 -0500 Subject: Admin/Init: Fix traceback due to missing import Signed-off-by: Sol Jerome --- src/lib/Bcfg2/Server/Admin/Init.py | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/lib/Bcfg2/Server/Admin/Init.py b/src/lib/Bcfg2/Server/Admin/Init.py index 3e642ee49..613a76649 100644 --- a/src/lib/Bcfg2/Server/Admin/Init.py +++ b/src/lib/Bcfg2/Server/Admin/Init.py @@ -299,6 +299,7 @@ class Init(Bcfg2.Server.Admin.Mode): """Initialize each plugin-specific portion of the repository.""" for plugin in self.plugins: if plugin == 'Metadata': + import Bcfg2.Server.Plugins.Metadata Bcfg2.Server.Plugins.Metadata.Metadata.init_repo( self.data['repopath'], groups_xml=GROUPS % self.data['os_sel'], -- cgit v1.2.3-1-g7c22 From feef09953d2443d7d4d59cbf81d442380bea02ab Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Tue, 19 Mar 2013 14:13:59 -0400 Subject: fixed some pylint errors --- src/lib/Bcfg2/Client/Tools/YUM.py | 12 ++++++------ src/lib/Bcfg2/Server/Admin/Init.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/lib/Bcfg2/Client/Tools/YUM.py b/src/lib/Bcfg2/Client/Tools/YUM.py index 7764a6808..c9fae7fc7 100644 --- a/src/lib/Bcfg2/Client/Tools/YUM.py +++ b/src/lib/Bcfg2/Client/Tools/YUM.py @@ -289,7 +289,7 @@ class YUM(Bcfg2.Client.Tools.PkgTool): def missing_attrs(self, entry): """ Implementing from superclass to check for existence of either - name or group attribute for Package entry in the case of a YUM + name or group attribute for Package entry in the case of a YUM group. """ missing = Bcfg2.Client.Tools.PkgTool.missing_attrs(self, entry) @@ -456,16 +456,16 @@ class YUM(Bcfg2.Client.Tools.PkgTool): group_type = entry.get('choose', 'default') if group_type in ['default', 'optional', 'all']: group_packages += [p - for p, d in + for p, d in group.default_packages.items() if d] if group_type in ['optional', 'all']: group_packages += [p - for p, d in + for p, d in group.optional_packages.items() if d] if len(group_packages) == 0: - self.logger.error("No packages found for group %s" % + self.logger.error("No packages found for group %s" % entry.get("group")) for pkg in group_packages: # create package instances for each package in yum group @@ -478,7 +478,7 @@ class YUM(Bcfg2.Client.Tools.PkgTool): instance.attrib['version'] = newest['version'] instance.attrib['epoch'] = newest['epoch'] instance.attrib['release'] = newest['release'] - except: + except: # pylint: disable=W0702 self.logger.info("Error finding newest package " "for %s" % pkg) @@ -511,7 +511,7 @@ class YUM(Bcfg2.Client.Tools.PkgTool): continue # Ignore duplicate instances else: pkg_cache.append(nevra) - + self.logger.debug("Verifying: %s" % nevra2string(nevra)) # Set some defaults here diff --git a/src/lib/Bcfg2/Server/Admin/Init.py b/src/lib/Bcfg2/Server/Admin/Init.py index 613a76649..4b8d65597 100644 --- a/src/lib/Bcfg2/Server/Admin/Init.py +++ b/src/lib/Bcfg2/Server/Admin/Init.py @@ -13,6 +13,7 @@ import subprocess import Bcfg2.Server.Admin import Bcfg2.Server.Plugin import Bcfg2.Options +import Bcfg2.Server.Plugins.Metadata from Bcfg2.Compat import input # pylint: disable=W0622 # default config file @@ -299,7 +300,6 @@ class Init(Bcfg2.Server.Admin.Mode): """Initialize each plugin-specific portion of the repository.""" for plugin in self.plugins: if plugin == 'Metadata': - import Bcfg2.Server.Plugins.Metadata Bcfg2.Server.Plugins.Metadata.Metadata.init_repo( self.data['repopath'], groups_xml=GROUPS % self.data['os_sel'], -- cgit v1.2.3-1-g7c22 From fc3eb5bea78abfac86f0f4841f691272e118b7a6 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 20 Mar 2013 08:12:04 -0400 Subject: bcfg2-reports: fixed name of database config section --- src/sbin/bcfg2-reports | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/sbin/bcfg2-reports b/src/sbin/bcfg2-reports index 9f2ff96c2..2c4a918be 100755 --- a/src/sbin/bcfg2-reports +++ b/src/sbin/bcfg2-reports @@ -10,7 +10,7 @@ from Bcfg2.Compat import ConfigParser try: import Bcfg2.settings except ConfigParser.NoSectionError: - print("Your bcfg2.conf is currently missing the statistics section which " + print("Your bcfg2.conf is currently missing the [database] section which " "is necessary for the reporting interface. Please see bcfg2.conf(5) " "for more details.") sys.exit(1) @@ -121,7 +121,7 @@ def main(): help="Show hosts that haven't run in the last 24 " "hours") parser.add_option_group(allhostmodes) - + # entry modes entrymodes = \ OptionGroup(parser, "Entry Modes", @@ -166,7 +166,7 @@ def main(): (mode.get_opt_string(), opt.get_opt_string())) mode = opt mode_family = parser.get_option_group(opt.get_opt_string()) - + # you can specify more than one of --bad, --extra, --modified, --show, so # consider single-host options separately if not mode_family: @@ -174,7 +174,7 @@ def main(): if getattr(options, opt.dest): mode_family = parser.get_option_group(opt.get_opt_string()) break - + if not mode_family: parser.error("You must specify a mode") @@ -243,7 +243,7 @@ def main(): parser.error("%s require either a list of entries on the " "command line or the --file options" % mode_family.title) - + if options.badentry: result = hosts_by_entry_type(clients, "bad", entries) elif options.modifiedentry: @@ -263,7 +263,7 @@ def main(): # todo batch fetch this. sqlite could break for client in clients: - ents = entry_cls.objects.filter(name=entries[0][1], + ents = entry_cls.objects.filter(name=entries[0][1], interaction=client.current_interaction) if len(ents) == 0: continue -- cgit v1.2.3-1-g7c22 From 62fe861b93d08077ed2467855f95bf2c437f003b Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 20 Mar 2013 14:03:40 -0400 Subject: Inotify: produce better error when watching non-existent directory or file in such --- src/lib/Bcfg2/Server/FileMonitor/Inotify.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/lib/Bcfg2/Server/FileMonitor/Inotify.py b/src/lib/Bcfg2/Server/FileMonitor/Inotify.py index 178a47b1a..b44ff6970 100644 --- a/src/lib/Bcfg2/Server/FileMonitor/Inotify.py +++ b/src/lib/Bcfg2/Server/FileMonitor/Inotify.py @@ -2,6 +2,7 @@ support. """ import os +import errno import logging import pyinotify from Bcfg2.Compat import reduce # pylint: disable=W0622 @@ -182,6 +183,9 @@ class Inotify(Pseudo, pyinotify.ProcessEvent): try: watchdir = self.watches_by_path[watch_path] except KeyError: + if not os.path.exists(watch_path): + raise OSError(errno.ENOENT, + "No such file or directory: '%s'" % path) watchdir = self.watchmgr.add_watch(watch_path, self.mask, quiet=False)[watch_path] self.watches_by_path[watch_path] = watchdir -- cgit v1.2.3-1-g7c22 From 5feb76d97c6b26228dcf521659f434c6b576310c Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Thu, 21 Mar 2013 09:32:16 -0500 Subject: Version bump to 1.3.1 Signed-off-by: Sol Jerome --- src/lib/Bcfg2/Reporting/templates/base.html | 2 +- src/lib/Bcfg2/version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/lib/Bcfg2/Reporting/templates/base.html b/src/lib/Bcfg2/Reporting/templates/base.html index 67ff1fc36..c73339911 100644 --- a/src/lib/Bcfg2/Reporting/templates/base.html +++ b/src/lib/Bcfg2/Reporting/templates/base.html @@ -88,7 +88,7 @@
diff --git a/src/lib/Bcfg2/version.py b/src/lib/Bcfg2/version.py index 9ecd7f32d..6f3ba3e49 100644 --- a/src/lib/Bcfg2/version.py +++ b/src/lib/Bcfg2/version.py @@ -2,7 +2,7 @@ import re -__version__ = "1.3.0" +__version__ = "1.3.1" class Bcfg2VersionInfo(tuple): -- cgit v1.2.3-1-g7c22