Hello community, here is the log from the commit of package apper for openSUSE:Factory checked in at 2013-02-20 09:14:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apper (Old) and /work/SRC/openSUSE:Factory/.apper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apper", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/apper/apper.changes 2013-01-29 06:43:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.apper.new/apper.changes 2013-02-20 09:14:13.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Feb 19 14:48:46 UTC 2013 - tittiatc...@gmail.com + +- Added 0022-just-return-after-EULA-acceptance.patch to resolve + strange situation after accepting EULA (bnc#801703, bko#314256) + +------------------------------------------------------------------- New: ---- 0022-just-return-after-EULA-acceptance.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apper.spec ++++++ --- /var/tmp/diff_new_pack.9YSwN7/_old 2013-02-20 09:14:18.000000000 +0100 +++ /var/tmp/diff_new_pack.9YSwN7/_new 2013-02-20 09:14:18.000000000 +0100 @@ -45,6 +45,7 @@ Patch16: 0019-Connect-to-finished-signal-of-ApplicationLaunch-in-o.patch Patch17: 0020-Allow-PackageDetails-to-show-screenshots-from-softwa.patch Patch18: 0021-Update-the-last-refresh-cache-time-from-the-update-c.patch +Patch19: 0022-just-return-after-EULA-acceptance.patch # Patches before 100 are from upstream git # to be sent upstream Patch100: apper-ui-fixes.diff @@ -105,6 +106,7 @@ %patch16 -p1 %patch17 -p1 %patch18 -p1 +%patch19 -p1 %patch100 -p1 %patch101 -p1 %patch103 -p1 ++++++ 0022-just-return-after-EULA-acceptance.patch ++++++ Git commit 3783c2d23214e078ce9188eea5b56a1d0d0f1fe4 by Daniel Nicoletti. Committed on 19/02/2013 at 15:43. Pushed by dantti into branch 'master'. Make sure we don't exit the transaction after accepting the EULA BUG: 314256 M +4 -2 libapper/PkTransaction.cpp http://commits.kde.org/apper/3783c2d23214e078ce9188eea5b56a1d0d0f1fe4 diff --git a/libapper/PkTransaction.cpp b/libapper/PkTransaction.cpp index a2b878e..282b4e7 100644 --- a/libapper/PkTransaction.cpp +++ b/libapper/PkTransaction.cpp @@ -486,12 +486,14 @@ void PkTransaction::installSignature() } void PkTransaction::slotFinished(Transaction::Exit status) -{ +{ // Clear the model to don't keep trash when reusing the transaction d->progressModel->clear(); Requirements *requires = 0; Transaction::Role _role = role(); + kDebug() << status << _role; + switch (_role) { case Transaction::RoleInstallSignature: case Transaction::RoleAcceptEula: @@ -499,13 +501,13 @@ void PkTransaction::slotFinished(Transaction::Exit status) // if the required action was performed with success // requeue our main transaction requeueTransaction(); + return; } break; default: break; } - kDebug() << status << _role; switch(status) { case Transaction::ExitSuccess: // Check if we are just simulating -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
