diff options
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/VCS.py | 3 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/__init__.py | 4 | ||||
| -rw-r--r-- | src/lib/Bcfg2/settings.py | 6 | ||||
| -rwxr-xr-x | tools/upgrade/1.3/migrate_dbstats.py | 3 |
4 files changed, 11 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/VCS.py b/src/lib/Bcfg2/Client/Tools/VCS.py index fa3d22e1d..1ab867215 100644 --- a/src/lib/Bcfg2/Client/Tools/VCS.py +++ b/src/lib/Bcfg2/Client/Tools/VCS.py @@ -120,8 +120,9 @@ class VCS(Bcfg2.Client.Tools.Tool): def Installsvn(self, entry): """Checkout contents from a svn repository""" # pylint: disable=E1101 + client = pysvn.Client() try: - client = pysvn.Client.update(entry.get('name'), recurse=True) + client.update(entry.get('name'), recurse=True) except pysvn.ClientError: self.logger.error("Failed to update repository", exc_info=1) return False diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py index c3eadc6bb..308a0efc4 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py @@ -5,6 +5,7 @@ determine the completeness of the client configuration. """ import os import sys import glob +import copy import shutil import lxml.etree import Bcfg2.Logger @@ -536,7 +537,8 @@ class Packages(Bcfg2.Server.Plugin.Plugin, :return: dict of lists of ``url_map`` data """ collection = self.get_collection(metadata) - return dict(sources=collection.get_additional_data()) + return dict(sources=collection.get_additional_data(), + allsources=copy.deepcopy(self.sources)) def end_client_run(self, metadata): """ Hook to clear the cache for this client in diff --git a/src/lib/Bcfg2/settings.py b/src/lib/Bcfg2/settings.py index 708bc59b2..de2ef5960 100644 --- a/src/lib/Bcfg2/settings.py +++ b/src/lib/Bcfg2/settings.py @@ -32,7 +32,7 @@ TIME_ZONE = None DEBUG = False TEMPLATE_DEBUG = DEBUG -MEDIA_URL = '/site_media' +MEDIA_URL = '/site_media/' def _default_config(): @@ -98,7 +98,7 @@ def read_config(cfile=DEFAULT_CONFIG, repo=None, quiet=False): if setup['web_prefix']: MEDIA_URL = setup['web_prefix'].rstrip('/') + MEDIA_URL else: - MEDIA_URL = '/site_media' + MEDIA_URL = '/site_media/' # initialize settings from /etc/bcfg2-web.conf or /etc/bcfg2.conf, or # set up basic defaults. this lets manage.py work in all cases @@ -136,7 +136,7 @@ MEDIA_ROOT = '' # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a # trailing slash. -ADMIN_MEDIA_PREFIX = '/media/' +STATIC_URL = '/media/' #TODO - make this unique # Make this unique, and don't share it with anybody. diff --git a/tools/upgrade/1.3/migrate_dbstats.py b/tools/upgrade/1.3/migrate_dbstats.py index 69d9514df..cbd2a6099 100755 --- a/tools/upgrade/1.3/migrate_dbstats.py +++ b/tools/upgrade/1.3/migrate_dbstats.py @@ -246,6 +246,9 @@ def _restructure(): failures = [] int_count = legacy_models.Interaction.objects.count() + if int_count == 0: + logger.error("Found no legacy interactions") + return False int_ctr = 0 start_time = 0 for inter in BatchFetch(legacy_models.Interaction.objects.\ |