Mailinglist Archive: yast-commit (265 mails)

< Previous Next >
[yast-commit] r67221 - in /branches/SuSE-Code-11-SP1-Branch/wagon: VERSION package/yast2-wagon.changes src/modules/Wagon.ycp
Author: lslezak
Date: Tue Jan 17 15:35:53 2012
New Revision: 67221

URL: http://svn.opensuse.org/viewcvs/yast?rev=67221&view=rev
Log:
- ask user to confirm new licenses at upgrade proposal (bnc#741174)
- 2.17.17.7

Modified:
branches/SuSE-Code-11-SP1-Branch/wagon/VERSION
branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes
branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp

Modified: branches/SuSE-Code-11-SP1-Branch/wagon/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon/VERSION?rev=67221&r1=67220&r2=67221&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/wagon/VERSION (original)
+++ branches/SuSE-Code-11-SP1-Branch/wagon/VERSION Tue Jan 17 15:35:53 2012
@@ -1 +1 @@
-2.17.17.6
+2.17.17.7

Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes?rev=67221&r1=67220&r2=67221&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes
(original)
+++ branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes Tue Jan
17 15:35:53 2012
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Jan 17 14:02:21 UTC 2012 - lslezak@xxxxxxx
+
+- ask user to confirm new licenses at upgrade proposal (bnc#741174)
+- 2.17.17.7
+
+-------------------------------------------------------------------
Mon Jan 2 13:11:06 UTC 2012 - lslezak@xxxxxxx

- install also all applicable patches (except optional ones)

Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp?rev=67221&r1=67220&r2=67221&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp (original)
+++ branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp Tue Jan 17
15:35:53 2012
@@ -492,6 +492,13 @@
// set the solve error flag for packages proposal
Update::solve_errors = Pkg::PkgSolve(true) ? 0 : Pkg::PkgSolveErrors();

+ if (!AcceptLicenses())
+ {
+ // rerun the solver after rejecting a package license
+ // (setting the package to taboo state)
+ Update::solve_errors = Pkg::PkgSolve(true) ? 0 :
Pkg::PkgSolveErrors();
+ }
+
already_proposed = true;

return true;

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages