Hello community,
here is the log from the commit of package kde4-kupdateapplet for openSUSE:Factory
checked in at Fri Dec 5 16:03:41 CET 2008.
--------
--- KDE/kde4-kupdateapplet/kde4-kupdateapplet.changes 2008-12-02 16:03:33.000000000 +0100
+++ /mounts/work_src_done/STABLE/kde4-kupdateapplet/kde4-kupdateapplet.changes 2008-12-05 15:58:08.000000000 +0100
@@ -1,0 +2,8 @@
+Fri Dec 04 15:31:19 CET 2008 - tgoettlicher@suse.de
+
+- Fixed duplicates in update list after installation ofi
+ packages with eula dialog (bnc #456778).
+- Updated translations.
+- V 0.8.34
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
kde4-kupdateapplet-0.8.33.tar.bz2
New:
----
kde4-kupdateapplet-0.8.34.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kde4-kupdateapplet.spec ++++++
--- /var/tmp/diff_new_pack.OB1304/_old 2008-12-05 16:03:28.000000000 +0100
+++ /var/tmp/diff_new_pack.OB1304/_new 2008-12-05 16:03:28.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kde4-kupdateapplet (Version 0.8.33)
+# spec file for package kde4-kupdateapplet (Version 0.8.34)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -24,12 +24,12 @@
License: GPL v2 only
Group: System/YaST
Summary: openSUSE System Updater Applet (KDE4)
-Version: 0.8.33
+Version: 0.8.34
Release: 1
Url: http://en.opensuse.org/KDE_Updater_Applet
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
-Requires: kde4-kupdateapplet-plugin = 0.8.33
+Requires: kde4-kupdateapplet-plugin = 0.8.34
Requires: oxygen-icon-theme
Recommends: smolt
# last used in 11.0
@@ -97,7 +97,7 @@
Summary: packagekit plugin for KDE updater applet
Requires: PackageKit >= 0.3
Requires: PolicyKit
-Provides: kde4-kupdateapplet-plugin = 0.8.33
+Provides: kde4-kupdateapplet-plugin = 0.8.34
%description -n kde4-kupdateapplet-packagekit
PackageKit plugin for KDE updater applet for OpenSUSE
@@ -116,7 +116,7 @@
Group: System/Packages
Summary: zypp plugin for KDE updater applet
Requires: zypper >= 0.12.11
-Provides: kde4-kupdateapplet-plugin = 0.8.33
+Provides: kde4-kupdateapplet-plugin = 0.8.34
%description -n kde4-kupdateapplet-zypp
zypp plugin for KDE updater applet for OpenSUSE
@@ -130,6 +130,11 @@
############################
%changelog
+* Thu Dec 04 2008 tgoettlicher@suse.de
+- Fixed duplicates in update list after installation ofi
+ packages with eula dialog (bnc #456778).
+- Updated translations.
+- V 0.8.34
* Tue Dec 02 2008 tgoettlicher@suse.de
- Fixed bnc #450184: install hangs at 100%
- Fixed misleading packagekit error when zypp is locked
++++++ kde4-kupdateapplet-0.8.33.tar.bz2 -> kde4-kupdateapplet-0.8.34.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kde4-kupdateapplet-0.8.33/package/kde4-kupdateapplet.changes new/kde4-kupdateapplet-0.8.34/package/kde4-kupdateapplet.changes
--- old/kde4-kupdateapplet-0.8.33/package/kde4-kupdateapplet.changes 2008-12-03 13:16:09.000000000 +0100
+++ new/kde4-kupdateapplet-0.8.34/package/kde4-kupdateapplet.changes 2008-12-07 04:25:24.000000000 +0100
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Fri Dec 04 15:31:19 CET 2008 - tgoettlicher@suse.de
+
+- Fixed duplicates in update list after installation ofi
+ packages with eula dialog (bnc #456778).
+- Updated translations.
+- V 0.8.34
+
+-------------------------------------------------------------------
Tue Dec 02 15:58:42 CET 2008 - tgoettlicher@suse.de
- Fixed bnc #450184: install hangs at 100%
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kde4-kupdateapplet-0.8.33/po/hu.po new/kde4-kupdateapplet-0.8.34/po/hu.po
--- old/kde4-kupdateapplet-0.8.33/po/hu.po 2008-12-03 13:16:09.000000000 +0100
+++ new/kde4-kupdateapplet-0.8.34/po/hu.po 2008-12-07 04:25:24.000000000 +0100
@@ -1,3 +1,4 @@
+# translation of kupdateapplet.hu.po to Hungarian
# translation of kupdateapplet.po to
# translation of kupdateapplet.hu.po to
# translation of opensuseupdater.po to
@@ -11,12 +12,12 @@
# Gabor Kelemen , 2007.
msgid ""
msgstr ""
-"Project-Id-Version: kupdateapplet\n"
+"Project-Id-Version: kupdateapplet.hu\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-10-22 10:56+0200\n"
-"PO-Revision-Date: 2008-10-27 12:02+0100\n"
+"PO-Revision-Date: 2008-12-03 16:46+0100\n"
"Last-Translator: Kalman Kemenczy \n"
-"Language-Team: \n"
+"Language-Team: Hungarian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -344,7 +345,7 @@
#. i18n: file ../src/configwidgetui.ui line 118
#: ../src/rc.cpp:21
msgid "Show available upgrades when backend provides them (for experts only)"
-msgstr "Az elérhető frissítéseket megjelenítése, ha a háttérrendszer biztosítja azokat (csak gyakorlott felhasználóknak)"
+msgstr "Az elérhető frissítések megjelenítése, ha a háttérrendszer biztosítja azokat (csak gyakorlott felhasználóknak)"
#. i18n: tag string
#. i18n: file ../src/configwidgetui.ui line 126
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kde4-kupdateapplet-0.8.33/po/it.po new/kde4-kupdateapplet-0.8.34/po/it.po
--- old/kde4-kupdateapplet-0.8.33/po/it.po 2008-12-03 13:16:09.000000000 +0100
+++ new/kde4-kupdateapplet-0.8.34/po/it.po 2008-12-07 04:25:24.000000000 +0100
@@ -10,7 +10,7 @@
"Project-Id-Version: kupdateapplet\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-10-22 10:56+0200\n"
-"PO-Revision-Date: 2008-10-27 00:01+0100\n"
+"PO-Revision-Date: 2008-12-02 14:17+0100\n"
"Last-Translator: Andrea Florio \n"
"Language-Team: italian \n"
"MIME-Version: 1.0\n"
@@ -86,7 +86,7 @@
#: ../src/simpleview.cpp:83
msgid "Start YaST and install updates manually"
-msgstr "Avvia YaST a d installa gli aggiornamenti manualmente"
+msgstr "Avvia YaST ed installa gli aggiornamenti manualmente"
#: ../src/simpleview.cpp:84 ../src/simpleview.cpp:85 ../src/mainwindow.cpp:200
msgid "Install"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kde4-kupdateapplet-0.8.33/po/ro.po new/kde4-kupdateapplet-0.8.34/po/ro.po
--- old/kde4-kupdateapplet-0.8.33/po/ro.po 2008-12-03 13:16:09.000000000 +0100
+++ new/kde4-kupdateapplet-0.8.34/po/ro.po 2008-12-07 04:25:24.000000000 +0100
@@ -1,4 +1,4 @@
-# translation of kupdateapplet.po to romana
+# translation of kupdateapplet.po to RO_ro
# translation of opensuseupdater.ro.po to
# @TITLE@
# Copyright (C) 2006, SUSE Linux GmbH, Nuremberg
@@ -11,9 +11,9 @@
"Project-Id-Version: kupdateapplet\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-10-22 10:56+0200\n"
-"PO-Revision-Date: 2008-11-07 12:00+0100\n"
-"Last-Translator: openSUSE translation\n"
-"Language-Team: romana\n"
+"PO-Revision-Date: 2008-12-02 23:20+0100\n"
+"Last-Translator: Alexandru Romanescu\n"
+"Language-Team: RO_ro \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -69,8 +69,8 @@
#: ../src/simpleview.cpp:61 ../src/simpleview.cpp:67 ../src/simpleview.cpp:293
msgid "Install %1 recommended update additionally"
msgid_plural "Install %1 recommended updates additionally"
-msgstr[0] "Instalează adiţional %n actualizare recomandată"
-msgstr[1] "Instalează adiţional %n actualizări recomandate"
+msgstr[0] "Instalează adiţional o actualizare recomandată"
+msgstr[1] "Instalează adiţional %1 actualizări recomandate"
#: ../src/simpleview.cpp:70
msgid "Don't install updates that require a restart"
@@ -132,43 +132,43 @@
#: ../src/simpleview.cpp:283
msgid "%1 security update is available"
msgid_plural "%1 security updates are available"
-msgstr[0] "Este disponibilă %n actualizare de securitate"
-msgstr[1] "Sunt disponibile %n actualizări de securitate"
+msgstr[0] "Este disponibilă o actualizare de securitate"
+msgstr[1] "Sunt disponibile %1 actualizări de securitate"
#: ../src/simpleview.cpp:301
msgid "%1 recommended update is available"
msgid_plural "%1 recommended updates are available"
-msgstr[0] "Este disponibilă %n actualizare recomandată"
-msgstr[1] "Sunt disponibile %n actualizări recomandate"
+msgstr[0] "Este disponibilă o actualizare recomandată"
+msgstr[1] "Sunt disponibile %1 actualizări recomandate"
#: ../src/simpleview.cpp:329 ../src/simpleview.cpp:350
msgid "1 optional update is available.<br>You can select optional updates in the detailed dialog."
msgid_plural "%1 optional updates are available.<br>You can select optional updates in the detailed dialog."
msgstr[0] ""
-"Este disponibilă %n actualizare opţională.<br>"
+"Este disponibilă o actualizare opţională.<br>"
"Puteţi selecta actualizările opţionale din dialogul detaliat."
msgstr[1] ""
-"Sunt disponibile %n actualizări opţionale.<br>"
+"Sunt disponibile %1 actualizări opţionale.<br>"
"Puteţi selecta actualizările opţionale din dialogul detaliat."
#: ../src/simpleview.cpp:335
msgid "%1 optional upgrade is available.<br>You can select optional upgrades in the detailed dialog."
msgid_plural "%1 optional upgrades are available.<br>You can select optional upgrades in the detailed dialog."
msgstr[0] ""
-"Este disponibilă %n actualizare opţională.<br>"
+"Este disponibilă o actualizare opţională.<br>"
"Puteţi selecta actualizările opţionale din dialogul detaliat."
msgstr[1] ""
-"Sunt disponibile %n actualizări opţionale.<br>"
+"Sunt disponibile %1 actualizări opţionale.<br>"
"Puteţi selecta actualizările opţionale din dialogul detaliat."
#: ../src/simpleview.cpp:340
msgid "%1 optional update and upgrade is available.<br>You can select optional updates and upgrades in the detailed dialog."
msgid_plural "%1 optional updates and upgrades are available.<br>You can select optional updates and upgrades in the detailed dialog."
msgstr[0] ""
-"Este disponibilă %n actualizare opţională.<br>"
+"Este disponibilă o actualizare opţională.<br>"
"Puteţi selecta actualizările opţionale din dialogul detaliat."
msgstr[1] ""
-"Sunt disponibile %n actualizări opţionale.<br>"
+"Sunt disponibile %1 actualizări opţionale.<br>"
"Puteţi selecta actualizările opţionale din dialogul detaliat."
#: ../src/simpleview.cpp:362
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kde4-kupdateapplet-0.8.33/src/packagekit/packagekit_updater.cpp new/kde4-kupdateapplet-0.8.34/src/packagekit/packagekit_updater.cpp
--- old/kde4-kupdateapplet-0.8.33/src/packagekit/packagekit_updater.cpp 2008-12-03 13:16:09.000000000 +0100
+++ new/kde4-kupdateapplet-0.8.34/src/packagekit/packagekit_updater.cpp 2008-12-07 04:25:24.000000000 +0100
@@ -218,7 +218,7 @@
else
{
kDebug() << "ignorring error";
-// _errors = true;
+ _softerrors = true;
}
}
@@ -316,7 +316,7 @@
kDebug() << "updates Finished (packages): " << _packageList->children().count();
kDebug() << "updates Finished (drivers): " << _driverList->children().count();
- if (_errors)
+ if (_errors || _softerrors )
{
kDebug() << "there were errors";
return;
@@ -328,7 +328,7 @@
void PackageKitUpdater::slotInstallFinished()
{
- if (_errors)
+ if (_errors || _softerrors)
{
kDebug() << "there were errors";
return;
@@ -362,7 +362,7 @@
kDebug() << "driver search finished (patches): " << _patchList->children().count();
kDebug() << "driver search finished (packages): " << _packageList->children().count();
kDebug() << "driver search finished (drivers): " << _driverList->children().count();
- if (_errors)
+ if (_errors || _softerrors)
{
return;
}
@@ -499,12 +499,9 @@
_driverList->clear();
_securityAvailable=false;
_errors=false;
+ _softerrors=false;
-// NOT NEEDED ANYMORE
-// if (! pkConnector->refreshCache(false) )
-// return;
pkConnector->getUpdates();
- _errors = false;
_get_packages_mutex->unlock();
}
@@ -543,10 +540,10 @@
_driverList->clear();
_securityAvailable=false;
_errors=false;
+ _softerrors=false;
_driverSearch = true;
pkConnector->getDrivers();
- _errors = false;
_get_packages_mutex->unlock();
}
@@ -584,6 +581,7 @@
{
kDebug() << "start installation...";
_errors = false;
+ _softerrors = false;
ASSERT_LISTS_VALID;
@@ -664,8 +662,15 @@
if (answ == QMessageBox::Yes )
{
pkConnector->installSignature(type, key_id, package_id);
+ _softerrors=false;
pkConnector->triggerLastActionAgain();
}
+ else
+ {
+ //declined
+ _softerrors=false;
+ emit checkFinished(); // workaround
+ }
@@ -697,11 +702,13 @@
if( licenseDialog->exec() )
{
pkConnector->acceptEula(eula_id);
+ _softerrors=false;
pkConnector->triggerLastActionAgain();
}
else
{
//declined
+ doCheckForUpdates();
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kde4-kupdateapplet-0.8.33/src/packagekit/packagekit_updater.h new/kde4-kupdateapplet-0.8.34/src/packagekit/packagekit_updater.h
--- old/kde4-kupdateapplet-0.8.33/src/packagekit/packagekit_updater.h 2008-12-03 13:16:09.000000000 +0100
+++ new/kde4-kupdateapplet-0.8.34/src/packagekit/packagekit_updater.h 2008-12-07 04:25:24.000000000 +0100
@@ -118,6 +118,7 @@
bool _securityAvailable;
bool _errors;
+ bool _softerrors; // errors that can be solved by accepting eula and trying again
bool _updateRepoAvailable;
QString _lastStatus;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kde4-kupdateapplet-0.8.33/VERSION.cmake new/kde4-kupdateapplet-0.8.34/VERSION.cmake
--- old/kde4-kupdateapplet-0.8.33/VERSION.cmake 2008-12-03 13:16:09.000000000 +0100
+++ new/kde4-kupdateapplet-0.8.34/VERSION.cmake 2008-12-07 04:25:24.000000000 +0100
@@ -1,3 +1,3 @@
SET(VERSION_MAJOR "0")
SET(VERSION_MINOR "8")
-SET(VERSION_PATCH "33")
+SET(VERSION_PATCH "34")
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org