addFeedback(Feedback::PATCH_UNWANTED, patchspec, selected, selected);
}
- else if (!_opts.category.empty() && _opts.category != patch->category())
+ else if ( ! ( _opts.category.empty() || patch->isCategory( _opts.category ) ) )
{
DBG << "candidate patch " << patch << " is not in the specified category" << endl;
addFeedback(Feedback::PATCH_WRONG_CAT, patchspec, selected, selected);
TableHeader header;
header
- // translators: catalog (rug's word for repository) (header)
- << _("Catalog")
+ << (_gopts.is_rug_compatible ? _("Catalog") : _("Repository"))
<< _("Name")
- << table::EditionStyleSetter( *_table, ("Version") )
- // translators: patch category (recommended, security)
<< _("Category")
- // translators: patch status (installed, uninstalled, needed)
+ << _("Severity")
<< _("Status");
*_table << header;
row
<< pi->repository().asUserString()
<< pi->name()
- << pi->edition().asString()
<< patch->category()
+ << patch->severity()
<< string_patch_status(pi);
*_table << row;
cout << "arch=\"" << res->arch().asString() << "\" ";
cout << "status=\"" << patchStatusAsString( *it ) << "\" ";
cout << "category=\"" << patch->category() << "\" ";
+ cout << "severity=\"" << patch->severity() << "\" ";
cout << "pkgmanager=\"" << (patch->restartSuggested() ? "true" : "false") << "\" ";
cout << "restart=\"" << (patch->rebootSuggested() ? "true" : "false") << "\" ";
unsigned cols;
th << (zypper.globalOpts().is_rug_compatible ? _("Catalog") : _("Repository"))
- << _("Name") << table::EditionStyleSetter( tbl, _("Version") ) << _("Category") << _("Status") << _("Summary");
+ << _("Name") << _("Category") << _("Severity") << _("Status") << _("Summary");
cols = 6;
tbl << th;
pm_tbl << th;
continue;
}
- if (!category.empty() && category != patch->category())
+ if ( ! ( category.empty() || patch->isCategory( category ) ) )
{
DBG << "candidate patch " << patch << " is not in the specified category" << endl;
continue;
{
TableRow tr (cols);
tr << patch->repoInfo().asUserString();
- tr << res->name () << res->edition ().asString();
+ tr << res->name ();
tr << patch->category();
+ tr << patch->severity();
tr << (it->isBroken() ? _("needed") : _("not needed"));
tr << patch->summary();
Table t;
TableHeader th;
- th << _("Issue") << _("No.") << _("Patch") << _("Category") << _("Status");
+ th << _("Issue") << _("No.") << _("Patch") << _("Category") << _("Severity") << _("Status");
t << th;
#define FILL_ISSUES(TYPE, ID) \
TableRow tr;
tr << itype;
tr << d->subFind(sat::SolvAttr::updateReferenceId).asString();
- tr << (patch->name() + "-" + patch->edition().asString());
+ tr << patch->name();
tr << patch->category();
+ tr << patch->severity();
tr << (pi.isBroken() ? _("needed") : _("not needed"));
t << tr;
}
// look for matches in patch descriptions
Table t1;
TableHeader th1;
- th1 << _("Name") << table::EditionStyleSetter( t1, _("Version") ) << _("Category") << _("Summary");
+ th1 << _("Name") << _("Category") << _("Severity") << _("Summary");
t1 << th1;
if (!issuesstr.empty())
{
Patch::constPtr patch = asKind<Patch>(pi.resolvable());
TableRow tr;
- tr << patch->name() << patch->edition().asString() << patch->category();
+ tr << patch->name() << patch->category() << patch->severity();
//! \todo could show a highlighted match with a portion of surrounding
//! text. Needs case-insensitive find.
tr << patch->summary();