Hello,

Patch 21:
This is a patch for https://fedorahosted.org/freeipa/ticket/3724

Patch 22:
This is part of https://fedorahosted.org/freeipa/ticket/4316 and adds the
API to 'ipa env'

One question that I had for adding 'ipa --version' is if using the default
optparse version argument would be sufficient/intended i.e.
version=('Version: %s, API_Version: %s' % (version, api_version) or if a
custom optparse argument is needed.

Thanks,

Gabe
From 6d69da44fa6d95c6e67b8071d587f57fdd61ecbb Mon Sep 17 00:00:00 2001
From: Gabe <[email protected]>
Date: Tue, 3 Jun 2014 16:33:08 -0600
Subject: [PATCH] ipautil.run args log message is confusing

- Use python lists for args in ipautil

https://fedorahosted.org/freeipa/ticket/3724
---
 ipapython/ipautil.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py
index ce4c978385ba681d2925dfd4816cb1f334d3a1c2..4d86b8cd0620242f41b2ffbed9ab4e32a77ec925 100644
--- a/ipapython/ipautil.py
+++ b/ipapython/ipautil.py
@@ -301,7 +301,7 @@ def run(args, stdin=None, raiseonerr=True,
         p_out = subprocess.PIPE
         p_err = subprocess.PIPE
 
-    arg_string = nolog_replace(' '.join(args), nolog)
+    arg_string = nolog_replace(args, nolog)
     root_logger.debug('Starting external process')
     root_logger.debug('args=%s' % arg_string)
 
-- 
1.9.3

From efc311adb0a8e9ca12b0abe22f134967ecd1f9fe Mon Sep 17 00:00:00 2001
From: Gabe <[email protected]>
Date: Tue, 3 Jun 2014 16:41:55 -0600
Subject: [PATCH] Add API version to env

Part of:
https://fedorahosted.org/freeipa/ticket/4316
---
 ipalib/constants.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ipalib/constants.py b/ipalib/constants.py
index e98eee6f8bcf2c227daa88327326b4dd850fbfe0..2269189f443844f77f3d8499cda3b88ae6d1d760 100644
--- a/ipalib/constants.py
+++ b/ipalib/constants.py
@@ -23,7 +23,8 @@ All constants centralised in one file.
 """
 import socket
 from ipapython.dn import DN
-from ipapython.version import VERSION
+from ipapython.version import VERSION, API_VERSION
+
 try:
     FQDN = socket.getfqdn()
 except:
@@ -65,6 +66,7 @@ CONFIG_SECTION = 'global'
 # This is a tuple instead of a dict so that it is immutable.
 # To create a dict with this config, just "d = dict(DEFAULT_CONFIG)".
 DEFAULT_CONFIG = (
+    ('api_version', API_VERSION),
     ('version', VERSION),
 
     # Domain, realm, basedn:
-- 
1.9.3

_______________________________________________
Freeipa-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/freeipa-devel

Reply via email to