August 2007 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r7034 - /trunk/updater-gnome/package/opensuse-updater-gnome.changes
by joshkress＠svn.opensuse.org 30 Aug '07

30 Aug '07

Author: joshkress Date: Thu Aug 30 18:55:26 2007 New Revision: 7034 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7034&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 Thu Aug 30 18:55:26 2007 @@ -1,11 +1,20 @@ ------------------------------------------------------------------- +Fri Aug 30 18:48:59 CEST 2007 - jkress(a)suse.de + +- fixed segfault +- fixed callback errors +- fixed classification errors +- install-gui hanging when no packages are to be installed +- r7032 +- 0.4.1 + +------------------------------------------------------------------- Fri Aug 30 15:20:26 CEST 2007 - jkress(a)suse.de - Changes in classifiaction code - All callbacks for simple view - simple view reacts immediately to user interaction - r7015 -- 0.4.1 ------------------------------------------------------------------- Thu Aug 29 16:20:03 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] r7033 - in /trunk/libzypp/zypp: MediaSetAccess.cc ZYppCallbacks.h
by jkupec＠svn.opensuse.org 30 Aug '07

30 Aug '07

Author: jkupec Date: Thu Aug 30 18:54:17 2007 New Revision: 7033 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7033&view=rev Log: - enable changing url in requestMedia callback (#294481) Modified: trunk/libzypp/zypp/MediaSetAccess.cc trunk/libzypp/zypp/ZYppCallbacks.h Modified: trunk/libzypp/zypp/MediaSetAccess.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/MediaSetAccess.cc?r… ============================================================================== --- trunk/libzypp/zypp/MediaSetAccess.cc (original) +++ trunk/libzypp/zypp/MediaSetAccess.cc Thu Aug 30 18:54:17 2007 @@ -93,13 +93,14 @@ { callback::SendReport<media::MediaChangeReport> report; media::MediaManager media_mgr; - // get the mediaId, but don't try to attach it here - media::MediaAccessId media = getMediaAccessId( media_nr); bool exists = false; do { + // get the mediaId, but don't try to attach it here + media::MediaAccessId media = getMediaAccessId( media_nr); + try { DBG << "Cheking if file " << file @@ -141,7 +142,13 @@ reason = media::MediaChangeReport::WRONG; } - user = media::MediaChangeReport::ABORT; + user = report->requestMedia ( + _url, + media_nr, + reason, + excp.asUserString() + ); + DBG << "doesFileExist exception caught, callback answer: " << user << endl; if( user == media::MediaChangeReport::ABORT ) @@ -176,6 +183,9 @@ { // retry DBG << "Going to try again" << endl; + // invalidate current media access id + media_mgr.close(media); + _medias.erase(media_nr); // not attaching, media set will do that for us // this could generate uncaught exception (#158620) @@ -199,11 +209,14 @@ { callback::SendReport<media::MediaChangeReport> report; media::MediaManager media_mgr; - // get the mediaId, but don't try to attach it here - media::MediaAccessId media = getMediaAccessId( media_nr); + + media::MediaAccessId media; do { + // get the mediaId, but don't try to attach it here + media::MediaAccessId media = getMediaAccessId( media_nr); + try { DBG << "Going to try to provide file " << file @@ -247,7 +260,7 @@ user = checkonly ? media::MediaChangeReport::ABORT : report->requestMedia ( - Repository::noRepository, + _url, media_nr, reason, excp.asUserString() @@ -287,6 +300,9 @@ { // retry DBG << "Going to try again" << endl; + // invalidate current media access id + media_mgr.close(media); + _medias.erase(media_nr); // not attaching, media set will do that for us // this could generate uncaught exception (#158620) @@ -313,11 +329,13 @@ { callback::SendReport<media::MediaChangeReport> report; media::MediaManager media_mgr; + media::MediaAccessId _media; - // get the mediaId, but don't try to attach it here - media::MediaAccessId _media = getMediaAccessId(media_nr); do { + // get the mediaId, but don't try to attach it here + _media = getMediaAccessId(media_nr); + try { DBG << "Going to try provide direcotry " << dir @@ -381,7 +399,7 @@ reason = media::MediaChangeReport::WRONG; } - user = report->requestMedia(Repository::noRepository, + user = report->requestMedia(_url, media_nr, reason, excp.asUserString()); @@ -414,6 +432,9 @@ { // retry DBG << "Going to try again" << endl; + // invalidate current media access id + media_mgr.close(_media); + _medias.erase(media_nr); // not attaching, media set will do that for us // this could generate uncaught exception (#158620) Modified: trunk/libzypp/zypp/ZYppCallbacks.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ZYppCallbacks.h?rev… ============================================================================== --- trunk/libzypp/zypp/ZYppCallbacks.h (original) +++ trunk/libzypp/zypp/ZYppCallbacks.h Thu Aug 30 18:54:17 2007 @@ -296,7 +296,7 @@ }; virtual Action requestMedia( - Repository /*source*/ + Url & /* url (I/O parameter) */ , unsigned /*mediumNr*/ , Error /*error*/ , const std::string &/*description*/ -- 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] r7032 - in /trunk/updater-gnome/src: updater-applet-callbacks.c updater-backend.c updater-callbacks.c updater-support.c updater.c zypp/updater-zypp.c zypp/updater-zypper-gui.c
by joshkress＠svn.opensuse.org 30 Aug '07

30 Aug '07

Author: joshkress Date: Thu Aug 30 18:52:34 2007 New Revision: 7032 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7032&view=rev Log: Fixed all this: * a segfault * callback errors * classification errors * install-gui hanging when no packages are to be installed Modified: trunk/updater-gnome/src/updater-applet-callbacks.c trunk/updater-gnome/src/updater-backend.c trunk/updater-gnome/src/updater-callbacks.c trunk/updater-gnome/src/updater-support.c trunk/updater-gnome/src/updater.c trunk/updater-gnome/src/zypp/updater-zypp.c trunk/updater-gnome/src/zypp/updater-zypper-gui.c Modified: trunk/updater-gnome/src/updater-applet-callbacks.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-applet… ============================================================================== --- trunk/updater-gnome/src/updater-applet-callbacks.c (original) +++ trunk/updater-gnome/src/updater-applet-callbacks.c Thu Aug 30 18:52:34 2007 @@ -92,6 +92,8 @@ gtk_widget_destroy (applet->updater->preferences_window); updater_ui_update(applet->updater); applet->updater->preferences_win_shown = FALSE; + while (gtk_events_pending ()) + gtk_main_iteration (); } else gtk_window_present (GTK_WINDOW (applet->updater->preferences_window)); 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 Thu Aug 30 18:52:34 2007 @@ -105,6 +105,12 @@ { SUSEUpdater *updater = updater_ptr; + gsize mandatory_count; + gsize optional_count; + + mandatory_count = 0; + optional_count = 0; + g_print ("child process %d exited with status %d.\n",pid,status); g_print ("calling out2update_list()...\n"); @@ -121,7 +127,56 @@ // updater_ui_populate_update_list(updater); updater_ui_set_for_active_operation(updater, FALSE); + + /** + * update applet icon + */ + if (updater->settings_recommended_are_mandatory) + { + mandatory_count = mandatory_count + + updater->backend->security_updates_count + + updater->backend->security_restart_count + + updater->backend->recommended_updates_count + + updater->backend->recommended_restart_count; + + if (updater->settings_include_optional_patches) + { + optional_count = optional_count + updater->backend->optional_updates_count + + updater->backend->optional_restart_count; + } + + if (updater->settings_include_third_party_updates) + optional_count = optional_count + updater->backend->third_party_packages_count; + } + else + { + mandatory_count = mandatory_count + + updater->backend->security_updates_count + + updater->backend->security_restart_count; + + optional_count = optional_count + + updater->backend->recommended_updates_count + + updater->backend->recommended_restart_count; + + if (updater->settings_include_optional_patches) + { + optional_count = optional_count + updater->backend->optional_updates_count + + updater->backend->optional_restart_count; + } + + if (updater->settings_include_third_party_updates) + optional_count = optional_count + updater->backend->third_party_packages_count; + } + + if (mandatory_count > 0) + updater_applet_set_icon(updater->applet, ICON_RED); + else if (optional_count > 0) + updater_applet_set_icon(updater->applet, ICON_YELLOW); + else + updater_applet_set_icon(updater->applet, ICON_GREEN); + // update the ui elements with new data + updater_ui_update(updater); Modified: trunk/updater-gnome/src/updater-callbacks.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-callba… ============================================================================== --- trunk/updater-gnome/src/updater-callbacks.c (original) +++ trunk/updater-gnome/src/updater-callbacks.c Thu Aug 30 18:52:34 2007 @@ -3,7 +3,6 @@ '---------------------------------------------------------------------------*/ #include "updater-callbacks.h" -#include "updater-support.h" #include "updater-backend.h" #include "updater.h" #include <gtk/gtk.h> @@ -217,7 +216,9 @@ void on_simpleWindow_checkbuttonRestart_toggled (GtkWidget *widget, gpointer user_data) { SUSEUpdater *updater = user_data; + updater_ui_update(updater); + } void on_CloseButton_clicked (GtkWidget *widget, gpointer user_data) @@ -248,9 +249,15 @@ SUSEUpdater *updater = user_data; if (gtk_combo_box_get_active(GTK_COMBO_BOX (updater->preferences_window_combo_recommended)) == 0) + { updater->settings_recommended_are_mandatory = 1; + updater->backend->recommended_are_mandatory = 1; + } else + { updater->settings_recommended_are_mandatory = 0; + updater->backend->recommended_are_mandatory = 0; + } g_printf("Recommended: %d\n", updater->settings_recommended_are_mandatory); updater_save_settings(updater); } @@ -260,6 +267,7 @@ SUSEUpdater *updater = user_data; updater->settings_include_optional_patches = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (updater->preferences_window_checkbutton_optional_patches)); + updater->backend->include_optional_patches = updater->settings_include_optional_patches; g_printf("Optional?: %d\n", updater->settings_include_optional_patches); updater_save_settings(updater); } @@ -269,6 +277,7 @@ SUSEUpdater *updater = user_data; updater->settings_include_third_party_updates = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (updater->preferences_window_checkbutton_3rd_party_updates)); + updater->backend->include_third_party_packages = updater->settings_include_third_party_updates; g_printf("Third Party?: %d\n", updater->settings_include_third_party_updates); updater_save_settings(updater); } @@ -278,8 +287,8 @@ SUSEUpdater *updater = user_data; gtk_widget_hide(widget); - updater_ui_update(updater); updater->preferences_win_shown = FALSE; + updater_ui_update(updater); return TRUE; } Modified: trunk/updater-gnome/src/updater-support.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-suppor… ============================================================================== --- trunk/updater-gnome/src/updater-support.c (original) +++ trunk/updater-gnome/src/updater-support.c Thu Aug 30 18:52:34 2007 @@ -9,7 +9,7 @@ #include "updater-support.h" #include "updater-applet-support.h" - +#include "updater-backend.h" // ---------------------------------------------------------------------------- @@ -239,6 +239,7 @@ gtk_widget_set_sensitive (updater->simple_window_checkbuttonRecommended, TRUE); gtk_widget_set_sensitive (updater->simple_window_buttonDetails, TRUE); gtk_widget_set_sensitive (updater->simple_window_buttonInstall, TRUE); + gtk_widget_show (updater->simple_window_checkbuttonRestart); /** * Check the settings and update the counts we care about */ @@ -273,16 +274,7 @@ optional_count += updater->backend->third_party_packages_count; all_count = mandatory_count + optional_count; - /** - * update applet icon - */ - if (mandatory_count > 0) - updater_applet_set_icon(updater->applet, ICON_RED); - else if (optional_count > 0) - updater_applet_set_icon(updater->applet, ICON_YELLOW); - else - updater_applet_set_icon(updater->applet, ICON_GREEN); - + /** * update simple view */ @@ -293,7 +285,6 @@ gtk_label_set_text (GTK_LABEL (updater->simple_window_labelUpdates), "There are no updates that need to be installed."); gtk_button_set_label (GTK_BUTTON (updater->simple_window_checkbuttonRecommended), "No optional updates available"); gtk_widget_set_sensitive (updater->simple_window_checkbuttonRecommended, FALSE); - gtk_button_set_label (GTK_BUTTON (updater->simple_window_checkbuttonRestart), ""); gtk_widget_hide (updater->simple_window_checkbuttonRestart); gtk_widget_set_sensitive (updater->simple_window_buttonDetails, FALSE); gtk_widget_set_sensitive (updater->simple_window_buttonInstall, FALSE); Modified: trunk/updater-gnome/src/updater.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater.c?rev=… ============================================================================== --- trunk/updater-gnome/src/updater.c (original) +++ trunk/updater-gnome/src/updater.c Thu Aug 30 18:52:34 2007 @@ -67,7 +67,7 @@ updater_init_main_win (updater, show_main_window); updater_init_simple_win (updater, show_simple_window); // updater_init_preferences_win (updater); - + updater_ui_update(updater); return updater; } 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 Thu Aug 30 18:52:34 2007 @@ -329,6 +329,13 @@ } else { + mandatory_count = mandatory_count + + backend->security_updates_count + + backend->security_restart_count; + + mandatory_restart_count = mandatory_restart_count + + backend->security_restart_count; + optional_count = optional_count + backend->recommended_updates_count + backend->recommended_restart_count; @@ -391,22 +398,29 @@ else g_string_append_printf(zypper_gui_cmd, "ZOPTIONS_RECOMMENDED_TRUE ", NULL); - if (backend->third_party_packages_count == 0) + if (backend->third_party_packages_count == 0 || !backend->include_third_party_packages) g_string_append_printf(zypper_gui_cmd, "ZOPTIONS_PACKAGES_FALSE ", NULL); else g_string_append_printf(zypper_gui_cmd, "ZOPTIONS_PACKAGES_TRUE ", NULL); - g_string_append_printf(zypper_gui_cmd, "%d %d %d", mandatory_count, - optional_count, - (backend->third_party_packages_count)); + g_string_append_printf(zypper_gui_cmd, "%d %d ", mandatory_count, + optional_count); + if (backend->include_third_party_packages) + g_string_append_printf(zypper_gui_cmd, "%d", (backend->third_party_packages_count)); + else + g_string_append_printf(zypper_gui_cmd, "0", NULL); g_string_append_printf(zypper_gui_cmd, "%s", backend->updates_list_security->str); g_string_append_printf(zypper_gui_cmd, "%s", backend->updates_list_security_needrestart->str); g_string_append_printf(zypper_gui_cmd, "%s", backend->updates_list_recommended_patches->str); g_string_append_printf(zypper_gui_cmd, "%s", backend->updates_list_recommended_patches_needrestart->str); - g_string_append_printf(zypper_gui_cmd, "%s", backend->updates_list_optional_patches->str); - g_string_append_printf(zypper_gui_cmd, "%s", backend->updates_list_optional_patches_needrestart->str); - g_string_append_printf(zypper_gui_cmd, "%s", backend->updates_list_third_party_packages->str); + if (backend->include_optional_patches) + { + g_string_append_printf(zypper_gui_cmd, "%s", backend->updates_list_optional_patches->str); + g_string_append_printf(zypper_gui_cmd, "%s", backend->updates_list_optional_patches_needrestart->str); + } + if (backend->include_third_party_packages) + g_string_append_printf(zypper_gui_cmd, "%s", backend->updates_list_third_party_packages->str); g_print("%s \n", zypper_gui_cmd->str); @@ -422,19 +436,24 @@ else g_string_append_printf(zypper_gui_cmd, "ZOPTIONS_RECOMMENDED_TRUE ", NULL); - if (backend->third_party_packages_count == 0) + if (backend->third_party_packages_count == 0 || !backend->include_third_party_packages) g_string_append_printf(zypper_gui_cmd, "ZOPTIONS_PACKAGES_FALSE ", NULL); else g_string_append_printf(zypper_gui_cmd, "ZOPTIONS_PACKAGES_TRUE ", NULL); - g_string_append_printf(zypper_gui_cmd, "%d %d %d", (mandatory_count - mandatory_restart_count), - (optional_count - optional_restart_count), - (backend->third_party_packages_count)); + g_string_append_printf(zypper_gui_cmd, "%d %d ", (mandatory_count - mandatory_restart_count), + (optional_count - optional_restart_count)); + if (backend->include_third_party_packages) + g_string_append_printf(zypper_gui_cmd, "%d", (backend->third_party_packages_count)); + else + g_string_append_printf(zypper_gui_cmd, "0", NULL); g_string_append_printf(zypper_gui_cmd, "%s", backend->updates_list_security->str); g_string_append_printf(zypper_gui_cmd, "%s", backend->updates_list_recommended_patches->str); - g_string_append_printf(zypper_gui_cmd, "%s", backend->updates_list_optional_patches->str); - g_string_append_printf(zypper_gui_cmd, "%s", backend->updates_list_third_party_packages->str); + if (backend->include_optional_patches) + g_string_append_printf(zypper_gui_cmd, "%s", backend->updates_list_optional_patches->str); + if (backend->include_third_party_packages) + g_string_append_printf(zypper_gui_cmd, "%s", backend->updates_list_third_party_packages->str); g_print("%s \n", zypper_gui_cmd->str); Modified: trunk/updater-gnome/src/zypp/updater-zypper-gui.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/zypp/updater-z… ============================================================================== --- trunk/updater-gnome/src/zypp/updater-zypper-gui.c (original) +++ trunk/updater-gnome/src/zypp/updater-zypper-gui.c Thu Aug 30 18:52:34 2007 @@ -254,7 +254,7 @@ { if (security_patches_done) { - if (recommended_patches_done) + if (recommended_patches_done || !packages_included) { gtk_image_set_from_stock (GTK_IMAGE (imageRecommended), GTK_STOCK_APPLY, GTK_ICON_SIZE_MENU); gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progressbar), 1.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] r7031 - /trunk/libzypp/package/libzypp.changes
by mlandres＠svn.opensuse.org 30 Aug '07

30 Aug '07

Author: mlandres Date: Thu Aug 30 18:17:28 2007 New Revision: 7031 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7031&view=rev Log: changes 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 Thu Aug 30 18:17:28 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Aug 30 18:22:32 CEST 2007 - ma(a)suse.de + +- Filter readonly mount points in DiskUsageCounter (#297405) +- revision 7030 + +------------------------------------------------------------------- Thu Aug 30 17:25:14 CEST 2007 - ma(a)suse.de - Safe fix for bug #299680. -- 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] r7030 - /trunk/libzypp/zypp/DiskUsageCounter.cc
by mlandres＠svn.opensuse.org 30 Aug '07

30 Aug '07

Author: mlandres Date: Thu Aug 30 18:17:12 2007 New Revision: 7030 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7030&view=rev Log: Filter readonly mount points in DiskUsageCounter (#297405) Modified: trunk/libzypp/zypp/DiskUsageCounter.cc Modified: trunk/libzypp/zypp/DiskUsageCounter.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/DiskUsageCounter.cc… ============================================================================== --- trunk/libzypp/zypp/DiskUsageCounter.cc (original) +++ trunk/libzypp/zypp/DiskUsageCounter.cc Thu Aug 30 18:17:12 2007 @@ -277,6 +277,10 @@ break; } } + if ( ro ) { + DBG << "Filter ro mount point : " << l << std::endl; + continue; + } // // statvfs (full path!) and get the data @@ -304,6 +308,6 @@ str << "dir:[" << obj.dir << "] [ bs: " << obj.block_size << " ts: " << obj.total_size << "]" << std::endl; return str; } - + } // namespace zypp /////////////////////////////////////////////////////////////////// -- 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] r7029 - in /trunk/libzypp-testsuite/pokus/tests/trust-tests: yast1.ref.out yast2.ref.out yum1.ref.out yum2.ref.out
by aschnell＠svn.opensuse.org 30 Aug '07

30 Aug '07

Author: aschnell Date: Thu Aug 30 17:57:10 2007 New Revision: 7029 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7029&view=rev Log: - adapted Modified: trunk/libzypp-testsuite/pokus/tests/trust-tests/yast1.ref.out trunk/libzypp-testsuite/pokus/tests/trust-tests/yast2.ref.out trunk/libzypp-testsuite/pokus/tests/trust-tests/yum1.ref.out trunk/libzypp-testsuite/pokus/tests/trust-tests/yum2.ref.out Modified: trunk/libzypp-testsuite/pokus/tests/trust-tests/yast1.ref.out URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/pokus/tests/tr… ============================================================================== --- trunk/libzypp-testsuite/pokus/tests/trust-tests/yast1.ref.out (original) +++ trunk/libzypp-testsuite/pokus/tests/trust-tests/yast1.ref.out Thu Aug 30 17:57:10 2007 @@ -1,2 +1,4 @@ ZYppException caught +History: + - Signature verification failed for content Valid metadata not found at specified URL(s) Modified: trunk/libzypp-testsuite/pokus/tests/trust-tests/yast2.ref.out URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/pokus/tests/tr… ============================================================================== --- trunk/libzypp-testsuite/pokus/tests/trust-tests/yast2.ref.out (original) +++ trunk/libzypp-testsuite/pokus/tests/trust-tests/yast2.ref.out Thu Aug 30 17:57:10 2007 @@ -1,2 +1,4 @@ ZYppException caught +History: + - Signature verification failed for content Valid metadata not found at specified URL(s) Modified: trunk/libzypp-testsuite/pokus/tests/trust-tests/yum1.ref.out URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/pokus/tests/tr… ============================================================================== --- trunk/libzypp-testsuite/pokus/tests/trust-tests/yum1.ref.out (original) +++ trunk/libzypp-testsuite/pokus/tests/trust-tests/yum1.ref.out Thu Aug 30 17:57:10 2007 @@ -1,2 +1,4 @@ ZYppException caught +History: + - Signature verification failed for repomd.xml Valid metadata not found at specified URL(s) Modified: trunk/libzypp-testsuite/pokus/tests/trust-tests/yum2.ref.out URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/pokus/tests/tr… ============================================================================== --- trunk/libzypp-testsuite/pokus/tests/trust-tests/yum2.ref.out (original) +++ trunk/libzypp-testsuite/pokus/tests/trust-tests/yum2.ref.out Thu Aug 30 17:57:10 2007 @@ -1,2 +1,4 @@ ZYppException caught +History: + - Signature verification failed for repomd.xml Valid metadata not found at specified URL(s) -- 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] r7028 - /trunk/libzypp-testsuite/pokus/src/testsuite.rb
by aschnell＠svn.opensuse.org 30 Aug '07

30 Aug '07

Author: aschnell Date: Thu Aug 30 17:40:27 2007 New Revision: 7028 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7028&view=rev Log: - tiny stuff Modified: trunk/libzypp-testsuite/pokus/src/testsuite.rb Modified: trunk/libzypp-testsuite/pokus/src/testsuite.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/pokus/src/test… ============================================================================== --- trunk/libzypp-testsuite/pokus/src/testsuite.rb (original) +++ trunk/libzypp-testsuite/pokus/src/testsuite.rb Thu Aug 30 17:40:27 2007 @@ -39,11 +39,9 @@ # ruby does *not* have a mkdtemp function! path = '/tmp/no-fun' - IO.popen('mktemp -d') {|pipe| path = pipe.gets.chomp } - - output = OutputFactory(type, path) - output.write(packages) + IO.popen('mktemp -d') {|pipe| path = pipe.gets.chomp} + OutputFactory(type, path).write(packages) sign_repo(type, path) return path -- 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] r7027 - /trunk/libzypp/package/libzypp.changes
by mlandres＠svn.opensuse.org 30 Aug '07

30 Aug '07

Author: mlandres Date: Thu Aug 30 17:36:25 2007 New Revision: 7027 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7027&view=rev Log: changes 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 Thu Aug 30 17:36:25 2007 @@ -3,6 +3,7 @@ - Safe fix for bug #299680. - version 3.20.1 +- revision 7026 ------------------------------------------------------------------- Thu Aug 30 17:31:33 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] r7026 - in /trunk/libzypp: VERSION.cmake devel/devel.ma/Parse.cc package/libzypp.changes zypp/repo/cached/RepoImpl.cc zypp/repo/cached/RepoImpl.h
by mlandres＠svn.opensuse.org 30 Aug '07

30 Aug '07

Author: mlandres Date: Thu Aug 30 17:35:59 2007 New Revision: 7026 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7026&view=rev Log: - Safe fix for bug #299680. Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/devel/devel.ma/Parse.cc trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/repo/cached/RepoImpl.cc trunk/libzypp/zypp/repo/cached/RepoImpl.h Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=7026&r… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Thu Aug 30 17:35:59 2007 @@ -47,4 +47,4 @@ SET(LIBZYPP_MAJOR "3") SET(LIBZYPP_MINOR "20") SET(LIBZYPP_COMPATMINOR "19") -SET(LIBZYPP_PATCH "0") +SET(LIBZYPP_PATCH "1") Modified: trunk/libzypp/devel/devel.ma/Parse.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/Parse.cc?… ============================================================================== --- trunk/libzypp/devel/devel.ma/Parse.cc (original) +++ trunk/libzypp/devel/devel.ma/Parse.cc Thu Aug 30 17:35:59 2007 @@ -4,6 +4,7 @@ #include <zypp/base/Exception.h> #include <zypp/base/LogTools.h> #include <zypp/base/ProvideNumericId.h> +#include <zypp/AutoDispose.h> #include "zypp/ZYppFactory.h" #include "zypp/ResPoolProxy.h" @@ -331,6 +332,19 @@ //zypp::base::LogControl::instance().logfile( "log.restrict" ); INT << "===[START]==========================================" << endl; + { + AutoDispose<int> fd( 0 ); + SEC << fd << endl; + fd = ::open( "/tmp/foo", 1 ); + SEC << fd << endl; + + if ( fd == -1 ) + ; // error report + else + fd.setDispose( ::close ); + } + return 0; + DigestReceive foo; KeyRingSignalsReceive baa; 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 Thu Aug 30 17:35:59 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Aug 30 17:25:14 CEST 2007 - ma(a)suse.de + +- Safe fix for bug #299680. +- version 3.20.1 + +------------------------------------------------------------------- Thu Aug 30 17:31:33 CEST 2007 - jkupec(a)suse.cz - remember the cause of the RepoException when refreshing metadata @@ -11,7 +17,7 @@ - Bugfix: If a requirement has been fulfilled by more than one language resolvables only thatone will be taken which fits to the selected language. -- r 7018 +- r 7018 ------------------------------------------------------------------- Thu Aug 30 15:14:23 CEST 2007 - jkupec(a)suse.cz Modified: trunk/libzypp/zypp/repo/cached/RepoImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/cached/RepoImp… ============================================================================== --- trunk/libzypp/zypp/repo/cached/RepoImpl.cc (original) +++ trunk/libzypp/zypp/repo/cached/RepoImpl.cc Thu Aug 30 17:35:59 2007 @@ -59,27 +59,20 @@ , _rquery(opts.dbdir) , _options(opts) { - } RepoImpl::~RepoImpl() { - _ticks.toMax(); MIL << "Destroying repo '" << info().alias() << "'" << endl; - _ticks.noSend(); } -void read_capabilities( sqlite3_connection &con, - map<data::RecordId, NVRAD> &nvras, - ProgressData &progress ); - void RepoImpl::createResolvables() { - _ticks = ProgressData(); - _ticks.sendTo(_options.readingResolvablesProgress); - _ticks.name(str::form(_( "Reading '%s' repository cache"), info().alias().c_str())); - CombinedProgressData subprogrcv(_ticks); - + ProgressData ticks; + ticks.sendTo(_options.readingResolvablesProgress); + ticks.name(str::form(_( "Reading '%s' repository cache"), info().alias().c_str())); + CombinedProgressData subprogrcv(ticks); + debug::Measure m("create resolvables"); CapFactory capfactory; try @@ -100,7 +93,7 @@ map<data::RecordId, pair<Resolvable::Kind, NVRAD> > nvras; sqlite3_reader reader = cmd.executereader(); - + while(reader.read()) { long long id = reader.getint64(0); @@ -115,11 +108,11 @@ MIL << "Done reading resolvables nvra" << endl; - _ticks.tick(); + ticks.tick(); - read_capabilities( con, _options.repository_id, nvras ); + read_capabilities( con, _options.repository_id, nvras, ticks ); - _ticks.tick(); + ticks.tick(); for ( map<data::RecordId, pair<Resolvable::Kind, NVRAD> >::const_iterator it = nvras.begin(); it != nvras.end(); ++it ) { @@ -196,10 +189,10 @@ void RepoImpl::createPatchAndDeltas() { - _ticks = ProgressData(); - _ticks.sendTo(_options.readingPatchDeltasProgress ); - _ticks.name(str::form(_( "Reading patch and delta rpms from '%s' repository cache"), info().alias().c_str())); - CombinedProgressData subprogrcv(_ticks); + ProgressData ticks; + ticks.sendTo(_options.readingPatchDeltasProgress ); + ticks.name(str::form(_( "Reading patch and delta rpms from '%s' repository cache"), info().alias().c_str())); + CombinedProgressData subprogrcv(ticks); try { sqlite3_connection con((_options.dbdir + "zypp.db").asString().c_str()); @@ -316,7 +309,8 @@ void RepoImpl::read_capabilities( sqlite3_connection &con, data::RecordId repo_id, - map<data::RecordId, pair<Resolvable::Kind, NVRAD> > &nvras ) + map<data::RecordId, pair<Resolvable::Kind, NVRAD> > &nvras, + ProgressData &ticks ) { CapFactory capfactory; @@ -344,9 +338,9 @@ sqlite3_command select_modalias_cmd( con, "select mc.refers_kind, mc.name, mc.pkgname, mc.value, mc.relation, mc.dependency_type, mc.resolvable_id from modalias_capabilities mc, resolvables res where mc.resolvable_id=res.id and res.repository_id=:repo_id;"); sqlite3_command select_filesystem_cmd( con, "select v.refers_kind, n.name, v.dependency_type, v.resolvable_id from filesystem_capabilities v, names n, resolvables res where v.name_id=n.id and v.resolvable_id=res.id and res.repository_id=:repo_id;"); - + sqlite3_command select_split_cmd( con, "select v.refers_kind, n.name, dn.name, fn.name, v.dependency_type, v.resolvable_id from split_capabilities v, names n, resolvables res, files f, dir_names dn, file_names fn where v.name_id=n.id and v.resolvable_id=res.id and f.id=v.file_id and f.dir_name_id=dn.id and f.file_name_id=fn.id and res.repository_id=:repo_id;"); - + sqlite3_command select_other_cmd( con, "select oc.refers_kind, oc.value, oc.dependency_type, oc.resolvable_id from other_capabilities oc, resolvables res where oc.resolvable_id=res.id and res.repository_id=:repo_id;"); @@ -354,13 +348,13 @@ debug::Measure mnc("read named capabilities"); select_named_cmd.bind(":repo_id", repo_id); sqlite3_reader reader = select_named_cmd.executereader(); - + // FIXME Move this logic to tick()? Date start(Date::now()); while ( reader.read() ) { - _ticks.tick(); - + ticks.tick(); + Resolvable::Kind refer = _type_cache.kindFor(reader.getint(0)); Rel rel = _type_cache.relationFor(reader.getint(5)); @@ -387,7 +381,7 @@ sqlite3_reader reader = select_file_cmd.executereader(); while ( reader.read() ) { - _ticks.tick(); + ticks.tick(); Resolvable::Kind refer = _type_cache.kindFor(reader.getint(0)); capability::FileCap *fcap = new capability::FileCap( refer, reader.getstring(1) + "/" + reader.getstring(2) ); zypp::Dep deptype = _type_cache.deptypeFor(reader.getint(3)); @@ -402,7 +396,7 @@ sqlite3_reader reader = select_hal_cmd.executereader(); while ( reader.read() ) { - _ticks.tick(); + ticks.tick(); //select hc.refers_kind, hc.name, hc.value, hc.relation, hc.dependency_type, hc.resolvable_id from hal_capabilities hc Resolvable::Kind refer = _type_cache.kindFor(reader.getint(0)); @@ -421,7 +415,7 @@ sqlite3_reader reader = select_modalias_cmd.executereader(); while ( reader.read() ) { - _ticks.tick(); + ticks.tick(); Resolvable::Kind refer = _type_cache.kindFor(reader.getint(0)); Rel rel = _type_cache.relationFor(reader.getint(4)); @@ -432,14 +426,14 @@ nvras[rid].second[deptype].insert( capfactory.fromImpl( capability::CapabilityImpl::Ptr(mcap) ) ); } } - + { debug::Measure mnf("read filesystem capabilities"); select_filesystem_cmd.bind(":repo_id", repo_id); sqlite3_reader reader = select_filesystem_cmd.executereader(); while ( reader.read() ) { - _ticks.tick(); + ticks.tick(); Resolvable::Kind refer = _type_cache.kindFor(reader.getint(0)); capability::FilesystemCap *fscap = new capability::FilesystemCap( refer, reader.getstring(1) ); @@ -455,7 +449,7 @@ sqlite3_reader reader = select_split_cmd.executereader(); while ( reader.read() ) { - _ticks.tick(); + ticks.tick(); Resolvable::Kind refer = _type_cache.kindFor(reader.getint(0)); capability::SplitCap *scap = new capability::SplitCap( refer, reader.getstring(1), @@ -465,14 +459,14 @@ nvras[rid].second[deptype].insert( capfactory.fromImpl( capability::CapabilityImpl::Ptr(scap) ) ); } } - + { debug::Measure mnf("read other capabilities"); select_other_cmd.bind(":repo_id", repo_id); sqlite3_reader reader = select_other_cmd.executereader(); while ( reader.read() ) { - _ticks.tick(); + ticks.tick(); //select oc.refers_kind, oc.value, oc.dependency_type, oc.resolvable_id from other_capabilities oc; Resolvable::Kind refer = _type_cache.kindFor(reader.getint(0)); Modified: trunk/libzypp/zypp/repo/cached/RepoImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/cached/RepoImp… ============================================================================== --- trunk/libzypp/zypp/repo/cached/RepoImpl.h (original) +++ trunk/libzypp/zypp/repo/cached/RepoImpl.h Thu Aug 30 17:35:59 2007 @@ -79,12 +79,11 @@ private: void read_capabilities( sqlite3x::sqlite3_connection &con, data::RecordId repo_id, - std::map<data::RecordId, - std::pair<Resolvable::Kind, NVRAD> > &nvras ); + std::map<data::RecordId, std::pair<Resolvable::Kind, NVRAD> > &nvras, + ProgressData &ticks ); cache::CacheTypes _type_cache; cache::ResolvableQuery _rquery; RepoOptions _options; - ProgressData _ticks; public: }; /////////////////////////////////////////////////////////////////// -- 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] r7025 - in /trunk/libzypp-bindings/swig: python/CMakeLists.txt ruby/CMakeLists.txt
by aschnell＠svn.opensuse.org 30 Aug '07

30 Aug '07

Author: aschnell Date: Thu Aug 30 17:34:51 2007 New Revision: 7025 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7025&view=rev Log: - improved makefiles Modified: trunk/libzypp-bindings/swig/python/CMakeLists.txt trunk/libzypp-bindings/swig/ruby/CMakeLists.txt Modified: trunk/libzypp-bindings/swig/python/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/python/CMa… ============================================================================== --- trunk/libzypp-bindings/swig/python/CMakeLists.txt (original) +++ trunk/libzypp-bindings/swig/python/CMakeLists.txt Thu Aug 30 17:34:51 2007 @@ -1,15 +1,15 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing") +FIND_PACKAGE(PythonInterp REQUIRED) FIND_PACKAGE(PythonLibs REQUIRED) -MESSAGE( STATUS "Python include path: ${PYTHON_INCLUDE_PATH}" ) -IF(DEFINED LIB) - SET(PYTHON_LIB_PATH "/usr/${LIB}/python2.5/site-packages/") -ELSE(DEFINED LIB) - SET(PYTHON_LIB_PATH "/usr/lib/python2.5/site-packages/") -ENDIF(DEFINED LIB) +EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils import sysconfig; print sysconfig.get_python_lib()" OUTPUT_VARIABLE PYTHON_LIB_PATH) +STRING(REPLACE "\n" "" PYTHON_LIB_PATH "${PYTHON_LIB_PATH}") + +MESSAGE(STATUS "Python executable: ${PYTHON_EXECUTABLE}") MESSAGE(STATUS "Python lib path: ${PYTHON_LIB_PATH}") +MESSAGE(STATUS "Python include path: ${PYTHON_INCLUDE_PATH}") SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx" ) SET( SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/zypp.i" ) Modified: trunk/libzypp-bindings/swig/ruby/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/ruby/CMake… ============================================================================== --- trunk/libzypp-bindings/swig/ruby/CMakeLists.txt (original) +++ trunk/libzypp-bindings/swig/ruby/CMakeLists.txt Thu Aug 30 17:34:51 2007 @@ -2,10 +2,12 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing") FIND_PACKAGE(Ruby REQUIRED) -EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['vendorarchdir']" - OUTPUT_VARIABLE RUBY_VENDOR_ARCH_DIR) -MESSAGE( STATUS "Ruby vendor arch dir: ${RUBY_VENDOR_ARCH_DIR}" ) -MESSAGE( STATUS "Ruby include path: ${RUBY_INCLUDE_PATH}" ) + +EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['vendorarchdir']" OUTPUT_VARIABLE RUBY_VENDOR_ARCH_DIR) + +MESSAGE(STATUS "Ruby executable: ${RUBY_EXECUTABLE}") +MESSAGE(STATUS "Ruby vendor arch dir: ${RUBY_VENDOR_ARCH_DIR}") +MESSAGE(STATUS "Ruby include path: ${RUBY_INCLUDE_PATH}") SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx" ) SET( SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/zypp.i" ) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0