diff options
| author | Daniel Hartwig <mandyke@gmail.com> | 2012-01-31 12:40:27 +0800 |
|---|---|---|
| committer | Daniel Hartwig <mandyke@gmail.com> | 2012-01-31 12:40:27 +0800 |
| commit | ed277cf0d97288924300815f3e2afd59e8ee044a (patch) | |
| tree | 6d0cb7864facec3f5602203d3c10a63fc701d0c4 | |
| parent | 239efb5ceb2fa64d6afe310c1780b090ee566a6a (diff) | |
| download | aptitude-ed277cf0d97288924300815f3e2afd59e8ee044a.tar.gz | |
Handle enhances/obsoletes in more places.
| -rw-r--r-- | src/cmdline/cmdline_show.cc | 2 | ||||
| -rw-r--r-- | src/generic/apt/matching/parse.cc | 4 | ||||
| -rw-r--r-- | src/gtk/resolver.cc | 3 | ||||
| -rw-r--r-- | src/solution_fragment.cc | 3 |
4 files changed, 12 insertions, 0 deletions
diff --git a/src/cmdline/cmdline_show.cc b/src/cmdline/cmdline_show.cc index 29c5591a..2a2238fd 100644 --- a/src/cmdline/cmdline_show.cc +++ b/src/cmdline/cmdline_show.cc @@ -461,6 +461,8 @@ cw::fragment *version_file_fragment(const pkgCache::VerIterator &ver, _("Replaces"), pkgCache::Dep::Replaces)); fragments.push_back(dep_lst_frag(ver.DependsList(), _("Obsoletes"), pkgCache::Dep::Obsoletes)); + fragments.push_back(dep_lst_frag(ver.DependsList(), + _("Enhances"), pkgCache::Dep::Enhances)); fragments.push_back(prv_lst_frag(ver.ProvidesList(), false, verbose, _("Provides"))); fragments.push_back(prv_lst_frag(ver.ParentPkg().ProvidesList(), true, verbose, _("Provided by"))); diff --git a/src/generic/apt/matching/parse.cc b/src/generic/apt/matching/parse.cc index 6d583417..bceffe8e 100644 --- a/src/generic/apt/matching/parse.cc +++ b/src/generic/apt/matching/parse.cc @@ -260,6 +260,10 @@ pkgCache::Dep::DepType parse_deptype(const string &s) return pkgCache::Dep::DpkgBreaks; else if(!strcasecmp(s.c_str(), "replaces")) return pkgCache::Dep::Replaces; + else if(!strcasecmp(s.c_str(), "obsoletes")) + return pkgCache::Dep::Obsoletes; + else if(!strcasecmp(s.c_str(), "enhances")) + return pkgCache::Dep::Enhances; else // ewww. return (pkgCache::Dep::DepType) -1; } diff --git a/src/gtk/resolver.cc b/src/gtk/resolver.cc index 2ebf4a3d..cebc7f6a 100644 --- a/src/gtk/resolver.cc +++ b/src/gtk/resolver.cc @@ -1260,6 +1260,9 @@ namespace gui case pkgCache::Dep::Obsoletes: return ssprintf(_("%s obsoletes %s"), name, targets.c_str()); + case pkgCache::Dep::Enhances: + return ssprintf(_("%s enhances %s"), + name, targets.c_str()); default: abort(); } diff --git a/src/solution_fragment.cc b/src/solution_fragment.cc index 67813c9e..dc9e985e 100644 --- a/src/solution_fragment.cc +++ b/src/solution_fragment.cc @@ -150,6 +150,9 @@ wstring dep_text(const pkgCache::DepIterator &d) case pkgCache::Dep::Obsoletes: return swsprintf(W_("%s obsoletes %s").c_str(), name, targets.c_str()); + case pkgCache::Dep::Enhances: + return swsprintf(W_("%s enhances %s").c_str(), + name, targets.c_str()); default: abort(); } |