Author: lslezak Date: Wed Jan 6 20:13:58 2010 New Revision: 60247 URL: http://svn.opensuse.org/viewcvs/yast?rev=60247&view=rev Log: - Pkg::ResolvableProperties() - always return "transact_by" flag, Pkg::PkgApplReset() - do not reset "transact_by" flag for non-transacting resolvables (bnc#450786, bnc#471340) - 2.19.0 Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Package.cc trunk/pkg-bindings/src/Resolvable_Properties.cc Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=60247&r1=60246&r2=60247&view=diff ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Wed Jan 6 20:13:58 2010 @@ -1 +1 @@ -2.18.11 +2.19.0 Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-bindings.changes?rev=60247&r1=60246&r2=60247&view=diff ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Wed Jan 6 20:13:58 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Jan 6 17:50:26 UTC 2010 - lslezak@suse.cz + +- Pkg::ResolvableProperties() - always return "transact_by" flag, + Pkg::PkgApplReset() - do not reset "transact_by" flag for + non-transacting resolvables (bnc#450786, bnc#471340) +- 2.19.0 + +------------------------------------------------------------------- Thu Dec 3 08:19:45 UTC 2009 - lslezak@suse.cz - return more details when a service refresh fails (bnc#558049) Modified: trunk/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Package.cc?rev=60247&r1=60246&r2=60247&view=diff ============================================================================== --- trunk/pkg-bindings/src/Package.cc (original) +++ trunk/pkg-bindings/src/Package.cc Wed Jan 6 20:13:58 2010 @@ -1727,7 +1727,10 @@ for_(it, proxy.byKindBegin<T>(), proxy.byKindEnd<T>()) { zypp::ui::Selectable::Ptr s = (*it); - if (s) s->theObj().status().resetTransact(level); + if (s && (level == zypp::ResStatus::USER || s->theObj().status().transacts())) + { + s->theObj().status().resetTransact(level); + } } } Modified: trunk/pkg-bindings/src/Resolvable_Properties.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Resolvable_Properties.cc?rev=60247&r1=60246&r2=60247&view=diff ============================================================================== --- trunk/pkg-bindings/src/Resolvable_Properties.cc (original) +++ trunk/pkg-bindings/src/Resolvable_Properties.cc Wed Jan 6 20:13:58 2010 @@ -193,14 +193,12 @@ if (status.isToBeInstalled()) { stat = "selected"; - info->add(YCPString("transact_by"), YCPSymbol(TransactToString(status.getTransactByValue()))); } else if (status.isInstalled() || status.isSatisfied()) { if (status.isToBeUninstalled()) { stat = "removed"; - info->add(YCPString("transact_by"), YCPSymbol(TransactToString(status.getTransactByValue()))); } else { @@ -212,6 +210,8 @@ stat = "available"; } + info->add(YCPString("transact_by"), YCPSymbol(TransactToString(status.getTransactByValue()))); + info->add(YCPString("status"), YCPSymbol(stat)); // is the resolvable locked? (Locked or Taboo in the UI) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org