summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <egon@tas>2007-01-26 17:20:29 +0100
committerMichael Vogt <egon@tas>2007-01-26 17:20:29 +0100
commit4a741085e3895d83aa3b0a522123a923b0a64aa4 (patch)
treead54f51004b284af9714fce9c680befd3542fdf8
parent5b3663b413e46ac6d4e8d9d394d1459859fd0eb1 (diff)
downloadpython-apt-4a741085e3895d83aa3b0a522123a923b0a64aa4.tar.gz
* support "fromUser()" flag in apt.Package.markInstall() to make
setting the automatic install information available
-rw-r--r--apt/package.py5
-rw-r--r--python/depcache.cc6
2 files changed, 7 insertions, 4 deletions
diff --git a/apt/package.py b/apt/package.py
index 0d1145ea..f67ad6ce 100644
--- a/apt/package.py
+++ b/apt/package.py
@@ -290,12 +290,13 @@ class Package(object):
Fix.InstallProtect()
Fix.Resolve()
self._pcache.cachePostChange()
- def markInstall(self, autoFix=True, autoInst=True):
+ def markInstall(self, autoFix=True, autoInst=True, fromUser=True):
""" mark a package for install. Run the resolver if autoFix is set,
automatically install required dependencies if autoInst is set
+ record it as automatically installed when fromuser is set to false
"""
self._pcache.cachePreChange()
- self._depcache.MarkInstall(self._pkg, autoInst)
+ self._depcache.MarkInstall(self._pkg, autoInst, fromUser)
# try to fix broken stuff
if autoFix and self._depcache.BrokenCount > 0:
fixer = apt_pkg.GetPkgProblemResolver(self._depcache)
diff --git a/python/depcache.cc b/python/depcache.cc
index 159a7103..71e6a2e6 100644
--- a/python/depcache.cc
+++ b/python/depcache.cc
@@ -346,11 +346,13 @@ static PyObject *PkgDepCacheMarkInstall(PyObject *Self,PyObject *Args)
PyObject *PackageObj;
char autoInst=1;
- if (PyArg_ParseTuple(Args,"O!|b",&PackageType,&PackageObj, &autoInst) == 0)
+ char fromUser=1;
+ if (PyArg_ParseTuple(Args,"O!|bb",&PackageType,&PackageObj,
+ &autoInst, &fromUser) == 0)
return 0;
pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
- depcache->MarkInstall(Pkg, autoInst);
+ depcache->MarkInstall(Pkg, autoInst, 0, fromUser);
Py_INCREF(Py_None);
return HandleErrors(Py_None);