diff options
| -rw-r--r-- | apt/cache.py | 25 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | python/progress.cc | 5 |
3 files changed, 34 insertions, 1 deletions
diff --git a/apt/cache.py b/apt/cache.py index cc425ccb..94a77fd8 100644 --- a/apt/cache.py +++ b/apt/cache.py @@ -60,8 +60,33 @@ class Cache(object): apt_pkg.Config.Set("Dir", rootdir) apt_pkg.Config.Set("Dir::State::status", rootdir + "/var/lib/dpkg/status") + # create required dirs/files when run with special rootdir + # automatically + self._check_and_create_required_dirs(rootdir) self.open(progress) + def _check_and_create_required_dirs(self, rootdir): + """ + check if the required apt directories/files are there and if + not create them + """ + files = ["/var/lib/dpkg/status", + "/etc/apt/sources.list", + ] + dirs = ["/var/lib/dpkg", + "/etc/apt/", + "/var/cache/apt/archives/partial", + "/var/lib/apt/lists/partial", + ] + for d in dirs: + if not os.path.exists(rootdir+d): + print "creating: ",rootdir+d + os.makedirs(rootdir+d) + for f in files: + if not os.path.exists(rootdir+f): + open(rootdir+f,"w") + + def _runCallbacks(self, name): """ internal helper to run a callback """ if name in self._callbacks: diff --git a/debian/changelog b/debian/changelog index 3bd90bed..316c83bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,11 @@ python-apt (0.7.10.4ubuntu1) karmic; urgency=low [ Michael Vogt ] * merged from debian/unstable + * apt/cache.py: + - when the cache is run with a alternative rootdir, create + required dirs/files automatically + * python/progress.cc: + - fix crash in RunSimpleCallback() [ Loic Minier ] * Merge changes below from Michael Casadevall; note that these changes were diff --git a/python/progress.cc b/python/progress.cc index c5a1c138..ef114e89 100644 --- a/python/progress.cc +++ b/python/progress.cc @@ -25,9 +25,12 @@ bool PyCallbackObj::RunSimpleCallback(const char* method_name, PyObject *method = PyObject_GetAttrString(callbackInst,(char*) method_name); if(method == NULL) { - // FIXME: make this silent //std::cerr << "Can't find '" << method_name << "' method" << std::endl; Py_XDECREF(arglist); + if (res) { + Py_INCREF(Py_None); + *res = Py_None; + } return false; } PyObject *result = PyEval_CallObject(method, arglist); |