updating sources, removing unneeded patches

e9
Clint Savage 12 years ago
commit 57ee89c936

4
.gitignore vendored

@ -12,4 +12,8 @@
/salt-0.11.1.tar.gz /salt-0.11.1.tar.gz
/salt-0.12.0.tar.gz /salt-0.12.0.tar.gz
/salt-0.12.1.tar.gz /salt-0.12.1.tar.gz
/salt-0.13.1.tar.gz
/salt-0.13.2.tar.gz
/salt-0.13.3.tar.gz
/salt-0.14.0.tar.gz
/salt-0.14.1.tar.gz /salt-0.14.1.tar.gz

@ -1,39 +0,0 @@
From 7a5a8b54b4a2c7ce8fa972a70693959835e65db8 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Wed, 16 Jan 2013 19:34:15 +0000
Subject: [PATCH] Defer imports to a later stage so Jinja2 does not become a
build dependency. Fixes #3293.
---
salt/utils/__init__.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/salt/utils/__init__.py b/salt/utils/__init__.py
index 290339d..11f428d 100644
--- a/salt/utils/__init__.py
+++ b/salt/utils/__init__.py
@@ -30,8 +30,6 @@
HAS_FNCTL = False
# Import salt libs
-import salt.minion
-import salt.payload
from salt.exceptions import SaltClientError, CommandNotFoundError
@@ -196,6 +194,12 @@ def daemonize_if(opts, **kwargs):
data[key[6:]] = val
if not 'jid' in data:
return
+
+ # Late import salt libs to overcome circular imports and to allow building
+ # salt without making Jinja2 a build dependency
+ import salt.minon
+ import salt.payload
+
serial = salt.payload.Serial(opts)
proc_dir = salt.minion.get_proc_dir(opts['cachedir'])
fn_ = os.path.join(proc_dir, data['jid'])
--
1.7.10

@ -1,45 +0,0 @@
From 56cf893eb2fb61a6010235eda2f35170cd81fefa Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Wed, 16 Jan 2013 20:14:43 +0000
Subject: [PATCH] Jinja2 is no longer a build dependency. Fixes #3293.
---
salt/utils/templates.py | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/salt/utils/templates.py b/salt/utils/templates.py
index a75bcb4..60631ce 100644
--- a/salt/utils/templates.py
+++ b/salt/utils/templates.py
@@ -12,14 +12,10 @@
import tempfile
import traceback
-# Import third party libs
-import jinja2
-import jinja2.ext
-
# Import salt libs
import salt.utils
import salt.exceptions
-from salt.utils.jinja import SaltCacheLoader as JinjaSaltCacheLoader
+
log = logging.getLogger(__name__)
@@ -72,6 +68,12 @@ def render_tmpl(tmplsrc, from_str=False, to_str=False,
def render_jinja_tmpl(tmplstr, context, tmplpath=None):
+ # Late import Jinja2 to allow building salt without making it a build
+ # dependency
+ import jinja2
+ import jinja2.ext
+ from salt.utils.jinja import SaltCacheLoader as JinjaSaltCacheLoader
+
opts = context['opts']
env = context['env']
loader = None
--
1.7.10

@ -1,3 +1,5 @@
56f586d9b1717bd414aa9657b6ee064b salt-0.12.0.tar.gz 56f586d9b1717bd414aa9657b6ee064b salt-0.12.0.tar.gz
693338c0a47138c8a7ec3564712a7035 salt-0.12.1.tar.gz 693338c0a47138c8a7ec3564712a7035 salt-0.12.1.tar.gz
22c8e5213084aa625c4ad89560072be8 salt-0.13.3.tar.gz
0f9fa32f208356e41ac8e0976e927b41 salt-0.14.0.tar.gz
7dcbdffb465451eb5a5c8466ccd064cf salt-0.14.1.tar.gz 7dcbdffb465451eb5a5c8466ccd064cf salt-0.14.1.tar.gz

Loading…
Cancel
Save