From f113d90043b4844abb8a3ba3fdd325254281d048 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Fri, 22 Mar 2013 16:33:05 -0500 Subject: Reports: Fix deprecated Django settings (reported by jonten) Signed-off-by: Sol Jerome --- src/lib/Bcfg2/settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/lib/Bcfg2/settings.py b/src/lib/Bcfg2/settings.py index 9e6a815c7..1ffeb2056 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(): @@ -144,7 +144,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. -- cgit v1.2.3-1-g7c22 From dc5ec0f8899f2a15aea34468899b7b9237874828 Mon Sep 17 00:00:00 2001 From: Jon Norman Date: Sat, 23 Mar 2013 21:20:32 +0100 Subject: Added trailing / on MEDIA_URL to get rid of deprecated warnings --- src/lib/Bcfg2/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/lib/Bcfg2/settings.py b/src/lib/Bcfg2/settings.py index 1ffeb2056..7d405f868 100644 --- a/src/lib/Bcfg2/settings.py +++ b/src/lib/Bcfg2/settings.py @@ -106,7 +106,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 -- cgit v1.2.3-1-g7c22 From 395e7c29981779113d1c9d83f341a967d093eade Mon Sep 17 00:00:00 2001 From: DongInn Kim Date: Sat, 23 Mar 2013 22:04:46 -0400 Subject: Try to update the ticket #1147 --- src/lib/Bcfg2/Client/Tools/VCS.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') 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 -- cgit v1.2.3-1-g7c22 From 74ffce78c79982d9bf720b3f52491ff6de8b688f Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Sun, 24 Mar 2013 04:51:34 -0400 Subject: client: actually return probe data to server --- src/lib/Bcfg2/Client/Client.py | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/lib/Bcfg2/Client/Client.py b/src/lib/Bcfg2/Client/Client.py index 88f3bd6ef..2df0b11cd 100644 --- a/src/lib/Bcfg2/Client/Client.py +++ b/src/lib/Bcfg2/Client/Client.py @@ -105,6 +105,7 @@ class Client(object): self._probe_failure(name, "Return value %s" % rv) self.logger.info("Probe %s has result:" % name) self.logger.info(rv.stdout) + ret.text = rv.stdout finally: os.unlink(scriptname) except SystemExit: -- cgit v1.2.3-1-g7c22 From fe7a3e9c7a7d66cccbd825465cefcf88165a0c3a Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Mon, 25 Mar 2013 10:06:40 -0400 Subject: Packages: expose full source list via Connector interface --- src/lib/Bcfg2/Server/Plugins/Packages/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') 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 -- cgit v1.2.3-1-g7c22