Mailinglist Archive: zypp-commit (731 mails)
| < Previous | Next > |
[zypp-commit] r6382 - in /trunk/updater-kde/updater: MainWindow.cpp zypp/ZYppUpdater.cpp
- From: tgoettlicher@xxxxxxxxxxxxxxxx
- Date: Thu, 02 Aug 2007 10:20:50 -0000
- Message-id: <20070802102050.8AC78B5888@xxxxxxxxxxxxxxxx>
Author: tgoettlicher
Date: Thu Aug 2 12:20:50 2007
New Revision: 6382
URL: http://svn.opensuse.org/viewcvs/zypp?rev=6382&view=rev
Log:
backup
Modified:
trunk/updater-kde/updater/MainWindow.cpp
trunk/updater-kde/updater/zypp/ZYppUpdater.cpp
Modified: trunk/updater-kde/updater/MainWindow.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.cpp?rev=6382&r1=6381&r2=6382&view=diff
==============================================================================
--- trunk/updater-kde/updater/MainWindow.cpp (original)
+++ trunk/updater-kde/updater/MainWindow.cpp Thu Aug 2 12:20:50 2007
@@ -559,7 +559,8 @@
QCheckListItem *item = (QCheckListItem*)patchList->firstChild();
while (item != NULL) {
- if (item->text(COLUMN_TYPE).lower() == "recommended" )
+ if (item->text(COLUMN_TYPE).lower() == "recommended" ||
+ item->text(COLUMN_TYPE).lower() == "packagemanager" )
{
item->setState(QCheckListItem::On);
item->setSelected(true);
@@ -619,7 +620,9 @@
QCheckListItem *item = (QCheckListItem*)patchList->firstChild();
while (item != NULL) {
- if (item->text(COLUMN_RESTART_HIDDEN).lower() == "restart" ) {
+ if (item->text(COLUMN_RESTART_HIDDEN).lower() == "restart" &&
+ item->text(COLUMN_TYPE).lower() != "packagemanager" )
+ {
item->setState(QCheckListItem::Off);
item->setSelected(false);
}
Modified: trunk/updater-kde/updater/zypp/ZYppUpdater.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/zypp/ZYppUpdater.cpp?rev=6382&r1=6381&r2=6382&view=diff
==============================================================================
--- trunk/updater-kde/updater/zypp/ZYppUpdater.cpp (original)
+++ trunk/updater-kde/updater/zypp/ZYppUpdater.cpp Thu Aug 2 12:20:50 2007
@@ -95,7 +95,7 @@
}
- if (p->exitStatus() == 102 )
+ if (p->exitStatus() == 103 )
{
QMessageBox::information( NULL, PROGRAM_DISPLAY_NAME, i18n("One of installed patches affects the package manager itself, thus it requires to restart %1.").arg(PROGRAM_DISPLAY_NAME));
@@ -104,7 +104,7 @@
kapp->quit();
}
- if (p->exitStatus() == 103)
+ if (p->exitStatus() == 102)
{
QMessageBox::information( NULL, PROGRAM_DISPLAY_NAME,
i18n("One of installed patches requires reboot of your machine. Please, do it as soon as possible."));
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx
Date: Thu Aug 2 12:20:50 2007
New Revision: 6382
URL: http://svn.opensuse.org/viewcvs/zypp?rev=6382&view=rev
Log:
backup
Modified:
trunk/updater-kde/updater/MainWindow.cpp
trunk/updater-kde/updater/zypp/ZYppUpdater.cpp
Modified: trunk/updater-kde/updater/MainWindow.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.cpp?rev=6382&r1=6381&r2=6382&view=diff
==============================================================================
--- trunk/updater-kde/updater/MainWindow.cpp (original)
+++ trunk/updater-kde/updater/MainWindow.cpp Thu Aug 2 12:20:50 2007
@@ -559,7 +559,8 @@
QCheckListItem *item = (QCheckListItem*)patchList->firstChild();
while (item != NULL) {
- if (item->text(COLUMN_TYPE).lower() == "recommended" )
+ if (item->text(COLUMN_TYPE).lower() == "recommended" ||
+ item->text(COLUMN_TYPE).lower() == "packagemanager" )
{
item->setState(QCheckListItem::On);
item->setSelected(true);
@@ -619,7 +620,9 @@
QCheckListItem *item = (QCheckListItem*)patchList->firstChild();
while (item != NULL) {
- if (item->text(COLUMN_RESTART_HIDDEN).lower() == "restart" ) {
+ if (item->text(COLUMN_RESTART_HIDDEN).lower() == "restart" &&
+ item->text(COLUMN_TYPE).lower() != "packagemanager" )
+ {
item->setState(QCheckListItem::Off);
item->setSelected(false);
}
Modified: trunk/updater-kde/updater/zypp/ZYppUpdater.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/zypp/ZYppUpdater.cpp?rev=6382&r1=6381&r2=6382&view=diff
==============================================================================
--- trunk/updater-kde/updater/zypp/ZYppUpdater.cpp (original)
+++ trunk/updater-kde/updater/zypp/ZYppUpdater.cpp Thu Aug 2 12:20:50 2007
@@ -95,7 +95,7 @@
}
- if (p->exitStatus() == 102 )
+ if (p->exitStatus() == 103 )
{
QMessageBox::information( NULL, PROGRAM_DISPLAY_NAME, i18n("One of installed patches affects the package manager itself, thus it requires to restart %1.").arg(PROGRAM_DISPLAY_NAME));
@@ -104,7 +104,7 @@
kapp->quit();
}
- if (p->exitStatus() == 103)
+ if (p->exitStatus() == 102)
{
QMessageBox::information( NULL, PROGRAM_DISPLAY_NAME,
i18n("One of installed patches requires reboot of your machine. Please, do it as soon as possible."));
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx
| < Previous | Next > |