September 2007 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r7106 - /trunk/updater-kde/package/opensuse-updater-kde.changes
by tgoettlicher＠svn.opensuse.org 05 Sep '07

05 Sep '07

Author: tgoettlicher Date: Wed Sep 5 11:41:53 2007 New Revision: 7106 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7106&view=rev Log: changes Modified: trunk/updater-kde/package/opensuse-updater-kde.changes Modified: trunk/updater-kde/package/opensuse-updater-kde.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/package/opensuse-upd… ============================================================================== --- trunk/updater-kde/package/opensuse-updater-kde.changes (original) +++ trunk/updater-kde/package/opensuse-updater-kde.changes Wed Sep 5 11:41:53 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Sep 5 11:38:34 CEST 2007 - tgoettlicher(a)suse.de + +- added state "no network" with gray tray icon +- r7105 + +------------------------------------------------------------------- Mon Sep 3 16:02:13 CEST 2007 - tgoettlicher(a)suse.de - changed call of "yast2 inst_source" to "yast2 repositories" -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7105 - in /trunk/updater-kde: icons/ updater/
by tgoettlicher＠svn.opensuse.org 05 Sep '07

05 Sep '07

Author: tgoettlicher Date: Wed Sep 5 11:40:46 2007 New Revision: 7105 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7105&view=rev Log: added state no network with gray tray icon Added: trunk/updater-kde/icons/cr16-app-opensuseupdater_gray.png (with props) trunk/updater-kde/icons/cr24-app-opensuseupdater_gray.png (with props) trunk/updater-kde/icons/cr32-app-opensuseupdater_gray.png (with props) trunk/updater-kde/icons/cr48-app-opensuseupdater_gray.png (with props) trunk/updater-kde/icons/opensuseupdater_gray.png (with props) Modified: trunk/updater-kde/updater/Constants.h trunk/updater-kde/updater/MainWindow.cpp trunk/updater-kde/updater/TrayIcon.cpp trunk/updater-kde/updater/Updater.h trunk/updater-kde/updater/simpleview.cpp Added: trunk/updater-kde/icons/cr16-app-opensuseupdater_gray.png URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/icons/cr16-app-opens… ============================================================================== Binary file - no diff available. Added: trunk/updater-kde/icons/cr24-app-opensuseupdater_gray.png URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/icons/cr24-app-opens… ============================================================================== Binary file - no diff available. Added: trunk/updater-kde/icons/cr32-app-opensuseupdater_gray.png URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/icons/cr32-app-opens… ============================================================================== Binary file - no diff available. Added: trunk/updater-kde/icons/cr48-app-opensuseupdater_gray.png URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/icons/cr48-app-opens… ============================================================================== Binary file - no diff available. Added: trunk/updater-kde/icons/opensuseupdater_gray.png URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/icons/opensuseupdate… ============================================================================== Binary file - no diff available. Modified: trunk/updater-kde/updater/Constants.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/Constants.h?… ============================================================================== --- trunk/updater-kde/updater/Constants.h (original) +++ trunk/updater-kde/updater/Constants.h Wed Sep 5 11:40:46 2007 @@ -22,7 +22,7 @@ #define PROGRAM_NAME "opensuseupdater" #define PROGRAM_DISPLAY_NAME "openSUSE Updater" -#define VERSION "0.4" +#define VERSION "0.6" #define TRAY_ICON_GREEN "opensuseupdater_green" #define TRAY_ICON_RED "opensuseupdater_red" @@ -31,6 +31,7 @@ #define TRAY_ICON_CHECKING "opensuseupdater_busy" #define TRAY_ICON_INSTALLING "opensuseupdater_busy" #define TRAY_ICON_UNKNOWN "opensuseupdater_unknown" +#define TRAY_ICON_GRAY "opensuseupdater_gray" #define PROGRAM_ICON "opensuseupdater" Modified: trunk/updater-kde/updater/MainWindow.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.c… ============================================================================== --- trunk/updater-kde/updater/MainWindow.cpp (original) +++ trunk/updater-kde/updater/MainWindow.cpp Wed Sep 5 11:40:46 2007 @@ -376,7 +376,7 @@ _check_updates_action->setEnabled(true); _edit_sources_action->setEnabled(true); - if ( state == APPLET_CHECKING || state == APPLET_INSTALLING ) + if ( state == APPLET_CHECKING || state == APPLET_INSTALLING || state == APPLET_NO_NETWORK ) _check_updates_action->setEnabled(false); else _check_updates_action->setEnabled(true); @@ -734,9 +734,10 @@ if (ConnectionManager::self()->status() != NetworkStatus::Online && ConnectionManager::self()->status() != NetworkStatus::NoNetworks ) { - ConnectionManager::self()->registerConnectSlot(this,SLOT(checkUpdates(displayProgress))); + ConnectionManager::self()->registerConnectSlot(this,SLOT(checkUpdatesWithoutProgress())); kdDebug() << "No network available" << endl; kdDebug() << "Waiting for network connection..." << endl; + slotAppletState(APPLET_NO_NETWORK, 0, 0); return; } Modified: trunk/updater-kde/updater/TrayIcon.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/TrayIcon.cpp… ============================================================================== --- trunk/updater-kde/updater/TrayIcon.cpp (original) +++ trunk/updater-kde/updater/TrayIcon.cpp Wed Sep 5 11:40:46 2007 @@ -103,6 +103,11 @@ setPixmap(loadIcon(TRAY_ICON_GREEN)); break; + case APPLET_NO_NETWORK: + QToolTip::add(this, i18n("Unable to check whether updates are available.")); + setPixmap(loadIcon(TRAY_ICON_GRAY)); + break; + case APPLET_PKGMGR_UPDATES: case APPLET_CRITICAL_UPDATES: QToolTip::add(this, i18n("New software updates are available.")); Modified: trunk/updater-kde/updater/Updater.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/Updater.h?re… ============================================================================== --- trunk/updater-kde/updater/Updater.h (original) +++ trunk/updater-kde/updater/Updater.h Wed Sep 5 11:40:46 2007 @@ -55,7 +55,8 @@ APPLET_INSTALLING, /** installing patches or packages **/ APPLET_PKGMGR_UPDATES, /** Updates available that affect the package manager **/ APPLET_UNKNOWN, /** Unknown update status: No repositories are known to zypper **/ - APPLET_ONLY_OPTIONAL_UPDATES /** Only optional updates are available (for trayicon) **/ + APPLET_ONLY_OPTIONAL_UPDATES, /** Only optional updates are available (for trayicon) **/ + APPLET_NO_NETWORK /** No Network connection available **/ }; /** Modified: trunk/updater-kde/updater/simpleview.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/simpleview.c… ============================================================================== --- trunk/updater-kde/updater/simpleview.cpp (original) +++ trunk/updater-kde/updater/simpleview.cpp Wed Sep 5 11:40:46 2007 @@ -309,6 +309,19 @@ textBrowser->hide(); break; + case APPLET_NO_NETWORK: + headline->setText(i18n("<b>Unable to check whether updates are available.</b>")); + title->show(); + title->setText(""); + recommended->hide(); + norestart->hide(); + install->hide(); + ok->show(); + details->hide(); + bar->hide(); + textBrowser->hide(); + break; + } updateSelection(); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7104 - /trunk/libzypp/package/libzypp.changes
by schubi2＠svn.opensuse.org 04 Sep '07

04 Sep '07

Author: schubi2 Date: Tue Sep 4 12:09:42 2007 New Revision: 7104 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7104&view=rev Log: 7103 Modified: trunk/libzypp/package/libzypp.changes Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Tue Sep 4 12:09:42 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Sep 4 12:09:10 CEST 2007 - schubi(a)suse.de + +- comparing vendor with VendorAttr::equivalent +- revision 7103 + +------------------------------------------------------------------- Mon Sep 3 17:14:02 CEST 2007 - ma(a)suse.de - Reset transact bits when switching status from -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7103 - in /trunk/libzypp/zypp/solver/detail: Helper.cc QueueItemRequire.cc ResolverUpgrade.cc
by schubi2＠svn.opensuse.org 04 Sep '07

04 Sep '07

Author: schubi2 Date: Tue Sep 4 12:08:57 2007 New Revision: 7103 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7103&view=rev Log: comparing vendor with VendorAttr::equivalent Modified: trunk/libzypp/zypp/solver/detail/Helper.cc trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc Modified: trunk/libzypp/zypp/solver/detail/Helper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Helpe… ============================================================================== --- trunk/libzypp/zypp/solver/detail/Helper.cc (original) +++ trunk/libzypp/zypp/solver/detail/Helper.cc Tue Sep 4 12:08:57 2007 @@ -27,7 +27,7 @@ #include "zypp/base/Logger.h" #include "zypp/base/String.h" #include "zypp/base/Gettext.h" - +#include "zypp/VendorAttr.h" #include "zypp/base/Algorithm.h" #include "zypp/ResPool.h" #include "zypp/ResFilters.h" @@ -134,7 +134,7 @@ if ( installed.resolvable() ) { - if ( installed->vendor() != provider->vendor() ) + if ( !VendorAttr::instance().equivalent(installed->vendor(),provider->vendor()) ) { MIL << "Discarding '" << provider << "' from vendor '" << provider->vendor() << "' different to uninstalled '" Modified: trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Queue… ============================================================================== --- trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc (original) +++ trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc Tue Sep 4 12:08:57 2007 @@ -25,7 +25,7 @@ #include "zypp/base/Logger.h" #include "zypp/base/String.h" #include "zypp/base/Gettext.h" - +#include "zypp/VendorAttr.h" #include "zypp/base/Algorithm.h" #include "zypp/ResPool.h" #include "zypp/ResFilters.h" @@ -221,7 +221,7 @@ bool vendorFit = true; if ( provider && upgrades - && provider->vendor() != upgrades->vendor()) { + && !VendorAttr::instance().equivalent(provider->vendor(), upgrades->vendor())) { // checking if there is already an ignore MIL << "provider " << provider << " has ANOTHER vendor '" << provider->vendor() << "' than the updated item " << upgrades << endl; @@ -348,7 +348,7 @@ } else if (provider.status().isKept() && provider.status().isByUser()) { misc_info = new ResolverInfoMisc (RESOLVER_INFO_TYPE_KEEP_PROVIDER, requirer, RESOLVER_INFO_PRIORITY_VERBOSE, match); misc_info->setOtherPoolItem (provider); - } else if (provider->vendor() != requirer->vendor()) { + } else if (!VendorAttr::instance().equivalent(provider->vendor(), requirer->vendor())) { misc_info = new ResolverInfoMisc (RESOLVER_INFO_TYPE_OTHER_VENDOR_PROVIDER, requirer, RESOLVER_INFO_PRIORITY_VERBOSE, match); misc_info->setOtherPoolItem (provider); Modified: trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resol… ============================================================================== --- trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc (original) +++ trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc Tue Sep 4 12:08:57 2007 @@ -42,7 +42,7 @@ #include "zypp/base/String.h" #include "zypp/base/Gettext.h" #include "zypp/base/Exception.h" - +#include "zypp/VendorAttr.h" #include "zypp/base/Algorithm.h" #include "zypp/ResPool.h" #include "zypp/ResStatus.h" @@ -213,7 +213,7 @@ bool operator()( const CapAndItem & cai ) { PoolItem provider( cai.item ); - if ( provider->vendor() != forItem->vendor() ) + if ( !VendorAttr::instance().equivalent(provider->vendor(), forItem->vendor()) ) { MIL << "Discarding '" << provider << "' from vendor '" << provider->vendor() << "' different to uninstalled '" @@ -361,7 +361,7 @@ continue; } - if ( installed->vendor() != candidate->vendor() ) + if ( !VendorAttr::instance().equivalent(installed->vendor(), candidate->vendor()) ) { MIL << "Discarding '" << candidate << "' from vendor '" << candidate->vendor() << "' different to uninstalled '" -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7102 - in /trunk/libzypp/devel/devel.ma: CMakeLists.txt FakePool.cc
by mlandres＠svn.opensuse.org 04 Sep '07

04 Sep '07

Author: mlandres Date: Tue Sep 4 10:40:41 2007 New Revision: 7102 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7102&view=rev Log: backup Added: trunk/libzypp/devel/devel.ma/FakePool.cc Modified: trunk/libzypp/devel/devel.ma/CMakeLists.txt Modified: trunk/libzypp/devel/devel.ma/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/CMakeList… ============================================================================== --- trunk/libzypp/devel/devel.ma/CMakeLists.txt (original) +++ trunk/libzypp/devel/devel.ma/CMakeLists.txt Tue Sep 4 10:40:41 2007 @@ -29,7 +29,7 @@ ## ############################################################ -FOREACH( loop_var ScanSource Iorder Xml Main) +FOREACH( loop_var ScanSource Iorder Xml Main FakePool AOUT Parse Test Basic) ADD_EXECUTABLE( ${loop_var} ${loop_var}.cc ) @@ -39,15 +39,6 @@ ENDFOREACH( loop_var ) -FOREACH( loop_var AOUT Parse Test Basic) - ADD_EXECUTABLE( ${loop_var} - ${loop_var}.cc - ) - TARGET_LINK_LIBRARIES( ${loop_var} - zypp - ) -ENDFOREACH( loop_var ) - FOREACH( loop_var MaTest ) ADD_EXECUTABLE( ${loop_var} ${loop_var}.cc Added: trunk/libzypp/devel/devel.ma/FakePool.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/FakePool.… ============================================================================== --- trunk/libzypp/devel/devel.ma/FakePool.cc (added) +++ trunk/libzypp/devel/devel.ma/FakePool.cc Tue Sep 4 10:40:41 2007 @@ -0,0 +1,84 @@ +#include "Tools.h" +#include "Tools.h" + +#include <iostream> + +#include <zypp/base/LogControl.h> +#include <zypp/base/LogTools.h> +#include <zypp/base/String.h> +#include <zypp/base/SerialNumber.h> +#include <zypp/PathInfo.h> +#include <zypp/TmpPath.h> +#include "zypp/ResPoolProxy.h" + +using namespace std; +using namespace zypp; +using namespace zypp::ui; + +bool chst( Selectable::Ptr & sel, Status status ) +{ + DBG << "+++ " << sel << endl; + Status ostatus( sel->status() ); + bool res = sel->set_status( status ); + (res?MIL:WAR) << ostatus << " -> " << status << " ==>(" << res << ") " << sel->status() << endl; + DBG << "--- " << sel << endl; + return res; +} + +/****************************************************************** +** +** FUNCTION NAME : main +** FUNCTION TYPE : int +*/ +int main( int argc, char * argv[] ) +{ + INT << "===[START]==========================================" << endl; + + const char *const lines[] = { + "@ package", + "@ installed", + "- foo 1 1 i686", + "@ available", + "- foo 2 1 i686", + "@ fin" + }; + + debug::addPool( lines, lines+(sizeof(lines)/sizeof(const char *const)) ); + + ResPool pool( getZYpp()->pool() ); + ResPoolProxy uipool( getZYpp()->poolProxy() ); + + USR << pool << endl; + USR << uipool << endl; + + //for_each( pool.begin(), pool.end(), Print() ); + + Selectable::Ptr sel( *uipool.byKindBegin<Package>() ); + +/* enum Status + { + S_Protected, // Keep this unmodified ( have installedObj && S_Protected ) + S_Taboo, // Keep this unmodified ( have no installedObj && S_Taboo) + // requested by user: + S_Del, // delete installedObj ( clears S_Protected if set ) + S_Update, // install candidateObj ( have installedObj, clears S_Protected if set ) + S_Install, // install candidateObj ( have no installedObj, clears S_Taboo if set ) + // not requested by user: + S_AutoDel, // delete installedObj + S_AutoUpdate, // install candidateObj ( have installedObj ) + S_AutoInstall, // install candidateObj ( have no installedObj ) + // no modification: + S_KeepInstalled, // no modification ( have installedObj && !S_Protected, clears S_Protected if set ) + S_NoInst, // no modification ( have no installedObj && !S_Taboo, clears S_Taboo if set ) + }; +*/ + MIL << sel << endl; + chst( sel, ui::S_Update ); + chst( sel, ui::S_Install ); + chst( sel, ui::S_Protected ); + chst( sel, ui::S_KeepInstalled ); + + INT << "===[END]============================================" << endl + << endl; + return 0; +} -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7101 - /trunk/updater-gnome/package/opensuse-updater-gnome.changes
by joshkress＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: joshkress Date: Mon Sep 3 18:00:03 2007 New Revision: 7101 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7101&view=rev Log: changes Modified: trunk/updater-gnome/package/opensuse-updater-gnome.changes Modified: trunk/updater-gnome/package/opensuse-updater-gnome.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/package/opensuse-u… ============================================================================== --- trunk/updater-gnome/package/opensuse-updater-gnome.changes (original) +++ trunk/updater-gnome/package/opensuse-updater-gnome.changes Mon Sep 3 18:00:03 2007 @@ -3,6 +3,8 @@ - affects-package-manager patches handled properly - fixed memory problem +- r7097 +- v0.4.2 ------------------------------------------------------------------- Tue Sep 3 12:49:55 CEST 2007 - jkress(a)suse.de -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7100 - /trunk/zypper/package/zypper.changes
by jkupec＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: jkupec Date: Mon Sep 3 17:33:51 2007 New Revision: 7100 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7100&view=rev Log: changes Modified: trunk/zypper/package/zypper.changes Modified: trunk/zypper/package/zypper.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/package/zypper.changes?re… ============================================================================== --- trunk/zypper/package/zypper.changes (original) +++ trunk/zypper/package/zypper.changes Mon Sep 3 17:33:51 2007 @@ -1,10 +1,16 @@ ------------------------------------------------------------------- +Mon Sep 3 17:32:33 CEST 2007 - jkupec(a)suse.cz + +- fix broken compiler flags (schwab) +- r7099 +- 0.8.19 + +------------------------------------------------------------------- Mon Sep 3 17:09:00 CEST 2007 - jkupec(a)suse.cz - authentication prompt implemented (#190609) - LOCK documention added to man page (mvidner) - r7093 -- 0.8.19 ------------------------------------------------------------------- Mon Sep 3 14:15:59 CEST 2007 - jkupec(a)suse.cz -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7099 - /trunk/zypper/zypper.spec.cmake
by jkupec＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: jkupec Date: Mon Sep 3 17:32:26 2007 New Revision: 7099 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7099&view=rev Log: - fixed compiler flags (schwab) Modified: trunk/zypper/zypper.spec.cmake Modified: trunk/zypper/zypper.spec.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/zypper.spec.cmake?rev=709… ============================================================================== --- trunk/zypper/zypper.spec.cmake (original) +++ trunk/zypper/zypper.spec.cmake Mon Sep 3 17:32:26 2007 @@ -1,7 +1,7 @@ # # spec file for package @PACKAGE@ (Version @VERSION@) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -14,7 +14,7 @@ BuildRequires: libzypp-devel > 3.20.1 boost-devel >= 1.33.1 gettext-devel >= 0.15 readline-devel >= 5.1 BuildRequires: gcc-c++ >= 4.2 cmake >= 2.4.6 pkg-config >= 0.20 Requires: procps -License: GPL +License: GPL v2 or later Group: System/Packages BuildRoot: %{_tmppath}/%{name}-%{version}-build Autoreqprov: on @@ -24,7 +24,7 @@ Release: 0 Source: @PACKAGE@-@VERSION@.tar.bz2 Prefix: /usr -Url: http://en.opensuse.org/Zypper +URL: http://en.opensuse.org/Zypper Provides: y2pmsh Obsoletes: y2pmsh @@ -46,8 +46,9 @@ cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \ -DSYSCONFDIR=%{_sysconfdir} \ -DMANDIR=%{_mandir} \ - -DCMAKE_C_FLAGS="%{optflags}" \ - -DCMAKE_CXX_FLAGS="%{optflags}" \ + -DCMAKE_VERBOSE_MAKEFILE=TRUE \ + -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \ -DCMAKE_BUILD_TYPE=Release \ .. -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7098 - in /trunk/updater-gnome: VERSION.cmake opensuse-updater-gnome.spec package/opensuse-updater-gnome.changes
by joshkress＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: joshkress Date: Mon Sep 3 17:23:22 2007 New Revision: 7098 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7098&view=rev Log: - changes - spec file - r7097 - v0.4.2 Modified: trunk/updater-gnome/VERSION.cmake trunk/updater-gnome/opensuse-updater-gnome.spec trunk/updater-gnome/package/opensuse-updater-gnome.changes Modified: trunk/updater-gnome/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/VERSION.cmake?rev=… ============================================================================== --- trunk/updater-gnome/VERSION.cmake (original) +++ trunk/updater-gnome/VERSION.cmake Mon Sep 3 17:23:22 2007 @@ -20,4 +20,4 @@ SET(VERSION_MAJOR "0") SET(VERSION_MINOR "4") -SET(VERSION_PATCH "1") +SET(VERSION_PATCH "2") Modified: trunk/updater-gnome/opensuse-updater-gnome.spec URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/opensuse-updater-g… ============================================================================== --- trunk/updater-gnome/opensuse-updater-gnome.spec (original) +++ trunk/updater-gnome/opensuse-updater-gnome.spec Mon Sep 3 17:23:22 2007 @@ -1,5 +1,5 @@ # -# spec file for package opensuse-updater-gnome (Version 0.4.1) +# spec file for package opensuse-updater-gnome (Version 0.4.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,13 +16,13 @@ License: GPL v2 or later Group: System/Packages Summary: GNOME updater applet for OpenSUSE -Version: 0.4.1 +Version: 0.4.2 Release: 1 URL: http://en.opensuse.org/GNOME_Updater_Applet BuildRoot: %{_tmppath}/%{name}-%{version}-build Prefix: /usr Source0: %{name}-%{version}.tar.bz2 -Requires: zypper >= 0.5.3 +Requires: zypper >= 0.8.18 Requires: libglade2 libgnome gnome-panel libgnomesu # No translations yet. # Requires: %{name}-lang = %{version} @@ -96,6 +96,9 @@ #%files lang -f %{name}.lang %changelog +* Mon Sep 03 2007 - jkress(a)suse.de +- v0.4.2 +- zypper dependency bumped to v0.8.18 * Thu Aug 30 2007 - jkress(a)suse.de - v0.4.1 * Tue Aug 07 2007 - maw(a)suse.de Modified: trunk/updater-gnome/package/opensuse-updater-gnome.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/package/opensuse-u… ============================================================================== --- trunk/updater-gnome/package/opensuse-updater-gnome.changes (original) +++ trunk/updater-gnome/package/opensuse-updater-gnome.changes Mon Sep 3 17:23:22 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Sep 3 17:17:51 CEST 2007 - jkress(a)suse.de + +- affects-package-manager patches handled properly +- fixed memory problem + +------------------------------------------------------------------- Tue Sep 3 12:49:55 CEST 2007 - jkress(a)suse.de - took care of yet another Gtk-CRITICAL -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7097 - in /trunk/updater-gnome/src: updater-applet-support.c updater-applet-support.h updater-backend.c updater-backend.h zypp/updater-zypp.c
by joshkress＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: joshkress Date: Mon Sep 3 17:13:15 2007 New Revision: 7097 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7097&view=rev Log: - affects-package-management patches now handled properly - fix some memory propblems Modified: trunk/updater-gnome/src/updater-applet-support.c trunk/updater-gnome/src/updater-applet-support.h trunk/updater-gnome/src/updater-backend.c trunk/updater-gnome/src/updater-backend.h trunk/updater-gnome/src/zypp/updater-zypp.c Modified: trunk/updater-gnome/src/updater-applet-support.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-applet… ============================================================================== --- trunk/updater-gnome/src/updater-applet-support.c (original) +++ trunk/updater-gnome/src/updater-applet-support.c Mon Sep 3 17:13:15 2007 @@ -7,9 +7,20 @@ #include <gtk/gtk.h> + #include "updater-applet-support.h" void updater_applet_set_icon(UpdaterApplet *applet, const char *icon_stock_id) { gtk_status_icon_set_from_stock (GTK_STATUS_ICON (applet->applet_icon), icon_stock_id); } + +void updater_applet_restart(UpdaterApplet *applet) +{ + g_print ("updater_applet_restart: calling updater_destroy!\n"); + updater_destroy(applet->updater); + g_print ("updater_applet_restart: calling applet in 2 sec.\n"); + system("(sleep 2; opensuse-updater-gnome-applet ) &"); + g_print ("updater_applet_restart: calling gtk_main_quit!\n"); + gtk_main_quit (); +} Modified: trunk/updater-gnome/src/updater-applet-support.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-applet… ============================================================================== --- trunk/updater-gnome/src/updater-applet-support.h (original) +++ trunk/updater-gnome/src/updater-applet-support.h Mon Sep 3 17:13:15 2007 @@ -36,4 +36,6 @@ /** Sets applet icon to \a icon_stock_id. See ICON_* stock IDs definitions. */ void updater_applet_set_icon(UpdaterApplet *applet, const char *icon_stock_id); +void updater_applet_restart(UpdaterApplet *applet); + #endif /*UPDATERAPPLET_H_*/ Modified: trunk/updater-gnome/src/updater-backend.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-backen… ============================================================================== --- trunk/updater-gnome/src/updater-backend.c (original) +++ trunk/updater-gnome/src/updater-backend.c Mon Sep 3 17:13:15 2007 @@ -206,17 +206,19 @@ void backend_install_watch (GPid pid, gint status, - gpointer updater) + gpointer updater_ptr) { + SUSEUpdater *updater = updater_ptr; + g_print ("child process %d (you) exited with status %d.\n",pid,status); updater_ui_set_for_active_operation(updater,FALSE); - - /* This doesn't work. It never worked. I could kill this code! - verb_check_now (updater, 0, NULL); - */ - updater_check_now(updater); + g_print ("Includes pkgmanager updates: %d.\n", updater->backend->includes_package_management_update); + if(updater->backend->includes_package_management_update) + updater_applet_restart(updater->applet); + else + updater_check_now(updater); } Modified: trunk/updater-gnome/src/updater-backend.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-backen… ============================================================================== --- trunk/updater-gnome/src/updater-backend.h (original) +++ trunk/updater-gnome/src/updater-backend.h Mon Sep 3 17:13:15 2007 @@ -54,6 +54,8 @@ gboolean recommended_are_mandatory; gboolean include_optional_patches; gboolean include_third_party_packages; + + gboolean includes_package_management_update; // process' output buffers guint8 *poutbuf; @@ -103,7 +105,7 @@ void backend_install_watch (GPid pid, gint status, - gpointer backend); + gpointer backend_ptr); GIOChannel * set_up_io_channel (gint fd, GIOCondition cond, GIOFunc func, gpointer data); Modified: trunk/updater-gnome/src/zypp/updater-zypp.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/zypp/updater-z… ============================================================================== --- trunk/updater-gnome/src/zypp/updater-zypp.c (original) +++ trunk/updater-gnome/src/zypp/updater-zypp.c Mon Sep 3 17:13:15 2007 @@ -93,6 +93,8 @@ backend->third_party_packages_count = 0; backend->needrestart_updates_count = 0; + backend->includes_package_management_update = FALSE; + backend->updates_list_security = g_string_new(NULL); backend->updates_list_security_needrestart = g_string_new(NULL); backend->updates_list_recommended_patches = g_string_new(NULL); @@ -141,6 +143,8 @@ if ((!xmlStrcmp(item->resolvabletype, (const xmlChar *)"patch"))) { /* We have a patch */ + if ((!xmlStrcmp(item->pkgmanager, (const xmlChar *)"true"))) /* A very special patch */ + backend->includes_package_management_update = TRUE; if (patch_source == "") /* Setting the patch source to exclude packages from this source */ { @@ -148,7 +152,7 @@ g_print("Patch Source: %s\n", patch_source); } - if ((!xmlStrcmp(item->type, (const xmlChar *)"security"))) + if ((!xmlStrcmp(item->type, (const xmlChar *)"security")) || (!xmlStrcmp(item->pkgmanager, (const xmlChar *)"true"))) { /* It's a security patch! */ if ((!xmlStrcmp(item->restart, (const xmlChar *)"true"))) @@ -468,7 +472,7 @@ return 0; g_string_free(zypper_gui_cmd, TRUE); - g_free(install_argv); + // g_free(install_argv); return pid; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0