From 5cbf0b5807b4cc67818eae652b59a25d52eb9f7b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 29 Jan 2009 09:26:03 +0100 Subject: * apt/cache.py: - when setting a alternative rootdir, read the config from it as well * python/configuration.cc, python/apt_pkgmodule.cc: - add apt_pkg.ReadConfigDir() --- python/configuration.cc | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'python/configuration.cc') diff --git a/python/configuration.cc b/python/configuration.cc index f52c3c97..21f70bc1 100644 --- a/python/configuration.cc +++ b/python/configuration.cc @@ -327,6 +327,24 @@ PyObject *LoadConfigISC(PyObject *Self,PyObject *Args) if (ReadConfigFile(GetSelf(Self),Name,true) == false) return HandleErrors(); + Py_INCREF(Py_None); + return HandleErrors(Py_None); +} +char *doc_LoadConfigDir = "LoadConfigDir(Configuration,DirName) -> None"; +PyObject *LoadConfigDir(PyObject *Self,PyObject *Args) +{ + char *Name = 0; + if (PyArg_ParseTuple(Args,"Os",&Self,&Name) == 0) + return 0; + if (Configuration_Check(Self)== 0) + { + PyErr_SetString(PyExc_TypeError,"argument 1: expected Configuration."); + return 0; + } + + if (ReadConfigDir(GetSelf(Self),Name,false) == false) + return HandleErrors(); + Py_INCREF(Py_None); return HandleErrors(Py_None); } -- cgit v1.2.3