From: Mukund Sivaraman <muks@isc.org>
Date: Thu, 28 Feb 2013 16:33:20 +0000 (+0530)
Subject: [2641] Move cmdctl-accounts.csv file back to where it was
X-Git-Tag: bind10-1.1.0beta1-release~51^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4ea6a9c51663de36095fa119698ded5f42d70690;p=thirdparty%2Fkea.git

[2641] Move cmdctl-accounts.csv file back to where it was
---

diff --git a/src/bin/cmdctl/Makefile.am b/src/bin/cmdctl/Makefile.am
index 34886a96c2..72a400abdc 100644
--- a/src/bin/cmdctl/Makefile.am
+++ b/src/bin/cmdctl/Makefile.am
@@ -21,7 +21,8 @@ CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/cmdctl_messages.pyc
 
 man_MANS = b10-cmdctl.8 b10-certgen.1
 DISTCLEANFILES = $(man_MANS) cmdctl-certfile.pem cmdctl-keyfile.pem
-EXTRA_DIST = $(man_MANS) b10-certgen.xml b10-cmdctl.xml cmdctl_messages.mes
+EXTRA_DIST  = $(man_MANS) b10-certgen.xml b10-cmdctl.xml cmdctl_messages.mes
+EXTRA_DIST += cmdctl-accounts.csv
 
 if GENERATE_DOCS
 
diff --git a/src/bin/cmdctl/cmdctl.py.in b/src/bin/cmdctl/cmdctl.py.in
index c3aceb2f7b..d35f6ccf72 100755
--- a/src/bin/cmdctl/cmdctl.py.in
+++ b/src/bin/cmdctl/cmdctl.py.in
@@ -466,7 +466,7 @@ class CommandControl():
         and user accounts file in source code. '''
         if "B10_FROM_SOURCE" in os.environ:
             sysconf_path = os.environ["B10_FROM_SOURCE"] + "/src/bin/cmdctl/"
-            accountsfile  = sysconf_path + "tests/testdata/cmdctl-accounts.csv"
+            accountsfile  = sysconf_path + "cmdctl-accounts.csv"
             keyfile = sysconf_path + "cmdctl-keyfile.pem"
             certfile = sysconf_path + "cmdctl-certfile.pem"
             return (keyfile, certfile, accountsfile)
diff --git a/src/bin/cmdctl/tests/Makefile.am b/src/bin/cmdctl/tests/Makefile.am
index 0903ef2278..e2e0361b85 100644
--- a/src/bin/cmdctl/tests/Makefile.am
+++ b/src/bin/cmdctl/tests/Makefile.am
@@ -4,7 +4,6 @@ EXTRA_DIST = $(PYTESTS)
 EXTRA_DIST += testdata/expired-certfile.pem
 EXTRA_DIST += testdata/mangled-certfile.pem
 EXTRA_DIST += testdata/noca-certfile.pem
-EXTRA_DIST += cmdctl-accounts.csv
 
 # If necessary (rare cases), explicitly specify paths to dynamic libraries
 # required by loadable python modules.
@@ -27,7 +26,7 @@ endif
 	$(LIBRARY_PATH_PLACEHOLDER) \
 	PYTHONPATH=$(COMMON_PYTHON_PATH):$(abs_top_builddir)/src/bin/cmdctl \
 	CMDCTL_BUILD_PATH=$(abs_top_builddir)/src/bin/cmdctl \
-	CMDCTL_TESTDATA_PATH=$(abs_top_srcdir)/src/bin/cmdctl/tests/testdata \
+	CMDCTL_TESTDATA_PATH=$(abs_top_srcdir)/src/bin/cmdctl \
 	B10_LOCKFILE_DIR_FROM_BUILD=$(abs_top_builddir) \
 	$(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
 	done
diff --git a/src/bin/cmdctl/tests/testdata/cmdctl-accounts.csv b/src/bin/cmdctl/tests/testdata/cmdctl-accounts.csv
deleted file mode 100644
index dc1a052462..0000000000
--- a/src/bin/cmdctl/tests/testdata/cmdctl-accounts.csv
+++ /dev/null
@@ -1 +0,0 @@
-root,6f0c73bd33101a5ec0294b3ca39fec90ef4717fe,"{5hV&$^(]!uV,3H>E~=f`I;,HgMl""`Eyao4^0l|Nlz|%R9Y0v)#/t'u@CzJ$U)"