rpms/kpackagekit/devel kpackagekit-revert-r1095715.patch, NONE, 1.1 kpackagekit.spec, 1.58, 1.59
Kevin Kofler
kkofler at fedoraproject.org
Fri Feb 26 23:35:17 UTC 2010
Author: kkofler
Update of /cvs/pkgs/rpms/kpackagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2271/devel
Modified Files:
kpackagekit.spec
Added Files:
kpackagekit-revert-r1095715.patch
Log Message:
revert revision 1095715, resulting in 20100223svn snapshot
kpackagekit-revert-r1095715.patch:
KpkReviewChanges.cpp | 145 ++++++++++++++++++++++++++-------------------------
KpkReviewChanges.h | 4 -
KpkTransaction.cpp | 36 ++++--------
KpkTransaction.h | 2
4 files changed, 90 insertions(+), 97 deletions(-)
--- NEW FILE kpackagekit-revert-r1095715.patch ---
Index: libkpackagekit/KpkReviewChanges.cpp
===================================================================
--- libkpackagekit/KpkReviewChanges.cpp (revision 1095715)
+++ libkpackagekit/KpkReviewChanges.cpp (revision 1095714)
@@ -125,6 +125,7 @@
connect(this, SIGNAL(finished(int)), &loop, SLOT(quit()));
loop.exec();
+ kDebug() << result();
return result();
}
@@ -151,34 +152,33 @@
void KpkReviewChanges::checkTask()
{
if (!m_remPackages.isEmpty()) {
+ kDebug() << "task rm if";
if (m_actions & Enum::RoleRemovePackages) {
if (m_actions & Enum::RoleSimulateRemovePackages &&
!(m_flags & HideConfirmDeps)) {
m_reqDepPackages = m_remPackages;
- m_removePkgModel = new KpkSimulateModel(this, m_reqDepPackages);
- // Create a Transaction dialog to don't upset the user
- QPointer<KpkTransaction> kTrans = new KpkTransaction(0,
- KpkTransaction::CloseOnFinish
- | KpkTransaction::Modal,
- this);
// Create the requirements transaction and it's model
- m_transactionReq = m_client->simulateRemovePackages(m_reqDepPackages, true);
+ m_transactionReq = m_client->simulateRemovePackages(m_reqDepPackages);
if (m_transactionReq->error()) {
KMessageBox::sorry(this,
KpkStrings::daemonError(m_transactionReq->error()),
i18n("Failed to simulate package removal"));
removeDone();
} else {
- kTrans->setTransaction(m_transactionReq);
+ m_removePkgModel = new KpkSimulateModel(this, m_reqDepPackages);
connect(m_transactionReq, SIGNAL(package(QSharedPointer<PackageKit::Package>)),
m_removePkgModel, SLOT(addPackage(QSharedPointer<PackageKit::Package>)));
- connect(m_transactionReq, SIGNAL(finished(PackageKit::Enum::Exit, uint)),
+ connect(m_transactionReq,
+ SIGNAL(finished(PackageKit::Enum::Exit, uint)),
this, SLOT(simRemFinished(PackageKit::Enum::Exit, uint)));
-
+ // Create a Transaction dialog to don't upset the user
+ KpkTransaction *kTrans = new KpkTransaction(m_transactionReq,
+ KpkTransaction::CloseOnFinish
+ | KpkTransaction::Modal,
+ this);
if (!(m_flags & HideProgress)) {
- kTrans->exec();
+ kTrans->show();
}
- delete kTrans;
}
} else {
// As we can't check for requires don't allow deps removal
@@ -189,16 +189,11 @@
removeDone();
}
} else if (!m_addPackages.isEmpty()) {
+ kDebug() << "task add else";
if (m_actions & Enum::RoleInstallPackages) {
if (m_actions & Enum::RoleSimulateInstallPackages &&
!(m_flags & HideConfirmDeps)) {
m_reqDepPackages = m_addPackages;
- m_installPkgModel = new KpkSimulateModel(this, m_reqDepPackages);
- // Create a Transaction dialog to don't upset the user
- QPointer<KpkTransaction> kTrans = new KpkTransaction(0,
- KpkTransaction::CloseOnFinish
- | KpkTransaction::Modal,
- this);
// Create the depends transaction and it's model
m_transactionDep = m_client->simulateInstallPackages(m_reqDepPackages);
if (m_transactionDep->error()) {
@@ -207,17 +202,22 @@
i18n("Failed to simulate package install"));
installDone();
} else {
- kTrans->setTransaction(m_transactionDep);
+ m_installPkgModel = new KpkSimulateModel(this, m_reqDepPackages);
connect(m_transactionDep, SIGNAL(package(QSharedPointer<PackageKit::Package>)),
m_installPkgModel, SLOT(addPackage(QSharedPointer<PackageKit::Package>)));
- connect(m_transactionDep, SIGNAL(finished(PackageKit::Enum::Exit, uint)),
- this, SLOT(simInstFinished(PackageKit::Enum::Exit, uint)));
-
+ connect(m_transactionDep,
+ SIGNAL(finished(PackageKit::Enum::Exit, uint)),
+ this,
+ SLOT(simInstFinished(PackageKit::Enum::Exit, uint)));
+ // Create a Transaction dialog to don't upset the user
+ KpkTransaction *kTrans = new KpkTransaction(m_transactionDep,
+ KpkTransaction::CloseOnFinish
+ | KpkTransaction::Modal,
+ this);
if (!(m_flags & HideProgress)) {
- kTrans->exec();
+ kTrans->show();
}
}
- delete kTrans;
} else {
installPackages();
}
@@ -235,19 +235,20 @@
uint runtime)
{
Q_UNUSED(runtime)
+ kDebug();
if (status == Enum::ExitSuccess) {
if (m_installPkgModel->rowCount() > 0) {
- QPointer<KpkRequirements> frm = new KpkRequirements(m_installPkgModel, this);
+ KpkRequirements *frm = new KpkRequirements(m_installPkgModel, this);
if (frm->exec() == QDialog::Accepted) {
installPackages();
} else {
close();
}
- delete frm;
} else {
installPackages();
}
} else {
+ kDebug() << "Failed " << status;
installDone();
}
}
@@ -255,26 +256,28 @@
void KpkReviewChanges::simRemFinished(PackageKit::Enum::Exit status, uint runtime)
{
Q_UNUSED(runtime)
+ kDebug();
if (status == Enum::ExitSuccess) {
if (m_removePkgModel->rowCount() > 0) {
- QPointer<KpkRequirements> frm = new KpkRequirements(m_removePkgModel, this);
+ KpkRequirements *frm = new KpkRequirements(m_removePkgModel, this);
if (frm->exec() == QDialog::Accepted) {
removePackages();
} else {
close();
}
- delete frm;
} else {
// As there was no requires don't allow deps removal
removePackages(false);
}
} else {
+ kDebug() << "Failed " << status;
removeDone();
}
}
void KpkReviewChanges::installPackages()
{
+ kDebug();
SET_PROXY
Transaction *t = m_client->installPackages(true, m_addPackages);
if (t->error()) {
@@ -283,38 +286,26 @@
i18n("Failed to install package"));
installDone();
} else {
- QPointer<KpkTransaction> frm = new KpkTransaction(t, KpkTransaction::CloseOnFinish | KpkTransaction::Modal, this);
+ KpkTransaction *frm = new KpkTransaction(t, KpkTransaction::CloseOnFinish | KpkTransaction::Modal, this);
if (m_flags & ReturnOnlyWhenFinished) {
connect(t,
SIGNAL(finished(PackageKit::Enum::Exit, uint)),
this,
SLOT(ensureInstallFinished(PackageKit::Enum::Exit, uint)));
} else {
- connect(frm, SIGNAL(requeue()),
- this, SLOT(installRequeue()));
+ connect(frm, SIGNAL(kTransactionFinished(KpkTransaction::ExitStatus)),
+ this, SLOT(addFinished(KpkTransaction::ExitStatus)));
}
if (!(m_flags & HideProgress)) {
- // for modal dialogs to work correctly exec must be called
- frm->exec();
- switch (frm->exitStatus()) {
- case KpkTransaction::Success:
- delete frm;
- installDone();
- break;
- case KpkTransaction::Cancelled:
- delete frm;
- slotButtonClicked(KDialog::Close);
- break;
- default:
- delete frm;
- }
+ frm->show();
}
}
}
void KpkReviewChanges::removePackages(bool allowDeps)
{
+ kDebug();
SET_PROXY
Transaction *t = m_client->removePackages(m_remPackages, allowDeps, true);
if (t->error()) {
@@ -323,7 +314,7 @@
i18n("Failed to remove package"));
removeDone();
} else {
- QPointer<KpkTransaction> frm = new KpkTransaction(t, KpkTransaction::CloseOnFinish | KpkTransaction::Modal, this);
+ KpkTransaction *frm = new KpkTransaction(t, KpkTransaction::CloseOnFinish | KpkTransaction::Modal, this);
frm->setAllowDeps(allowDeps);
if (m_flags & ReturnOnlyWhenFinished) {
connect(t,
@@ -331,50 +322,61 @@
this,
SLOT(ensureRemoveFinished(PackageKit::Enum::Exit, uint)));
} else {
- connect(frm, SIGNAL(requeue()),
- this, SLOT(removeRequeue()));
+ connect(frm, SIGNAL(kTransactionFinished(KpkTransaction::ExitStatus)),
+ this, SLOT(remFinished(KpkTransaction::ExitStatus)));
}
if (!(m_flags & HideProgress)) {
- // for modal dialogs to work correctly exec must be called
- frm->exec();
- switch (frm->exitStatus()) {
- case KpkTransaction::Success:
- delete frm;
- removeDone();
- break;
- case KpkTransaction::Cancelled:
- delete frm;
- slotButtonClicked(KDialog::Close);
- break;
- default:
- delete frm;
- }
+ frm->show();
}
}
}
-void KpkReviewChanges::installRequeue()
+void KpkReviewChanges::addFinished(KpkTransaction::ExitStatus status)
{
+ kDebug() << status;
KpkTransaction *trans = (KpkTransaction *) sender();
- SET_PROXY
- trans->setTransaction(m_client->installPackages(trans->onlyTrusted(),
- m_addPackages));
+ switch (status) {
+ case KpkTransaction::Success :
+ installDone();
+ break;
+ case KpkTransaction::Failed :
+ case KpkTransaction::Cancelled :
+ slotButtonClicked(KDialog::Close);
+ break;
+ case KpkTransaction::ReQueue :
+ SET_PROXY
+ trans->setTransaction(m_client->installPackages(trans->onlyTrusted(),
+ m_addPackages));
+ break;
+ }
}
-void KpkReviewChanges::removeRequeue()
+void KpkReviewChanges::remFinished(KpkTransaction::ExitStatus status)
{
KpkTransaction *trans = (KpkTransaction *) sender();
- SET_PROXY
- trans->setTransaction(m_client->removePackages(m_remPackages,
- trans->allowDeps(),
- AUTOREMOVE));
+ switch (status) {
+ case KpkTransaction::Success :
+ removeDone();
+ break;
+ case KpkTransaction::Failed :
+ case KpkTransaction::Cancelled :
+ slotButtonClicked(KDialog::Close);
+ break;
+ case KpkTransaction::ReQueue :
+ SET_PROXY
+ trans->setTransaction(m_client->removePackages(m_remPackages,
+ trans->allowDeps(),
+ AUTOREMOVE));
+ break;
+ }
}
void KpkReviewChanges::ensureRemoveFinished(PackageKit::Enum::Exit status,
uint runtime)
{
Q_UNUSED(runtime)
+ kDebug();
if (status == Enum::ExitSuccess) {
removeDone();
} else {
@@ -386,6 +388,7 @@
uint runtime)
{
Q_UNUSED(runtime)
+ kDebug();
if (status == Enum::ExitSuccess) {
installDone();
} else {
Index: libkpackagekit/KpkTransaction.h
===================================================================
--- libkpackagekit/KpkTransaction.h (revision 1095715)
+++ libkpackagekit/KpkTransaction.h (revision 1095714)
@@ -65,7 +65,7 @@
KpkTransaction::ExitStatus exitStatus() const;
signals:
- void requeue();
+ void kTransactionFinished(KpkTransaction::ExitStatus status);
private:
void unsetTransaction();
Index: libkpackagekit/KpkTransaction.cpp
===================================================================
--- libkpackagekit/KpkTransaction.cpp (revision 1095715)
+++ libkpackagekit/KpkTransaction.cpp (revision 1095714)
@@ -95,6 +95,8 @@
// We need to track when the user close the dialog using the [X] button
connect(this, SIGNAL(finished()), SLOT(finishedDialog()));
+ connect(this, SIGNAL(kTransactionFinished(KpkTransaction::ExitStatus)),
+ SLOT(setExitStatus(KpkTransaction::ExitStatus)));
// after ALL set, lets set the transaction
setTransaction(m_trans);
@@ -102,7 +104,6 @@
KpkTransaction::~KpkTransaction()
{
- kDebug();
KConfig config("KPackageKit");
if (isButtonEnabled(KDialog::Details)) {
KConfigGroup transactionGroup(&config, "Transaction");
@@ -148,11 +149,6 @@
void KpkTransaction::setTransaction(Transaction *trans)
{
- if (!trans) {
- // 0 pointer passed
- return;
- }
-
m_trans = trans;
d->tid = trans->tid();
d->finished = false;
@@ -315,7 +311,7 @@
// Always disconnect BEFORE emitting finished
unsetTransaction();
- setExitStatus(Success);
+ emit kTransactionFinished(Success);
}
}
@@ -336,7 +332,7 @@
kDebug() << "KDialog::Close";
// Always disconnect BEFORE emitting finished
unsetTransaction();
- setExitStatus(Cancelled);
+ emit kTransactionFinished(Cancelled);
done(KDialog::Close);
break;
case KDialog::Details :
@@ -383,11 +379,10 @@
if (ret == KMessageBox::Yes) {
// Set only trusted to false, to do as the user asked
d->onlyTrusted = false;
- emit requeue();
- setExitStatus(ReQueue);
+ emit kTransactionFinished(ReQueue);
kDebug() << "Asking for a re-queue";
} else {
- setExitStatus(Cancelled);
+ emit kTransactionFinished(Cancelled);
if (m_flags & CloseOnFinish)
done(QDialog::Rejected);
}
@@ -445,8 +440,7 @@
delete frm;
// Well try again, if fail will show the erroCode
- emit requeue();
- setExitStatus(ReQueue);
+ emit kTransactionFinished(ReQueue);
}
void KpkTransaction::mediaChangeRequired(PackageKit::Enum::MediaType type, const QString &id, const QString &text)
@@ -464,8 +458,7 @@
// if the user clicked continue we got yes
if (ret == KMessageBox::Yes) {
- emit requeue();
- setExitStatus(ReQueue);
+ emit kTransactionFinished(ReQueue);
} else {
// when we receive an error we are done
if (m_flags & CloseOnFinish) {
@@ -493,25 +486,23 @@
delete frm;
// kDebug() << "Requeue!";
- emit requeue();
- setExitStatus(ReQueue);
+ emit kTransactionFinished(ReQueue);
}
void KpkTransaction::finished(PackageKit::Enum::Exit status, uint runtime)
{
- kDebug();
Q_UNUSED(runtime)
d->finished = true;
switch(status) {
case Enum::ExitSuccess :
d->ui.progressBar->setMaximum(100);
d->ui.progressBar->setValue(100);
- setExitStatus(Success);
+ emit kTransactionFinished(Success);
break;
case Enum::ExitCancelled :
d->ui.progressBar->setMaximum(100);
d->ui.progressBar->setValue(100);
- setExitStatus(Cancelled);
+ emit kTransactionFinished(Cancelled);
break;
case Enum::ExitFailed :
kDebug() << "Failed.";
@@ -519,7 +510,7 @@
d->ui.progressBar->setMaximum(0);
d->ui.progressBar->reset();
kDebug() << "Yep, we failed.";
- setExitStatus(Failed);
+ emit kTransactionFinished(Failed);
}
break;
case Enum::ExitKeyRequired :
@@ -529,7 +520,7 @@
kDebug() << "finished KeyRequired or EulaRequired: " << status;
d->ui.currentL->setText(KpkStrings::status(Enum::StatusSetup));
if (!m_handlingActionRequired) {
- setExitStatus(Failed);
+ emit kTransactionFinished(Failed);
}
break;
default :
@@ -542,7 +533,6 @@
// if we're not showing an error or don't have the
// CloseOnFinish flag don't close the dialog
if (m_flags & CloseOnFinish && !m_handlingActionRequired && !m_showingError) {
- kDebug() << "done";
done(QDialog::Rejected);
deleteLater();
}
Index: libkpackagekit/KpkReviewChanges.h
===================================================================
--- libkpackagekit/KpkReviewChanges.h (revision 1095715)
+++ libkpackagekit/KpkReviewChanges.h (revision 1095714)
@@ -58,8 +58,8 @@
int exec(OperationModes flags = 0);
private slots:
- void removeRequeue();
- void installRequeue();
+ void remFinished(KpkTransaction::ExitStatus);
+ void addFinished(KpkTransaction::ExitStatus);
void simRemFinished(PackageKit::Enum::Exit status, uint runtime);
void simInstFinished(PackageKit::Enum::Exit status, uint runtime);
Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/kpackagekit.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- kpackagekit.spec 26 Feb 2010 22:59:27 -0000 1.58
+++ kpackagekit.spec 26 Feb 2010 23:35:17 -0000 1.59
@@ -5,7 +5,7 @@
Name: kpackagekit
Version: 0.6.0
-Release: 0.6.%{snap}%{?dist}
+Release: 0.6.20100223svn%{?dist}
Summary: KDE interface for PackageKit
License: GPLv2+
@@ -20,6 +20,8 @@ Group: Applications/System
# docs = no
# translations = yes
Source0: kpackagekit-%{snap}.tar.bz2
+# revert revision 1095715
+Patch0: kpackagekit-revert-r1095715.patch
URL: http://www.kde-apps.org/content/show.php/KPackageKit?content=84745
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,6 +48,7 @@ KDE interface for PackageKit.
%prep
%setup -q -n %{name}-%{snap}
+%patch0 -p0
#patch50 -p1 -b .defaults_hacks
@@ -96,8 +99,8 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Fri Feb 26 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.6.0-0.6.20100226svn
-- update to 20100226 SVN snapshot
+* Fri Feb 26 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.6.0-0.6.20100223svn
+- update to 20100223 SVN snapshot
- include translations again
* Wed Feb 24 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.6.0-0.5.r1095080
More information about the scm-commits
mailing list