Author: lslezak Date: Wed Jan 6 20:00:50 2010 New Revision: 60240 URL: http://svn.opensuse.org/viewcvs/yast?rev=60240&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.17.42 Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Resolvable_Properties.cc Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION?rev=60240&r1=60239&r2=60240&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION Wed Jan 6 20:00:50 2010 @@ -1 +1 @@ -2.17.41 +2.17.42 Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes?rev=60240&r1=60239&r2=60240&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Wed Jan 6 20:00:50 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.17.42 + +------------------------------------------------------------------- Tue Nov 17 12:52:06 UTC 2009 - dmacvicar@novell.com - fix Locks binding using YCP Map iterator API not existing on Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc?rev=60240&r1=60239&r2=60240&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc Wed Jan 6 20:00:50 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: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Resolvable_Properties.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Resolvable_Properties.cc?rev=60240&r1=60239&r2=60240&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Resolvable_Properties.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Resolvable_Properties.cc Wed Jan 6 20:00:50 2010 @@ -184,14 +184,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 { @@ -203,6 +201,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