May 2008 - openSUSE Commits - openSUSE Mailing Lists

commit gnome-packagekit
by root＠Hilbert.suse.de 31 May '08

31 May '08

Hello community, here is the log from the commit of package gnome-packagekit checked in at Sat May 31 12:20:34 CEST 2008. -------- --- GNOME/gnome-packagekit/gnome-packagekit.changes 2008-05-24 21:20:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-packagekit/gnome-packagekit.changes 2008-05-30 21:13:35.373626000 +0200 @@ -1,0 +2,6 @@ +Fri May 30 21:18:54 CEST 2008 - sreeves(a)suse.de + +- Fix for BNC#395445 - gpk-update-icon crash + Fix for BNC#390658 - don't show piwo + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-packagekit.spec ++++++ --- /var/tmp/diff_new_pack.l28325/_old 2008-05-31 12:20:21.000000000 +0200 +++ /var/tmp/diff_new_pack.l28325/_new 2008-05-31 12:20:21.000000000 +0200 @@ -13,7 +13,7 @@ Name: gnome-packagekit Url: http://packagekit.org/ Version: 0.2.1 -Release: 9 +Release: 12 License: GPL v2 or later Source: %{name}-%{version}.tar.bz2 Patch: gnome-packagekit_release.patch @@ -89,6 +89,9 @@ %files lang -f %{name}.lang %changelog +* Fri May 30 2008 sreeves(a)suse.de +- Fix for BNC#395445 - gpk-update-icon crash + Fix for BNC#390658 - don't show piwo * Sat May 24 2008 sreeves(a)suse.de - Fix for BNC#392064 - weird notifications * Tue May 13 2008 aj(a)suse.de ++++++ gnome-packagekit-fate303359.patch ++++++ --- /var/tmp/diff_new_pack.l28325/_old 2008-05-31 12:20:21.000000000 +0200 +++ /var/tmp/diff_new_pack.l28325/_new 2008-05-31 12:20:21.000000000 +0200 @@ -1,21 +1,60 @@ diff --git a/src/gpk-update-icon.c b/src/gpk-update-icon.c -index 6dd369a..46f129a 100644 +index 6dd369a..995194e 100644 --- a/src/gpk-update-icon.c +++ b/src/gpk-update-icon.c -@@ -154,6 +154,16 @@ main (int argc, char *argv[]) - pk_debug_init (verbose); - gtk_init (&argc, &argv); +@@ -101,6 +101,46 @@ pk_dbus_connection_replaced_cb (LibGBus *libgbus, gpointer data) + gtk_main_quit (); + } ++static gboolean ++run_configure_idle_cb (gpointer data) ++{ ++ gboolean retval = g_spawn_command_line_sync ("gnomesu -- /sbin/yast2 piwo", NULL, NULL, NULL, NULL); ++ if (!retval) { ++ pk_debug ("Failure launching online config program"); ++ } ++ g_main_loop_quit ((GMainLoop*)data); ++ return FALSE; ++} ++ ++static void ++check_for_online_update_configured () ++{ + if (! g_file_test ("/var/lib/YaST2/registrationDidRun", G_FILE_TEST_EXISTS)) { -+ pk_debug ("Online update not configured - will launch"); -+ gboolean retval = g_spawn_command_line_sync ("gnomesu -- /sbin/yast2 piwo", NULL, NULL, NULL, NULL); -+ if (!retval) { -+ pk_debug ("Failure launching online config program"); ++ pk_debug ("Online update not configured - will launch after short delay"); ++ g_usleep (1000000 * 8); //sleep for x seconds so we dont show before the rest of the screen is done ++ GMainLoop * loop; ++ GtkWidget *dialog = gtk_message_dialog_new ( ++ NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _("Install latest updates?")); ++ gtk_window_set_title (GTK_WINDOW(dialog), _("openSUSE Updater")); ++ gtk_window_set_default_icon_name ("system-software-installer"); ++ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(dialog), _("Do you want to check online for updates?")); ++ gint result = gtk_dialog_run (GTK_DIALOG(dialog)); ++ gtk_widget_destroy (dialog); ++ switch (result) { ++ case GTK_RESPONSE_YES: ++ loop = g_main_loop_new (NULL, FALSE); ++ g_idle_add_full (G_PRIORITY_LOW, run_configure_idle_cb, loop, NULL); ++ g_main_loop_run (loop); //do this so the first dialog goes away ++ g_main_loop_unref (loop); ++ break; ++ default: ++ break; + } + } + else + pk_debug ("Online update already configured"); -+ ++} ++ + /** + * main: + **/ +@@ -154,6 +194,8 @@ main (int argc, char *argv[]) + pk_debug_init (verbose); + gtk_init (&argc, &argv); + ++ check_for_online_update_configured (); ++ /* add application specific icons to search path */ gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), PK_DATA G_DIR_SEPARATOR_S "icons"); ++++++ gnome-packagekit-openSUSE-branch.patch ++++++ --- /var/tmp/diff_new_pack.l28325/_old 2008-05-31 12:20:21.000000000 +0200 +++ /var/tmp/diff_new_pack.l28325/_new 2008-05-31 12:20:21.000000000 +0200 @@ -1,5 +1,17 @@ +diff --git a/src/gpk-client.c b/src/gpk-client.c +index bee5c87..60c5f15 100644 +--- a/src/gpk-client.c ++++ b/src/gpk-client.c +@@ -1260,6 +1260,7 @@ gpk_client_get_updates (GpkClient *gclient, GError **error) + g_return_val_if_fail (GPK_IS_CLIENT (gclient), FALSE); + + /* reset */ ++ pk_debug ("Enter gpk_client_get_updates"); + ret = pk_client_reset (gclient->priv->client_action, &error_local); + if (!ret) { + gpk_client_error_msg (gclient, _("Failed to reset client"), _("Failed to reset get-updates")); diff --git a/src/gpk-notify.c b/src/gpk-notify.c -index 556341a..d4ec8bb 100644 +index 556341a..2265091 100644 --- a/src/gpk-notify.c +++ b/src/gpk-notify.c @@ -147,7 +147,7 @@ gpk_notify_about_dialog_url_cb (GtkAboutDialog *about, const char *address, gpoi @@ -87,7 +99,7 @@ /* get the most important icon */ value = pk_enums_contain_priority (infos, -@@ -529,30 +538,49 @@ gpk_notify_get_update_policy (GpkNotify *notify) +@@ -529,30 +538,50 @@ gpk_notify_get_update_policy (GpkNotify *notify) } /** @@ -112,12 +124,13 @@ const gchar *icon; + gchar **package_ids; + PkPackageList *list; -+ GError *error; ++ GError *error = NULL; - g_return_if_fail (GPK_IS_NOTIFY (notify)); + g_return_val_if_fail (GPK_IS_NOTIFY (notify), FALSE); -+ -+ if (pk_task_list_contains_role (notify->priv->tlist, PK_ROLE_ENUM_UPDATE_SYSTEM)) { + ++ if (pk_task_list_contains_role (notify->priv->tlist, PK_ROLE_ENUM_UPDATE_SYSTEM) || ++ pk_task_list_contains_role (notify->priv->tlist, PK_ROLE_ENUM_GET_UPDATES)) { + pk_debug ("Not checking for updates as already in progress"); + return FALSE; + } @@ -131,7 +144,7 @@ + g_error_free (error); + return FALSE; + } - ++ + /* we have updates to process */ status_security = g_string_new (""); status_tooltip = g_string_new (""); @@ -143,7 +156,7 @@ pk_debug ("length=%i", length); /* we have no updates */ -@@ -564,7 +592,7 @@ gpk_notify_query_updates_finished_cb (PkClient *client, PkExitEnum exit, guint r +@@ -564,7 +593,7 @@ gpk_notify_query_updates_finished_cb (PkClient *client, PkExitEnum exit, guint r /* find the security updates */ for (i=0; i<length; i++) { @@ -152,7 +165,7 @@ pk_debug ("%s, %s, %s", pk_info_enum_to_text (item->info), item->package_id, item->summary); ident = pk_package_id_new_from_string (item->package_id); -@@ -577,9 +605,6 @@ gpk_notify_query_updates_finished_cb (PkClient *client, PkExitEnum exit, guint r +@@ -577,9 +606,6 @@ gpk_notify_query_updates_finished_cb (PkClient *client, PkExitEnum exit, guint r pk_package_id_free (ident); } @@ -162,7 +175,7 @@ /* do we do the automatic updates? */ update = gpk_notify_get_update_policy (notify); if (update == PK_UPDATE_ENUM_UNKNOWN) { -@@ -588,7 +613,7 @@ gpk_notify_query_updates_finished_cb (PkClient *client, PkExitEnum exit, guint r +@@ -588,7 +614,7 @@ gpk_notify_query_updates_finished_cb (PkClient *client, PkExitEnum exit, guint r } /* work out icon */ @@ -171,7 +184,7 @@ gpk_smart_icon_set_icon_name (notify->priv->sicon, icon); gpk_smart_icon_pulse (notify->priv->sicon); -@@ -624,10 +649,6 @@ gpk_notify_query_updates_finished_cb (PkClient *client, PkExitEnum exit, guint r +@@ -624,10 +650,6 @@ gpk_notify_query_updates_finished_cb (PkClient *client, PkExitEnum exit, guint r /* just do security updates */ if (update == PK_UPDATE_ENUM_SECURITY) { @@ -182,7 +195,7 @@ if (security_array->len == 0) { pk_debug ("policy security, but none available"); goto out; -@@ -661,136 +682,15 @@ gpk_notify_query_updates_finished_cb (PkClient *client, PkExitEnum exit, guint r +@@ -661,136 +683,15 @@ gpk_notify_query_updates_finished_cb (PkClient *client, PkExitEnum exit, guint r /* shouldn't happen */ pk_warning ("unknown update mode"); out: @@ -193,7 +206,7 @@ - /* get rid of the array, and free the contents */ g_ptr_array_free (security_array, TRUE); -} - +- -/** - * gpk_notify_error_code_cb: - **/ @@ -205,7 +218,7 @@ - g_return_if_fail (GPK_IS_NOTIFY (notify)); - - title = gpk_error_enum_to_localised_text (error_code); -- + - /* ignore some errors */ - if (error_code == PK_ERROR_ENUM_PROCESS_KILL || - error_code == PK_ERROR_ENUM_TRANSACTION_CANCELLED) { @@ -320,7 +333,7 @@ * gpk_notify_updates_changed_cb: **/ static void -@@ -847,10 +747,43 @@ gpk_notify_task_list_changed_cb (PkTaskList *tlist, GpkNotify *notify) +@@ -847,10 +748,43 @@ gpk_notify_task_list_changed_cb (PkTaskList *tlist, GpkNotify *notify) static void gpk_notify_auto_refresh_cache_cb (GpkAutoRefresh *arefresh, GpkNotify *notify) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-desktop
by root＠Hilbert.suse.de 31 May '08

31 May '08

Hello community, here is the log from the commit of package gnome-desktop checked in at Sat May 31 12:20:11 CEST 2008. -------- --- GNOME/gnome-desktop/gnome-desktop.changes 2008-05-11 11:51:01.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-desktop/gnome-desktop.changes 2008-05-29 20:32:07.182570000 +0200 @@ -1,0 +2,5 @@ +Thu May 29 20:38:11 CEST 2008 - federico(a)novell.com + +- Updated gnome-desktop-randr-1.2.diff with the latest fixes from upstream. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-desktop.spec ++++++ --- /var/tmp/diff_new_pack.V26213/_old 2008-05-31 12:20:01.000000000 +0200 +++ /var/tmp/diff_new_pack.V26213/_new 2008-05-31 12:20:01.000000000 +0200 @@ -17,7 +17,7 @@ Group: System/GUI/GNOME Obsoletes: gnome-core Version: 2.22.1 -Release: 20 +Release: 23 Summary: The GNOME Desktop API Library Source: %{name}-%{version}.tar.bz2 Url: http://www.gnome.org @@ -182,6 +182,8 @@ %{_datadir}/gtk-doc/html/gnome-desktop %changelog +* Thu May 29 2008 federico(a)novell.com +- Updated gnome-desktop-randr-1.2.diff with the latest fixes from upstream. * Sun May 11 2008 coolo(a)suse.de - fix renames of xxbit packages * Thu May 08 2008 federico(a)novell.com ++++++ gnome-desktop-randr-1.2.diff ++++++ ++++ 647 lines (skipped) ++++ between GNOME/gnome-desktop/gnome-desktop-randr-1.2.diff ++++ and /mounts/work_src_done/STABLE/gnome-desktop/gnome-desktop-randr-1.2.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-control-center
by root＠Hilbert.suse.de 31 May '08

31 May '08

Hello community, here is the log from the commit of package gnome-control-center checked in at Sat May 31 12:19:50 CEST 2008. -------- --- GNOME/gnome-control-center/gnome-control-center.changes 2008-05-13 11:03:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-control-center/gnome-control-center.changes 2008-05-29 20:34:20.204416000 +0200 @@ -1,0 +2,5 @@ +Thu May 29 20:40:32 CEST 2008 - federico(a)novell.com + +- Updated gnome-control-center-randr-1.2.diff with the latest fixes from upstream. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-control-center.spec ++++++ --- /var/tmp/diff_new_pack.k25067/_old 2008-05-31 12:19:41.000000000 +0200 +++ /var/tmp/diff_new_pack.k25067/_new 2008-05-31 12:19:41.000000000 +0200 @@ -19,7 +19,7 @@ Obsoletes: fontilus themus acme Provides: fontilus themus acme Version: 2.22.1 -Release: 19 +Release: 27 Summary: The GNOME Control Center Source: gnome-%{_name}-%{version}.tar.bz2 Source1: control-center-art.tar.bz2 @@ -227,6 +227,8 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Thu May 29 2008 federico(a)novell.com +- Updated gnome-control-center-randr-1.2.diff with the latest fixes from upstream. * Tue May 13 2008 vuntz(a)suse.de - Add gnome-control-center-bnc373197-layout-switch-keybinding.patch to change the default keyboard layout switching to ++++++ gnome-control-center-randr-1.2.diff ++++++ ++++ 978 lines (skipped) ++++ between GNOME/gnome-control-center/gnome-control-center-randr-1.2.diff ++++ and /mounts/work_src_done/STABLE/gnome-control-center/gnome-control-center-randr-1.2.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit autoyast2
by root＠Hilbert.suse.de 31 May '08

31 May '08

Hello community, here is the log from the commit of package autoyast2 checked in at Sat May 31 12:17:43 CEST 2008. -------- --- autoyast2/autoyast2.changes 2008-05-27 15:20:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/autoyast2/autoyast2.changes 2008-05-30 16:25:35.146539000 +0200 @@ -1,0 +2,7 @@ +Fri May 30 16:21:02 CEST 2008 - ug(a)suse.de + +- fix for cloning the software section + (bnc#391770) +- 2.16.18 + +------------------------------------------------------------------- Old: ---- autoyast2-2.16.17.tar.bz2 New: ---- autoyast2-2.16.18.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.r20423/_old 2008-05-31 12:17:31.000000000 +0200 +++ /var/tmp/diff_new_pack.r20423/_new 2008-05-31 12:17:31.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package autoyast2 (Version 2.16.17) +# spec file for package autoyast2 (Version 2.16.18) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,12 +13,12 @@ Url: http://www.suse.de/~ug Name: autoyast2 -Version: 2.16.17 +Version: 2.16.18 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: autoyast2-2.16.17.tar.bz2 +Source0: autoyast2-2.16.18.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets java2-devel-packages libxslt perl-XML-Writer pkg-config sgml-skel update-desktop-files xorg-x11-libs yast2-bootloader yast2-country yast2-devtools yast2-mouse yast2-testsuite yast2-transfer yast2-update # API for Disabled Modules (ProductControl) @@ -54,7 +54,7 @@ %package installation License: GPL v2 or later -Version: 2.16.17 +Version: 2.16.18 Release: 1 Summary: YaST2 - Auto Installation Modules Group: System/YaST @@ -76,7 +76,7 @@ Anas Nashif %prep -%setup -n autoyast2-2.16.17 +%setup -n autoyast2-2.16.18 %build %{prefix}/bin/y2tool y2autoconf @@ -216,6 +216,10 @@ %dir /var/lib/autoinstall %dir /var/lib/autoinstall/autoconf %changelog +* Fri May 30 2008 ug(a)suse.de +- fix for cloning the software section + (bnc#391770) +- 2.16.18 * Tue May 27 2008 ug(a)suse.de - UI endless loop fixed - 2.16.17 ++++++ autoyast2-2.16.17.tar.bz2 -> autoyast2-2.16.18.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.17/configure new/autoyast2-2.16.18/configure --- old/autoyast2-2.16.17/configure 2008-05-27 15:15:51.000000000 +0200 +++ new/autoyast2-2.16.18/configure 2008-05-30 16:22:39.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for autoyast2 2.16.17. +# Generated by GNU Autoconf 2.61 for autoyast2 2.16.18. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='autoyast2' PACKAGE_TARNAME='autoyast2' -PACKAGE_VERSION='2.16.17' -PACKAGE_STRING='autoyast2 2.16.17' +PACKAGE_VERSION='2.16.18' +PACKAGE_STRING='autoyast2 2.16.18' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1205,7 +1205,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures autoyast2 2.16.17 to adapt to many kinds of systems. +\`configure' configures autoyast2 2.16.18 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1276,7 +1276,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of autoyast2 2.16.17:";; + short | recursive ) echo "Configuration of autoyast2 2.16.18:";; esac cat <<\_ACEOF @@ -1354,7 +1354,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -autoyast2 configure 2.16.17 +autoyast2 configure 2.16.18 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1368,7 +1368,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by autoyast2 $as_me 2.16.17, which was +It was created by autoyast2 $as_me 2.16.18, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2189,7 +2189,7 @@ # Define the identity of the package. PACKAGE='autoyast2' - VERSION='2.16.17' + VERSION='2.16.18' cat >>confdefs.h <<_ACEOF @@ -2416,7 +2416,7 @@ -VERSION="2.16.17" +VERSION="2.16.18" RPMNAME="autoyast2" MAINTAINER="Uwe Gansert <ug(a)suse.de>" @@ -3429,7 +3429,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by autoyast2 $as_me 2.16.17, which was +This file was extended by autoyast2 $as_me 2.16.18, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3472,7 +3472,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -autoyast2 config.status 2.16.17 +autoyast2 config.status 2.16.18 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.17/configure.in new/autoyast2-2.16.18/configure.in --- old/autoyast2-2.16.17/configure.in 2008-05-27 15:15:46.000000000 +0200 +++ new/autoyast2-2.16.18/configure.in 2008-05-30 16:22:34.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(autoyast2, 2.16.17, http://bugs.opensuse.org/, autoyast2) +AC_INIT(autoyast2, 2.16.18, http://bugs.opensuse.org/, autoyast2) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.16.17" +VERSION="2.16.18" RPMNAME="autoyast2" MAINTAINER="Uwe Gansert <ug(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.17/src/modules/AutoinstClone.ycp new/autoyast2-2.16.18/src/modules/AutoinstClone.ycp --- old/autoyast2-2.16.17/src/modules/AutoinstClone.ycp 2007-05-21 12:26:37.000000000 +0200 +++ new/autoyast2-2.16.18/src/modules/AutoinstClone.ycp 2008-05-30 16:22:30.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Anas Nashif <nashif(a)suse.de> * - * $Id: AutoinstClone.ycp 37560 2007-04-19 08:52:19Z ug $ + * $Id: AutoinstClone.ycp 47966 2008-05-30 14:22:30Z ug $ * * */ @@ -305,6 +305,39 @@ return drives; } + global define boolean isPatternFulfilled( string p ) { + list<map<string,any> > all_xpatterns = Pkg::ResolvableDependencies ("", `pattern, ""); + list<string> inst = Pkg::GetPackages(`installed, true); + boolean ret = true; + + foreach( map<string,any> dep, all_xpatterns, ``{ + if( ret == true && dep["name"]:"" == p ) { + foreach( map<string,string> dep2, dep["dependencies"]:[], ``{ + if( dep2["dep_kind"]:"" == "requires" ) { + if( dep2["res_kind"]:"" == "package" && !contains( inst, dep2["name"]:"" ) ) { + ret = false; + break; + } else if( dep2["res_kind"]:"" == "pattern" && !isPatternFulfilled( dep2["name"]:"" ) ) { + ret = false; + break; + } + } + }); + } + }); + return ret; + } + + global define list<string> getPatterns() { + list<string> ret = []; + list<map<string,any> > all_patterns = Pkg::ResolvableProperties ("", `pattern, ""); + + foreach( map<string,any> m, all_patterns, ``{ + if( isPatternFulfilled( m["name"]:"" ) ) + ret = add( ret, m["name"]:"" ); + }); + return ret; + } /** * Return list of software packages of calling client @@ -315,18 +348,20 @@ */ global define map<string, any > Software() { - boolean ret = Pkg::TargetInit("/", false); +// boolean ret = Pkg::TargetInit("/", false); + Pkg::TargetInitialize ("/"); + Pkg::TargetLoad(); + Pkg::SourceStartManager (true); list<string> inst = Pkg::GetPackages(`installed, true); list<map<string,any> > all_patterns = Pkg::ResolvableProperties ("", `pattern, ""); list<map<string,any> > all_xpatterns = Pkg::ResolvableDependencies ("", `pattern, ""); list<string> patterns = []; - foreach( map<string,any> m, all_patterns, ``{ - if( m["status"]:`nothing == `installed ) - patterns = add( patterns, m["name"]:"" ); - }); - + // get all fulfilled patterns + // way too many will be fulfilled + // we will clean that up later + patterns = getPatterns(); Pkg::TargetFinish (); @@ -337,14 +372,6 @@ Pkg::SourceStartManager(true); - - /* FIXME: if this would work, it would be the better solution - foreach(string p, patterns, ``{ - Pkg::ResolvableInstall( p, `pattern ); - }); - Pkg::PkgSolve(false); - */ - list<string> packages = Pkg::FilterPackages(false, false, true, true); Pkg::TargetFinish (); // Remove kernel packages @@ -352,14 +379,24 @@ list<string> removepackages = []; list<string> patternPackages = []; + list<string> new_p = []; foreach( string tmp_pattern, patterns, ``{ list<map<string,any> > xpattern = filter( map<string,any> p, all_xpatterns, ``( p["name"]:"" == tmp_pattern ) ); map<string,any> found = xpattern[0]:$[]; + boolean req = false; foreach( map<string,any> d, found["dependencies"]:[], ``{ - if( d["res_kind"]:"" == "package" && d["dep_kind"]:"" == "requires" ) + if( d["res_kind"]:"" == "package" && d["dep_kind"]:"" == "requires" ) { patternPackages = add(patternPackages, d["name"]:""); + req = true; + } }); + // workaround for our pattern design + if( req == true ) + new_p = add( new_p, tmp_pattern ); }); + patterns = new_p; + + map<string, any > software = $[]; if( size(patterns) > 0 ) { foreach(string p, inst, ``{ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.17/VERSION new/autoyast2-2.16.18/VERSION --- old/autoyast2-2.16.17/VERSION 2008-05-27 15:15:18.000000000 +0200 +++ new/autoyast2-2.16.18/VERSION 2008-05-30 16:22:07.000000000 +0200 @@ -1 +1 @@ -2.16.17 +2.16.18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit 3ddiag
by root＠Hilbert.suse.de 31 May '08

31 May '08

Hello community, here is the log from the commit of package 3ddiag checked in at Sat May 31 12:17:23 CEST 2008. -------- --- 3ddiag/3ddiag.changes 2008-05-23 14:25:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/3ddiag/3ddiag.changes 2008-05-30 17:14:20.333049000 +0200 @@ -1,0 +2,6 @@ +Fri May 30 17:13:49 CEST 2008 - sndirsch(a)suse.de + +- switch2nv + * do not replace "Option" with "Optioff" (bnc #395234) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ 3ddiag.spec ++++++ --- /var/tmp/diff_new_pack.Q19608/_old 2008-05-31 12:16:47.000000000 +0200 +++ /var/tmp/diff_new_pack.Q19608/_new 2008-05-31 12:16:47.000000000 +0200 @@ -17,7 +17,7 @@ Group: System/Base AutoReqProv: on Version: 0.742 -Release: 30 +Release: 32 Summary: A Tool to Verify the 3D Configuration Source: 3Ddiag-%{version}.tar.gz Source5: switch2nv @@ -71,6 +71,9 @@ /usr/bin/switch2nvidia %changelog +* Fri May 30 2008 sndirsch(a)suse.de +- switch2nv + * do not replace "Option" with "Optioff" (bnc #395234) * Fri May 23 2008 sndirsch(a)suse.de - switch2nv/switch2nvidia * disable/enable Composite when switching to nv/nvidia driver ++++++ switch2nv ++++++ --- 3ddiag/switch2nv 2008-05-23 14:22:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/3ddiag/switch2nv 2008-05-30 17:08:03.715788000 +0200 @@ -45,7 +45,7 @@ echo -n "Patching /etc/X11/xorg.conf ... " sed -e '/[ \t]*Driver[ \t]*"nvidia"/s/nvidia/nv/g' \ - -e '/[ \t]*Option[ \t]*"HWCursor"[ \t]*"on"/s/on/off/g' \ - -e '/[ \t]*Option[ \t]*"Composite"[ \t]*"on"/s/on/off/g' \ + -e 's/[ \t]*Option[ \t]*"HWCursor"[ \t]*"on"/ Option "HWCursor" "off"/g' \ + -e 's/[ \t]*Option[ \t]*"Composite"[ \t]*"on"/ Option "Composite" "off"/g' \ -i /etc/X11/xorg.conf echo "done" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-update
by root＠Hilbert.suse.de 31 May '08

31 May '08

Hello community, here is the log from the commit of package yast2-update checked in at Sat May 31 12:16:46 CEST 2008. -------- --- yast2-update/yast2-update.changes 2008-05-16 22:04:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-update/yast2-update.changes 2008-05-29 14:59:33.000000000 +0200 @@ -1,0 +2,7 @@ +Thu May 29 14:56:15 CEST 2008 - locilka(a)suse.cz + +- Selecting packages for deletion after PkgApplReset call instead + of calling it before (bnc #391785). +- 2.16.10 + +------------------------------------------------------------------- Old: ---- yast2-update-2.16.9.tar.bz2 New: ---- yast2-update-2.16.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-update.spec ++++++ --- /var/tmp/diff_new_pack.O18950/_old 2008-05-31 12:16:34.000000000 +0200 +++ /var/tmp/diff_new_pack.O18950/_new 2008-05-31 12:16:34.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-update (Version 2.16.9) +# spec file for package yast2-update (Version 2.16.10) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-update -Version: 2.16.9 -Release: 7 +Version: 2.16.10 +Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-update-2.16.9.tar.bz2 +Source0: yast2-update-2.16.10.tar.bz2 Prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-packager yast2-storage yast2-testsuite # Wizard::OpenOKDialog @@ -73,7 +73,7 @@ Jiri Srain <jsrain(a)suse.cz> %prep -%setup -n yast2-update-2.16.9 +%setup -n yast2-update-2.16.10 %build %{prefix}/bin/y2tool y2autoconf @@ -120,6 +120,10 @@ /usr/share/YaST2/clients/update.ycp /usr/share/YaST2/clients/run_update.ycp %changelog +* Thu May 29 2008 locilka(a)suse.cz +- Selecting packages for deletion after PkgApplReset call instead + of calling it before (bnc #391785). +- 2.16.10 * Fri May 16 2008 jsrain(a)suse.cz - added categories Settings and System into desktop file (bnc #382778) ++++++ yast2-update-2.16.9.tar.bz2 -> yast2-update-2.16.10.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.16.9/configure new/yast2-update-2.16.10/configure --- old/yast2-update-2.16.9/configure 2008-05-16 22:35:47.000000000 +0200 +++ new/yast2-update-2.16.10/configure 2008-04-23 15:41:06.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-update 2.16.9. +# Generated by GNU Autoconf 2.61 for yast2-update 2.16.7. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-update' PACKAGE_TARNAME='yast2-update' -PACKAGE_VERSION='2.16.9' -PACKAGE_STRING='yast2-update 2.16.9' +PACKAGE_VERSION='2.16.7' +PACKAGE_STRING='yast2-update 2.16.7' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1197,7 +1197,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-update 2.16.9 to adapt to many kinds of systems. +\`configure' configures yast2-update 2.16.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-update 2.16.9:";; + short | recursive ) echo "Configuration of yast2-update 2.16.7:";; esac cat <<\_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-update configure 2.16.9 +yast2-update configure 2.16.7 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1360,7 +1360,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-update $as_me 2.16.9, which was +It was created by yast2-update $as_me 2.16.7, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2181,7 +2181,7 @@ # Define the identity of the package. PACKAGE='yast2-update' - VERSION='2.16.9' + VERSION='2.16.7' cat >>confdefs.h <<_ACEOF @@ -2409,7 +2409,7 @@ -VERSION="2.16.9" +VERSION="2.16.7" RPMNAME="yast2-update" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -3306,7 +3306,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-update $as_me 2.16.9, which was +This file was extended by yast2-update $as_me 2.16.7, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3349,7 +3349,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-update config.status 2.16.9 +yast2-update config.status 2.16.7 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.16.9/configure.in new/yast2-update-2.16.10/configure.in --- old/yast2-update-2.16.9/configure.in 2008-05-16 22:35:43.000000000 +0200 +++ new/yast2-update-2.16.10/configure.in 2008-04-23 15:41:02.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-update, 2.16.9, http://bugs.opensuse.org/, yast2-update) +AC_INIT(yast2-update, 2.16.7, http://bugs.opensuse.org/, yast2-update) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.16.9" +VERSION="2.16.7" RPMNAME="yast2-update" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.16.9/kernel-update-tool.pot new/yast2-update-2.16.10/kernel-update-tool.pot --- old/yast2-update-2.16.9/kernel-update-tool.pot 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-update-2.16.10/kernel-update-tool.pot 2008-04-29 13:09:07.000000000 +0200 @@ -0,0 +1,33 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-04-29 13:09+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: src/clients/kernel-update.ycp:189 +msgid "Warning" +msgstr "" + +#: src/clients/kernel-update.ycp:190 +msgid "Abort the kernel upgrade?" +msgstr "" + +#: src/clients/kernel-update.ycp:247 +msgid "Alternate Download Location" +msgstr "" + +#: src/clients/kernel-update.ycp:510 +msgid "Kernel Update Status Log" +msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.16.9/src/clients/update_proposal.ycp new/yast2-update-2.16.10/src/clients/update_proposal.ycp --- old/yast2-update-2.16.9/src/clients/update_proposal.ycp 2008-05-06 18:49:50.000000000 +0200 +++ new/yast2-update-2.16.10/src/clients/update_proposal.ycp 2008-05-29 14:59:42.000000000 +0200 @@ -5,7 +5,7 @@ * * Purpose: Let user choose update settings. * - * $Id: update_proposal.ycp 47330 2008-05-06 16:49:50Z locilka $ + * $Id: update_proposal.ycp 47938 2008-05-29 12:59:41Z locilka $ */ { textdomain "update"; @@ -267,7 +267,14 @@ foreach (map<string,any> s, selected, { restore = add (restore, s["name"]:""); }); + Pkg::PkgApplReset (); + + // bnc #300540 + // bnc #391785 + // Drops packages after PkgApplReset, not before (that would null that) + Update::DropObsoletePackages(); + foreach (string res, restore, { Pkg::ResolvableInstall (res, `product); }); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.16.9/src/modules/Update.ycp new/yast2-update-2.16.10/src/modules/Update.ycp --- old/yast2-update-2.16.9/src/modules/Update.ycp 2008-05-07 13:14:18.000000000 +0200 +++ new/yast2-update-2.16.10/src/modules/Update.ycp 2008-05-29 14:59:42.000000000 +0200 @@ -7,7 +7,7 @@ * * Purpose: Update module * - * $Id: Update.ycp 47348 2008-05-07 11:14:18Z locilka $ + * $Id: Update.ycp 47938 2008-05-29 12:59:41Z locilka $ */ { module "Update"; @@ -363,7 +363,7 @@ * * @see bnc #300540 */ - void DropObsoletePackages () { + global void DropObsoletePackages () { string packages_to_drop = ProductFeatures::GetStringFeature ("software", "dropped_packages"); if (packages_to_drop == nil || packages_to_drop == "") { @@ -391,9 +391,6 @@ Update::InitUpdate(); - // bnc #300540 - DropObsoletePackages(); - // deleteOldPackages = DeleteOldPackages(); // y2milestone ("deleteOldPackages %1", deleteOldPackages); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.16.9/update.pot new/yast2-update-2.16.10/update.pot --- old/yast2-update-2.16.9/update.pot 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-update-2.16.10/update.pot 2008-04-29 13:09:07.000000000 +0200 @@ -0,0 +1,715 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-04-29 13:09+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Proposal for backup during update +#: src/clients/backup_proposal.ycp:46 +msgid "Create Backup of Modified Files" +msgstr "" + +#. Proposal for backup during update +#: src/clients/backup_proposal.ycp:51 +msgid "Create Backup of /etc/sysconfig Directory" +msgstr "" + +#. Proposal for backup during update +#: src/clients/backup_proposal.ycp:56 +msgid "Do Not Create Backups" +msgstr "" + +#. Proposal for backup during update +#: src/clients/backup_proposal.ycp:61 +msgid "Remove Backups from Previous Updates" +msgstr "" + +#. this is a heading +#: src/clients/backup_proposal.ycp:92 +msgid "Backup" +msgstr "" + +#. this is a menu entry +#: src/clients/backup_proposal.ycp:94 +msgid "&Backup" +msgstr "" + +#. error popup, user did not enter a valid directory specification +#: src/clients/inst_backup.ycp:40 +msgid "Invalid backup path." +msgstr "" + +#. there is not enough space for the backup during update +#. inform the user about this (MB==megabytes) +#: src/clients/inst_backup.ycp:80 +#, ycp-format +msgid "Minimum disk space of %1 MB required." +msgstr "" + +#. screen title for software selection +#: src/clients/inst_backup.ycp:92 +msgid "Backup System Before Update" +msgstr "" + +#. checkbox label if user wants to backup modified files +#: src/clients/inst_backup.ycp:102 +msgid "Create &Backup of Modified Files" +msgstr "" + +#. checkbox label if user wants to backup /etc/sysconfig +#: src/clients/inst_backup.ycp:105 +msgid "Create a &Complete Backup of /etc/sysconfig" +msgstr "" + +#. checkbox label if user wants remove old backup stuff +#: src/clients/inst_backup.ycp:109 +msgid "Remove &Old Backups from the Backup Directory" +msgstr "" + +#. help text for backup dialog during update 1/7 +#: src/clients/inst_backup.ycp:114 +msgid "" +"To avoid any loss of information during update,\n" +"it is possible to create a backup prior to updating.\n" +msgstr "" + +#. help text for backup dialog during update 2/7 +#: src/clients/inst_backup.ycp:119 +msgid "" +"Warning: This will not be a complete\n" +"backup. Only modified files will be saved.\n" +msgstr "" + +#. help text for backup dialog during update 3/7 +#: src/clients/inst_backup.ycp:124 +msgid "Select the desired options.\n" +msgstr "" + +#. help text for backup dialog during update 4/7 +#: src/clients/inst_backup.ycp:128 +msgid "" +"Create a Backup of Modified Files:\n" +"Stores those modified files that are replaced during update.\n" +msgstr "" + +#. help text for backup dialog during update 5/7 +#: src/clients/inst_backup.ycp:133 +msgid "" +"Create a Complete Backup of\n" +"/etc/sysconfig: This covers all configuration files that are part of the\n" +"sysconfig mechanism, even those that are not replaced.\n" +msgstr "" + +#. help text for backup dialog during update 6/7 +#: src/clients/inst_backup.ycp:139 +msgid "" +"Remove Old Backups from the Backup\n" +"Directory: If your current system already is the result of an earlier\n" +"update, there may be old configuration file backups. Select this option to\n" +"remove them.\n" +msgstr "" + +#. help text for backup dialog during update 7/7 +#: src/clients/inst_backup.ycp:146 +#, ycp-format +msgid "All backups are placed in %1." +msgstr "" + +#. screen title for update options +#. this is a heading +#: src/clients/inst_update.ycp:26 src/clients/update_proposal.ycp:609 +msgid "Update Options" +msgstr "" + +#: src/clients/inst_update.ycp:38 +msgid "Select Patterns" +msgstr "" + +#. Display warning message +#: src/clients/inst_update.ycp:65 +msgid "" +"You have already chosen software from \"Detailed selection\".\n" +"You will lose that selection if you change the basic selection." +msgstr "" + +#. Build and show dialog +#. Table item (unknown system [neither openSUSE 11.1 nor SLES 14 nor ...]) +#. Table item (unknown architecture) +#. Table item (unknown file system) +#. label - name of sustem to update +#. label for an unknown installed system +#: src/clients/inst_update.ycp:72 src/clients/inst_update.ycp:73 +#: src/include/rootpart.ycp:67 src/include/rootpart.ycp:73 +#: src/include/rootpart.ycp:90 src/modules/RootPart.ycp:123 +#: src/modules/RootPart.ycp:1428 +msgid "Unknown" +msgstr "" + +#. label showing to which version we are updating +#. TRANSLATORS: proposal summary item, %1 is a product name +#: src/clients/inst_update.ycp:78 src/clients/update_proposal.ycp:521 +#, ycp-format +msgid "Update to %1" +msgstr "" + +#. label showing from which version to which version we are updating +#: src/clients/inst_update.ycp:81 +#, ycp-format +msgid "Update from %1 to %2" +msgstr "" + +#. frame title for update selection +#: src/clients/inst_update.ycp:89 +msgid "Update Mode" +msgstr "" + +#. radio button label for update including new packages +#: src/clients/inst_update.ycp:96 +msgid "" +"&Update with Installation of New Software and Features\n" +"Based on the Selection:\n" +msgstr "" + +#. radio button label for update of already installed packages only +#: src/clients/inst_update.ycp:107 +msgid "Only U&pdate Installed Packages" +msgstr "" + +#. check box label +#. translator: add a & shortcut +#: src/clients/inst_update.ycp:117 +msgid "&Delete Unmaintained Packages" +msgstr "" + +#. help text for dialog "update options" 1/4 +#: src/clients/inst_update.ycp:125 +msgid "" +"The update option differs between two modes. In\n" +"either case, it is recommended to make a backup of your personal data.\n" +msgstr "" + +#. help text for dialog "update options" 2/4, %1 is a product name +#: src/clients/inst_update.ycp:130 +#, ycp-format +msgid "" +"With New Software: This default setting\n" +"updates the existing software and installs all new features and benefits of\n" +"the new <tt>%1</tt> version. The selection is based on the former predefined\n" +"software selection.\n" +msgstr "" + +#. help text for dialog "update options" 3/4 +#: src/clients/inst_update.ycp:137 +msgid "" +"Only Installed Packages: This selection\n" +"only updates the packages already installed on your system. Note:\n" +"New software in the predefined software selection, such as new YaST modules, is\n" +"not available after the update. You might miss advertised features.\n" +msgstr "" + +#. help text for dialog "update options" 4/4 +#: src/clients/inst_update.ycp:144 +msgid "" +"After the update, some software might not\n" +"function anymore. Activate Delete Unmaintained Packages to delete those\n" +"packages during the update.\n" +msgstr "" + +#. yes/no question +#: src/clients/inst_update.ycp:225 +msgid "" +"Do you really want\n" +"to reset your detailed selection?" +msgstr "" + +#. proposal for packages during update, %1 is count of packages +#: src/clients/packages_proposal.ycp:69 +#, ycp-format +msgid "Packages to Update: %1" +msgstr "" + +#. proposal for packages during update, %1 is count of packages +#: src/clients/packages_proposal.ycp:72 +#, ycp-format +msgid "New Packages to Install: %1" +msgstr "" + +#. proposal for packages during update, %1 is count of packages +#: src/clients/packages_proposal.ycp:75 +#, ycp-format +msgid "Packages to Remove: %1" +msgstr "" + +#. part of summary, %1 is size of packages (in MB or GB) +#: src/clients/packages_proposal.ycp:78 +#, ycp-format +msgid "Total Size of Packages to Update: %1" +msgstr "" + +#. warning text +#: src/clients/packages_proposal.ycp:86 +msgid "Cannot solve all conflicts. Manual intervention is required." +msgstr "" + +#. this is a heading +#: src/clients/packages_proposal.ycp:133 +msgid "Packages" +msgstr "" + +#. this is a menu entry +#: src/clients/packages_proposal.ycp:135 +msgid "&Packages" +msgstr "" + +#. Proposal for system to update +#: src/clients/rootpart_proposal.ycp:51 +msgid "No root partition found" +msgstr "" + +#. Proposal for system to update +#: src/clients/rootpart_proposal.ycp:86 +#, ycp-format +msgid "%1 on root partition %2" +msgstr "" + +#. inform user in the proposal about the failed mount +#. error report +#: src/clients/rootpart_proposal.ycp:95 src/include/rootpart.ycp:323 +msgid "Failed to mount target system" +msgstr "" + +#. this is a heading +#: src/clients/rootpart_proposal.ycp:139 +msgid "Selected for Update" +msgstr "" + +#. this is a menu entry +#: src/clients/rootpart_proposal.ycp:141 +msgid "&Selected for Update" +msgstr "" + +#: src/clients/run_update.ycp:36 +msgid "&Update" +msgstr "" + +#. TRANSLATORS: error message - the module does not provide command line interface +#: src/clients/update.ycp:25 +msgid "There is no user interface available for this module." +msgstr "" + +#. part of error popup message +#. error message in proposal +#: src/clients/update_proposal.ycp:113 src/clients/update_proposal.ycp:429 +msgid "Cannot read the current RPM Database." +msgstr "" + +#. part of error popup message, %1 stands for newline-separated list of files +#: src/clients/update_proposal.ycp:115 +#, ycp-format +msgid "None of these files exist:%1" +msgstr "" + +#. continue-cancel popup +#: src/clients/update_proposal.ycp:351 +msgid "" +"The installed product is not compatible with the product\n" +"on the installation media. If you try to update using the\n" +"current installation media, the system may not start or\n" +"some applications may not run properly." +msgstr "" + +#. error message in proposal +#: src/clients/update_proposal.ycp:444 +msgid "The installed product is not compatible with the product on the installation media." +msgstr "" + +#. Can't find any software data, probably a installation media error +#. error message +#: src/clients/update_proposal.ycp:455 +msgid "Cannot read package data from installation media. Media error?" +msgstr "" + +#. TRANSLATORS: unknown product (label) +#. TRANSLATORS: unknown product name +#: src/clients/update_proposal.ycp:461 src/clients/update_proposal.ycp:469 +#: src/clients/update_proposal.ycp:498 src/clients/update_proposal.ycp:500 +msgid "Unknown product" +msgstr "" + +#. TRANSLATORS: proposal error, %1 is the version of installed system +#. %2 is the version being installed +#: src/clients/update_proposal.ycp:481 +#, ycp-format +msgid "" +"Updating system to another version (%1 -> %2) is not supported on the running system. \n" +"Please, boot from the installation media and use a normal upgrade\n" +"or disable software repositories of products with different versions." +msgstr "" + +#. TRANSLATORS: proposal warning, both %1 and %2 are replaced with product names +#: src/clients/update_proposal.ycp:496 +#, ycp-format +msgid "Warning: Updating from '%1' to '%2', products do not exactly match." +msgstr "" + +#. Proposal for removing packages which are not maintained any more +#: src/clients/update_proposal.ycp:527 +msgid "Delete unmaintained packages" +msgstr "" + +#. Proposal for backup during update +#: src/clients/update_proposal.ycp:532 +msgid "Only update installed packages" +msgstr "" + +#. proposal string +#: src/clients/update_proposal.ycp:540 +msgid "Update based on patterns" +msgstr "" + +#. Proposal for selection during update, %1 stands for selection name +#: src/clients/update_proposal.ycp:556 +#, ycp-format +msgid "Update based on selection \"%1\"" +msgstr "" + +#. TRANSLATORS: proposal dialog help +#: src/clients/update_proposal.ycp:565 +msgid "" +"<big>Update Options</big>\n" +"Here you can choose how your system is going to be updated.\n" +"Choose whether only installed packages should be updated or also new ones should be installed\n" +"(the default selection), and whether unmaintained packages should be deleted." +msgstr "" + +#. this is a menu entry +#: src/clients/update_proposal.ycp:611 +msgid "&Update Options" +msgstr "" + +#: src/config/update.glade:15 src/config/update.glade:38 +msgid "Update Settings" +msgstr "" + +#: src/config/update.glade:30 +msgid "Update" +msgstr "" + +#: src/config/update.glade:44 src/config/update.glade:48 +msgid "Perform Update" +msgstr "" + +#: src/config/update.glade:59 +msgid "Clean Up" +msgstr "" + +#: src/config/update.glade:63 +msgid "Update System Configuration" +msgstr "" + +#: src/config/update.glade:71 +msgid "Update Configuration" +msgstr "" + +#. Table item (unknown system) +#: src/include/rootpart.ycp:60 +msgid "Unknown Linux" +msgstr "" + +#. Table item (unknown system) +#: src/include/rootpart.ycp:63 +msgid "Unknown or Non-Linux" +msgstr "" + +#: src/include/rootpart.ycp:83 +#, ycp-format +msgid "%1 (%2)" +msgstr "" + +#. label for selection of root partition (for boot) +#: src/include/rootpart.ycp:138 +msgid "Partition or System to Boot:" +msgstr "" + +#. help text for root partition dialog (for boot) +#: src/include/rootpart.ycp:141 +msgid "" +"\n" +"Select the partition or system to boot.\n" +"\n" +msgstr "" + +#. label for selection of root partition (for update) +#: src/include/rootpart.ycp:149 +msgid "Partition or System to Update:" +msgstr "" + +#. help text for root partition dialog (for update) +#: src/include/rootpart.ycp:152 +msgid "" +"\n" +"Select the partition or system to update.\n" +"\n" +msgstr "" + +#. headline for dialog "Select for update" +#: src/include/rootpart.ycp:160 +msgid "Select for Update" +msgstr "" + +#. help text for root partition dialog (general part) +#: src/include/rootpart.ycp:165 +msgid "" +"\n" +"Show All Partitions expands the list to a\n" +"general overview of your system's partitions.\n" +"\n" +msgstr "" + +#. table header +#: src/include/rootpart.ycp:182 +msgid "System" +msgstr "" + +#. table header item +#: src/include/rootpart.ycp:184 +msgid "Partition" +msgstr "" + +#. table header item +#: src/include/rootpart.ycp:186 +msgid "Architecture" +msgstr "" + +#. table header item +#: src/include/rootpart.ycp:188 +msgid "File System" +msgstr "" + +#. table header item +#: src/include/rootpart.ycp:190 +msgid "Label" +msgstr "" + +#. check box +#: src/include/rootpart.ycp:197 +msgid "&Show All Partitions" +msgstr "" + +#. pushbutton to (rightaway) boot the system selected above +#: src/include/rootpart.ycp:222 +msgid "&Boot" +msgstr "" + +#. continue-cancel popup +#: src/include/rootpart.ycp:297 +msgid "" +"No installed system that can be upgraded with this product was found\n" +"on the selected partition." +msgstr "" + +#. continue-cancel popup +#: src/include/rootpart.ycp:304 +msgid "" +"The architecture of the system installed in the selected partition\n" +"is different than the one of this product." +msgstr "" + +#. * +#. * Link to SDB article concerning renaming of devices. +#. +#: src/modules/RootPart.ycp:94 +#, ycp-format +msgid "" +"See the SDB article at %1 for details\n" +"about how to solve this problem." +msgstr "" + +#. label - name of sustem to update +#: src/modules/RootPart.ycp:114 +msgid "Unknown Linux System" +msgstr "" + +#. label - name of sustem to update +#: src/modules/RootPart.ycp:119 +msgid "Non-Linux System" +msgstr "" + +#. error report, %1 is device (eg. /dev/hda1) +#: src/modules/RootPart.ycp:206 +#, ycp-format +msgid "" +"Cannot unmount partition %1.\n" +"\n" +"It is currently in use. If the partition stays mounted,\n" +"the data may be lost. Unmount the partition manually\n" +"or restart your computer.\n" +msgstr "" + +#. label, %1 is partition +#: src/modules/RootPart.ycp:271 +#, ycp-format +msgid "Checking partition %1" +msgstr "" + +#: src/modules/RootPart.ycp:311 +msgid "Show &Details" +msgstr "" + +#: src/modules/RootPart.ycp:398 +#, ycp-format +msgid "Checking file system on %1..." +msgstr "" + +#. popup headline +#: src/modules/RootPart.ycp:422 +msgid "File System Check Failed" +msgstr "" + +#. popup question (continue/cancel dialog) +#. %1 is a device name such as /dev/hda5 +#: src/modules/RootPart.ycp:426 +#, ycp-format +msgid "" +"The file system check of device %1 has failed.\n" +"\n" +"Would you like to continue in the mounting the device?" +msgstr "" + +#. button +#: src/modules/RootPart.ycp:432 +msgid "&Skip Mounting" +msgstr "" + +#. yes-no popup +#: src/modules/RootPart.ycp:835 +msgid "Incorrect password. Try again?" +msgstr "" + +#. TRANSLATORS: a popup headline +#: src/modules/RootPart.ycp:922 +msgid "Warning" +msgstr "" + +#: src/modules/RootPart.ycp:927 +#, ycp-format +msgid "" +"Your /boot partition is too small (%1 MB).\n" +"We recommend a size not less than %2 MB. It might happen, that the\n" +"new Kernel does not fit, so it would be safer to either enlarge that partition\n" +"or not to use the /boot partition at all.\n" +"\n" +"Would you like to continue updating the current system?" +msgstr "" + +#. label in a popup, %1 is device (eg. /dev/hda1), %2 is output of the 'mount' command +#: src/modules/RootPart.ycp:999 +#, ycp-format +msgid "" +"The partition %1 could not be mounted.\n" +"\n" +"%2\n" +"\n" +"If you are sure that the partition is not necessary for the\n" +"update (it is not any system partition), click Continue.\n" +"To check or fix the mount options, click Specify Mount Options.\n" +"To abort update, click Cancel." +msgstr "" + +#. push button +#: src/modules/RootPart.ycp:1013 +msgid "&Specify Mount Options" +msgstr "" + +#. popup heading +#: src/modules/RootPart.ycp:1032 +msgid "Mount Options" +msgstr "" + +#. text entry label +#: src/modules/RootPart.ycp:1035 +msgid "&Mount Point" +msgstr "" + +#. tex entry label +#: src/modules/RootPart.ycp:1038 +msgid "&Device" +msgstr "" + +#. text entry label +#: src/modules/RootPart.ycp:1041 +msgid "" +"&File System\n" +"(empty for autodetection)" +msgstr "" + +#. error message +#: src/modules/RootPart.ycp:1119 +#, ycp-format +msgid "The /var partition %1 could not be mounted.\n" +msgstr "" + +#. error message +#: src/modules/RootPart.ycp:1170 +msgid "Unable to mount /var partition with this disk configuration.\n" +msgstr "" + +#. popup message, %1 will be replace with the name of the logfile +#: src/modules/RootPart.ycp:1195 +#, ycp-format +msgid "" +"Partitions could not be mounted.\n" +"\n" +"Check the log file %1." +msgstr "" + +#. error message +#: src/modules/RootPart.ycp:1225 +msgid "No fstab found." +msgstr "" + +#. message part 1 +#: src/modules/RootPart.ycp:1245 +msgid "The root partition in /etc/fstab has an invalid root device.\n" +msgstr "" + +#. message part 2 +#: src/modules/RootPart.ycp:1247 +#, ycp-format +msgid "It is currently mounted as %1 but listed as %2.\n" +msgstr "" + +#. intermediate popup while mounting partitions +#: src/modules/RootPart.ycp:1539 +msgid "Mounting partitions. One moment please..." +msgstr "" + +#: src/modules/RootPart.ycp:1553 +msgid "xxx" +msgstr "" + +#: src/modules/RootPart.ycp:1554 +msgid "Evaluating root partition. One moment please..." +msgstr "" + +#. TRANSLATORS: "Update to: $product_name" +#: src/modules/Update.ycp:277 +msgid "Unknown Product" +msgstr "" + +#. TRANSLATORS: check-box, it might happen that we need to downgrade some packages during update +#: src/modules/Update.ycp:687 +msgid "Allow Package Downgrade" +msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.16.9/VERSION new/yast2-update-2.16.10/VERSION --- old/yast2-update-2.16.9/VERSION 2008-05-06 18:49:50.000000000 +0200 +++ new/yast2-update-2.16.10/VERSION 2008-05-29 14:56:09.000000000 +0200 @@ -1 +1 @@ -2.16.9 +2.16.10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-qt-pkg
by root＠Hilbert.suse.de 31 May '08

31 May '08

Hello community, here is the log from the commit of package yast2-qt-pkg checked in at Sat May 31 12:16:27 CEST 2008. -------- --- yast2-qt-pkg/yast2-qt-pkg.changes 2008-05-26 18:42:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-qt-pkg/yast2-qt-pkg.changes 2008-05-28 12:00:40.371287000 +0200 @@ -1,0 +2,13 @@ +Wed May 28 11:55:58 CEST 2008 - sh(a)suse.de + +- Applied Fabien Crespel's patch for repo sorting (bnc #394860) +- V 2.16.46 + +------------------------------------------------------------------- +Wed May 28 10:35:14 CEST 2008 - locilka(a)suse.cz + +- New version to follow standard way of submitting YaST packages + (bnc #394977, bnc #394980, bnc #394504). +- 2.16.45 + +------------------------------------------------------------------- Old: ---- yast2-qt-pkg-2.16.44.tar.bz2 New: ---- yast2-qt-pkg-2.16.46.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-qt-pkg.spec ++++++ --- /var/tmp/diff_new_pack.T17972/_old 2008-05-31 12:16:23.000000000 +0200 +++ /var/tmp/diff_new_pack.T17972/_new 2008-05-31 12:16:23.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-qt-pkg (Version 2.16.44) +# spec file for package yast2-qt-pkg (Version 2.16.46) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ Name: yast2-qt-pkg -Version: 2.16.44 -Release: 3 +Version: 2.16.46 +Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-qt-pkg-2.16.44.tar.bz2 +Source0: yast2-qt-pkg-2.16.46.tar.bz2 BuildRequires: docbook-xsl-stylesheets doxygen libdrm-devel libjpeg-devel libxcrypt-devel BuildRequires: libqt4-devel libxslt perl-XML-Writer sgml-skel update-desktop-files Summary: YaST2 - Graphical User Interface @@ -74,6 +74,13 @@ %_prefix/share/YaST2/images/* %changelog +* Wed May 28 2008 sh(a)suse.de +- Applied Fabien Crespel's patch for repo sorting (bnc #394860) +- V 2.16.46 +* Wed May 28 2008 locilka(a)suse.cz +- New version to follow standard way of submitting YaST packages + (bnc #394977, bnc #394980, bnc #394504). +- 2.16.45 * Mon May 26 2008 coolo(a)suse.de - fix encoding of pattern descriptions * Mon May 26 2008 dmacvicar(a)suse.de ++++++ yast2-qt-pkg-2.16.44.tar.bz2 -> yast2-qt-pkg-2.16.46.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-pkg-2.16.44/package/yast2-qt-pkg.changes new/yast2-qt-pkg-2.16.46/package/yast2-qt-pkg.changes --- old/yast2-qt-pkg-2.16.44/package/yast2-qt-pkg.changes 2008-05-26 18:42:29.000000000 +0200 +++ new/yast2-qt-pkg-2.16.46/package/yast2-qt-pkg.changes 2008-05-28 11:59:55.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Wed May 28 11:55:58 CEST 2008 - sh(a)suse.de + +- Applied Fabien Crespel's patch for repo sorting (bnc #394860) +- V 2.16.46 + +------------------------------------------------------------------- +Wed May 28 10:35:14 CEST 2008 - locilka(a)suse.cz + +- New version to follow standard way of submitting YaST packages + (bnc #394977, bnc #394980, bnc #394504). +- 2.16.45 + +------------------------------------------------------------------- Mon May 26 18:19:14 CEST 2008 - coolo(a)suse.de - fix encoding of pattern descriptions diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-pkg-2.16.44/repo-sort.diff new/yast2-qt-pkg-2.16.46/repo-sort.diff --- old/yast2-qt-pkg-2.16.44/repo-sort.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-qt-pkg-2.16.46/repo-sort.diff 2008-05-28 11:59:55.000000000 +0200 @@ -0,0 +1,38 @@ +Index: src/YQPkgRepoList.h +=================================================================== +--- src/YQPkgRepoList.h (révision 47895) ++++ src/YQPkgRepoList.h (copie de travail) +@@ -177,6 +177,7 @@ + int nameCol() const { return _repoList->nameCol(); } + int urlCol() const { return _repoList->urlCol(); } + ++ virtual bool operator< ( const QTreeWidgetItem & other ) const; + protected: + + // Data members +Index: src/YQPkgRepoList.cc +=================================================================== +--- src/YQPkgRepoList.cc (révision 47895) ++++ src/YQPkgRepoList.cc (copie de travail) +@@ -61,6 +61,8 @@ + this, SLOT ( filterIfVisible()) ); + setIconSize(QSize(32,32)); + fillList(); ++ setSortingEnabled( true ); ++ sortByColumn( nameCol(), Qt::AscendingOrder ); + selectSomething(); + + yuiDebug() << "Creating repository list done" << endl; +@@ -358,6 +360,12 @@ + return product; + } + ++bool ++YQPkgRepoListItem::operator< ( const QTreeWidgetItem & other ) const ++{ ++ const YQPkgRepoListItem * otherItem = dynamic_cast<const YQPkgRepoListItem *>(&other); + ++ return zyppRepo().info().name() < otherItem->zyppRepo().info().name(); ++} + + #include "YQPkgRepoList.moc" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-pkg-2.16.44/src/CMakeLists.txt.bak new/yast2-qt-pkg-2.16.46/src/CMakeLists.txt.bak --- old/yast2-qt-pkg-2.16.44/src/CMakeLists.txt.bak 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-qt-pkg-2.16.46/src/CMakeLists.txt.bak 2008-05-28 11:59:55.000000000 +0200 @@ -0,0 +1,76 @@ +################################################################ +# package selector +################################################################ + +ADD_DEFINITIONS( + -DY2LOG=\\\"QT4\\\" ${QT_DEFINITIONS} + -DICONDIR=\\"${Y2QT_ICONDIR}\\" + -DLOCALEDIR=\\\"${Y2QT_LOCALEDIR}\\\" + -DTHEMEDIR=\\\"${Y2QT_THEMEDIR}\\\" + -DQTLIBDIR=\\\"${LIB_INSTALL_DIR}\\\" + -DHELPIMAGEDIR=\\\"${CMAKE_INSTALL_PREFIX}/share/YaST2/images\\\" + -DPREFIX=\\\"${CMAKE_INSTALL_PREFIX}\\\" + ) +SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-format-nonliteral -fmessage-length=0" ) + +SET(qt_yast_pkg_plugin_SRCS + + QY2LayoutUtils.cc + YQIconPool.cc + YQPackageSelectorBase.cc + YQPackageSelector.cc + YQPackageSelectorHelp.cc + YQPatternSelector.cc + YQSimplePatchSelector.cc + YQPkgChangeLogView.cc + YQPkgChangesDialog.cc + YQPkgConflictDialog.cc + YQPkgConflictList.cc + YQPkgDependenciesView.cc + YQPkgDescriptionDialog.cc + YQPkgDescriptionView.cc + YQPkgDiskUsageList.cc + YQPkgDiskUsageWarningDialog.cc + YQPkgFileListView.cc + YQPkgGenericDetailsView.cc + YQPkgLangList.cc + YQPkgList.cc + YQPkgObjList.cc + YQPkgPatchFilterView.cc + YQPkgPatchList.cc + YQPkgPatternList.cc + YQPkgProductDialog.cc + YQPkgProductList.cc + YQPkgRepoFilterView.cc + YQPkgRepoList.cc + YQPkgRpmGroupTagsFilterView.cc + YQPkgSearchFilterView.cc + YQPkgSelDescriptionView.cc + YQPkgSelMapper.cc + YQPkgStatusFilterView.cc + YQPkgTechnicalDetailsView.cc + YQPkgTextDialog.cc + YQPkgUpdateProblemFilterView.cc + YQPkgVersionsView.cc + YQPackageSelectorPluginImpl.cc + ) + +QT4_AUTOMOC(${qt_yast_pkg_plugin_SRCS}) + +INCLUDE_DIRECTORIES( ${QT_INCLUDES} ) +INCLUDE_DIRECTORIES( ${LIBYUI_INCLUDE_DIR} ) +INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ) +INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) +INCLUDE_DIRECTORIES( ${CMAKE_INSTALL_PREFIX}/include/YaST2/yast2-qt ) +INCLUDE_DIRECTORIES( ${ZYPP_INCLUDE_DIR} ) + +ADD_LIBRARY( py2qt_pkg SHARED ${qt_yast_pkg_plugin_SRCS}) +TARGET_LINK_LIBRARIES( py2qt_pkg ${UI_PLUGIN_DIR}/libpy2qt.so ) +TARGET_LINK_LIBRARIES( py2qt_pkg ${LIBYUI_LIBRARY} ) +TARGET_LINK_LIBRARIES( py2qt_pkg ${ZYPP_LIBRARY} ) +TARGET_LINK_LIBRARIES( py2qt_pkg ${QT_QTCORE_LIBRARY} ) +TARGET_LINK_LIBRARIES( py2qt_pkg ${QT_QTGUI_LIBRARY} ) +SET_TARGET_PROPERTIES( py2qt_pkg PROPERTIES SOVERSION 2 ) +SET_TARGET_PROPERTIES( py2qt_pkg PROPERTIES LINK_FLAGS "-Wl,--no-undefined -Wl,-rpath -Wl,${UI_PLUGIN_DIR}" ) + +INSTALL(TARGETS py2qt_pkg LIBRARY DESTINATION ${UI_PLUGIN_DIR} ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-pkg-2.16.44/src/YQPkgRepoList.cc new/yast2-qt-pkg-2.16.46/src/YQPkgRepoList.cc --- old/yast2-qt-pkg-2.16.44/src/YQPkgRepoList.cc 2008-05-26 18:42:29.000000000 +0200 +++ new/yast2-qt-pkg-2.16.46/src/YQPkgRepoList.cc 2008-05-28 11:59:55.000000000 +0200 @@ -61,6 +61,8 @@ this, SLOT ( filterIfVisible()) ); setIconSize(QSize(32,32)); fillList(); + setSortingEnabled( true ); + sortByColumn( nameCol(), Qt::AscendingOrder ); selectSomething(); yuiDebug() << "Creating repository list done" << endl; @@ -358,6 +360,12 @@ return product; } +bool +YQPkgRepoListItem::operator< ( const QTreeWidgetItem & other ) const +{ + const YQPkgRepoListItem * otherItem = dynamic_cast<const YQPkgRepoListItem *>(&other); + return zyppRepo().info().name() < otherItem->zyppRepo().info().name(); +} #include "YQPkgRepoList.moc" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-pkg-2.16.44/src/YQPkgRepoList.h new/yast2-qt-pkg-2.16.46/src/YQPkgRepoList.h --- old/yast2-qt-pkg-2.16.44/src/YQPkgRepoList.h 2008-05-26 18:42:29.000000000 +0200 +++ new/yast2-qt-pkg-2.16.46/src/YQPkgRepoList.h 2008-05-28 11:59:55.000000000 +0200 @@ -177,6 +177,7 @@ int nameCol() const { return _repoList->nameCol(); } int urlCol() const { return _repoList->urlCol(); } + virtual bool operator< ( const QTreeWidgetItem & other ) const; protected: // Data members diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-pkg-2.16.44/VERSION.cmake new/yast2-qt-pkg-2.16.46/VERSION.cmake --- old/yast2-qt-pkg-2.16.44/VERSION.cmake 2008-05-26 18:42:29.000000000 +0200 +++ new/yast2-qt-pkg-2.16.46/VERSION.cmake 2008-05-28 11:59:55.000000000 +0200 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "16") -SET(VERSION_PATCH "44") +SET(VERSION_PATCH "46") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-qt
by root＠Hilbert.suse.de 31 May '08

31 May '08

Hello community, here is the log from the commit of package yast2-qt checked in at Sat May 31 12:16:15 CEST 2008. -------- --- yast2-qt/yast2-qt.changes 2008-05-26 18:42:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-qt/yast2-qt.changes 2008-05-29 17:59:56.983127000 +0200 @@ -1,0 +2,13 @@ +Thu May 29 17:57:08 CEST 2008 - sh(a)suse.de + +- Fixed bnc #394525: Proxy settings don't work in installer +- Fixed bnc #379622: CheckBoxFrame( `opt(`invertAutoEnable) ) +- V 2.16.53 + +------------------------------------------------------------------- +Wed May 28 15:47:57 CEST 2008 - sh(a)suse.de + +- Fixed bnc #393040: Keyboard shortcuts in main dialogs broken +- V 2.16.52 + +------------------------------------------------------------------- Old: ---- yast2-qt-2.16.51.tar.bz2 New: ---- yast2-qt-2.16.53.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-qt.spec ++++++ --- /var/tmp/diff_new_pack.K14491/_old 2008-05-31 12:15:58.000000000 +0200 +++ /var/tmp/diff_new_pack.K14491/_new 2008-05-31 12:15:58.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-qt (Version 2.16.51) +# spec file for package yast2-qt (Version 2.16.53) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ Name: yast2-qt -Version: 2.16.51 +Version: 2.16.53 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-qt-2.16.51.tar.bz2 +Source0: yast2-qt-2.16.53.tar.bz2 BuildRequires: docbook-xsl-stylesheets BuildRequires: doxygen BuildRequires: libdrm-devel @@ -30,8 +30,8 @@ BuildRequires: cmake Summary: YaST2 - Graphical User Interface BuildRequires: yast2-devtools >= 2.16.3 -BuildRequires: yast2-libyui-devel >= 2.16.44 -Requires: yast2-libyui >= 2.16.44 +BuildRequires: yast2-libyui-devel >= 2.16.48 +Requires: yast2-libyui >= 2.16.48 Requires: yast2_theme >= 2.16.1 Provides: yast2_ui Provides: y2base:/usr/lib/YaST2/servers/qt @@ -112,6 +112,13 @@ %_includedir/* %changelog +* Thu May 29 2008 sh(a)suse.de +- Fixed bnc #394525: Proxy settings don't work in installer +- Fixed bnc #379622: CheckBoxFrame( `opt(`invertAutoEnable) ) +- V 2.16.53 +* Wed May 28 2008 sh(a)suse.de +- Fixed bnc #393040: Keyboard shortcuts in main dialogs broken +- V 2.16.52 * Mon May 26 2008 coolo(a)suse.de - more font updates from Mike * Mon May 26 2008 sh(a)suse.de ++++++ yast2-qt-2.16.51.tar.bz2 -> yast2-qt-2.16.53.tar.bz2 ++++++ ++++ 3619 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-pkg-bindings
by root＠Hilbert.suse.de 31 May '08

31 May '08

Hello community, here is the log from the commit of package yast2-pkg-bindings checked in at Sat May 31 12:15:41 CEST 2008. -------- --- yast2-pkg-bindings/yast2-pkg-bindings.changes 2008-05-23 16:35:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes 2008-05-30 09:46:20.570101000 +0200 @@ -1,0 +2,7 @@ +Thu May 29 13:57:53 CEST 2008 - lslezak(a)suse.cz + +- set the prefix for package cache (do not download packages to + the current directory) (bnc#394728) +- 2.16.39 + +------------------------------------------------------------------- Old: ---- yast2-pkg-bindings-2.16.38.tar.bz2 New: ---- yast2-pkg-bindings-2.16.39.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pkg-bindings-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.B13196/_old 2008-05-31 12:15:35.000000000 +0200 +++ /var/tmp/diff_new_pack.B13196/_new 2008-05-31 12:15:35.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-pkg-bindings-devel-doc (Version 2.16.38) +# spec file for package yast2-pkg-bindings-devel-doc (Version 2.16.39) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-pkg-bindings-devel-doc -Version: 2.16.38 +Version: 2.16.39 Release: 1 License: GPL v2 or later Group: Documentation/HTML BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.16.38.tar.bz2 +Source0: yast2-pkg-bindings-2.16.39.tar.bz2 Prefix: %_prefix # same as in the main package (because we use the same configure.in.in) BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen gcc-c++ libgcrypt-devel libxcrypt-devel libxslt libzypp-devel perl-XML-Writer sgml-skel yast2-core-devel yast2-devtools @@ -38,7 +38,7 @@ Ladislav Slez�k <lslezak(a)novell.com> %prep -%setup -n yast2-pkg-bindings-2.16.38 +%setup -n yast2-pkg-bindings-2.16.39 # build only documentation, ignore all other directories echo "doc" > SUBDIRS ++++++ yast2-pkg-bindings.spec ++++++ --- /var/tmp/diff_new_pack.B13196/_old 2008-05-31 12:15:35.000000000 +0200 +++ /var/tmp/diff_new_pack.B13196/_new 2008-05-31 12:15:35.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-pkg-bindings (Version 2.16.38) +# spec file for package yast2-pkg-bindings (Version 2.16.39) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,17 +12,17 @@ Name: yast2-pkg-bindings -Version: 2.16.38 +Version: 2.16.39 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.16.38.tar.bz2 +Source0: yast2-pkg-bindings-2.16.39.tar.bz2 Prefix: /usr BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen gcc-c++ libgcrypt-devel libxcrypt-devel libxslt perl-XML-Writer sgml-skel yast2-core-devel yast2-devtools -BuildRequires: libzypp-devel >= 4.4.0 +BuildRequires: libzypp-devel >= 4.25.1 # created and expires dates in zypp::PublicKey -Requires: libzypp >= 4.4.0 +Requires: libzypp >= 4.25.1 Summary: YaST2 - Package Manager Access %description @@ -40,7 +40,7 @@ Stanislav Visnovsky <visnov(a)suse.cz> %prep -%setup -n yast2-pkg-bindings-2.16.38 +%setup -n yast2-pkg-bindings-2.16.39 # build only the library, ignore documentation (it is in devel-doc package) echo "src" > SUBDIRS @@ -72,6 +72,10 @@ %{_libdir}/YaST2/plugin/libpy2Pkg.so %doc %{prefix}/share/doc/packages/yast2-pkg-bindings %changelog +* Thu May 29 2008 lslezak(a)suse.cz +- set the prefix for package cache (do not download packages to + the current directory) (bnc#394728) +- 2.16.39 * Fri May 23 2008 dmacvicar(a)suse.de - fix patch pre-selection - 2.16.38 ++++++ yast2-pkg-bindings-2.16.38.tar.bz2 -> yast2-pkg-bindings-2.16.39.tar.bz2 ++++++ ++++ 3977 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-pkg-bindings-2.16.38/configure.in new/yast2-pkg-bindings-2.16.39/configure.in --- old/yast2-pkg-bindings-2.16.38/configure.in 2008-05-23 16:34:55.000000000 +0200 +++ new/yast2-pkg-bindings-2.16.39/configure.in 2008-05-23 12:53:48.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-pkg-bindings, 2.16.38, http://bugs.opensuse.org/, yast2-pkg-bindings) +AC_INIT(yast2-pkg-bindings, 2.16.37, http://bugs.opensuse.org/, yast2-pkg-bindings) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.16.38" +VERSION="2.16.37" RPMNAME="yast2-pkg-bindings" MAINTAINER="Ladislav Slezák <lslezak(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-pkg-bindings-2.16.38/src/PkgFunctions.cc new/yast2-pkg-bindings-2.16.39/src/PkgFunctions.cc --- old/yast2-pkg-bindings-2.16.38/src/PkgFunctions.cc 2008-04-15 16:31:12.000000000 +0200 +++ new/yast2-pkg-bindings-2.16.39/src/PkgFunctions.cc 2008-05-29 10:34:01.000000000 +0200 @@ -223,8 +223,7 @@ zypp::RepoManager PkgFunctions::CreateRepoManager() { // set path option, use root dir as a prefix for the default directory - zypp::RepoManagerOptions repo_options; - repo_options.knownReposPath = zypp::Pathname(_target_root) + repo_options.knownReposPath; + zypp::RepoManagerOptions repo_options(_target_root); y2milestone("Path to repository files: %s", repo_options.knownReposPath.asString().c_str()); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-pkg-bindings-2.16.38/src/Source_Create.cc new/yast2-pkg-bindings-2.16.39/src/Source_Create.cc --- old/yast2-pkg-bindings-2.16.38/src/Source_Create.cc 2008-05-23 12:53:39.000000000 +0200 +++ new/yast2-pkg-bindings-2.16.39/src/Source_Create.cc 2008-05-30 09:36:35.000000000 +0200 @@ -19,7 +19,7 @@ */ /* - File: $Id: Source_Create.cc 47827 2008-05-23 10:53:39Z lslezak $ + File: $Id: Source_Create.cc 47956 2008-05-30 07:36:35Z lslezak $ Author: Ladislav Slezák <lslezak(a)novell.com> Summary: Functions related to repository registration Namespace: Pkg @@ -326,6 +326,8 @@ // set metadata path (#293428) zypp::Pathname metadatapath = repomanager.metadataPath(repo); repo.setMetadataPath(metadatapath); + // set packages path + repo.setPackagesPath(repomanager.packagesPath(repo)); y2milestone("Adding source '%s' (%s, dir: %s)", repo.alias().c_str(), url.asString().c_str(), path_r.asString().c_str()); // note: exceptions should be caught by the calling code @@ -518,6 +520,8 @@ zypp::Pathname metadatapath = repomanager.metadataPath(repo); repo.setMetadataPath(metadatapath); + repo.setPackagesPath(repomanager.packagesPath(repo)); + repos.push_back(new YRepo(repo)); // the new source is at the end of the list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-pkg-bindings-2.16.38/VERSION new/yast2-pkg-bindings-2.16.39/VERSION --- old/yast2-pkg-bindings-2.16.38/VERSION 2008-05-23 16:27:25.000000000 +0200 +++ new/yast2-pkg-bindings-2.16.39/VERSION 2008-05-29 14:08:47.000000000 +0200 @@ -1 +1 @@ -2.16.38 +2.16.39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-ncurses-pkg
by root＠Hilbert.suse.de 31 May '08

31 May '08

Hello community, here is the log from the commit of package yast2-ncurses-pkg checked in at Sat May 31 12:15:25 CEST 2008. -------- --- yast2-ncurses-pkg/yast2-ncurses-pkg.changes 2008-05-21 12:28:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-ncurses-pkg/yast2-ncurses-pkg.changes 2008-05-29 10:14:53.000000000 +0200 @@ -1,0 +2,15 @@ +Thu May 29 10:12:08 CEST 2008 - gs(a)suse.de + +- Show the status of a language pattern and make installation + possible (bnc #389722) +- 2.16.13 + +------------------------------------------------------------------- +Wed May 28 15:55:28 CEST 2008 - kmachalkova(a)suse.cz + +- Do not create pop-up dialogs on the stack (disk space, deps), this + may lead to segfault (bnc#384471) and/or the latest pop-up being + always on the top (bnc#384467) +- 2.16.12 + +------------------------------------------------------------------- Old: ---- yast2-ncurses-pkg-2.16.11.tar.bz2 New: ---- yast2-ncurses-pkg-2.16.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ncurses-pkg.spec ++++++ --- /var/tmp/diff_new_pack.H12496/_old 2008-05-31 12:15:14.000000000 +0200 +++ /var/tmp/diff_new_pack.H12496/_new 2008-05-31 12:15:14.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ncurses-pkg (Version 2.16.11) +# spec file for package yast2-ncurses-pkg (Version 2.16.13) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-ncurses-pkg -Version: 2.16.11 +Version: 2.16.13 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ncurses-pkg-2.16.11.tar.bz2 +Source0: yast2-ncurses-pkg-2.16.13.tar.bz2 Prefix: /usr BuildRequires: dejagnu doxygen gcc-c++ yast2-core-devel yast2-devtools BuildRequires: blocxx-devel libxcrypt-devel ncurses-devel yast2-ncurses-devel @@ -38,7 +38,7 @@ %prep -%setup -n yast2-ncurses-pkg-2.16.11 +%setup -n yast2-ncurses-pkg-2.16.13 %build %{prefix}/bin/y2tool y2autoconf @@ -68,6 +68,15 @@ %{_libdir}/YaST2/plugin/libpy2ncurses_pkg.so %doc %{prefix}/share/doc/packages/yast2-ncurses-pkg %changelog +* Thu May 29 2008 gs(a)suse.de +- Show the status of a language pattern and make installation + possible (bnc #389722) +- 2.16.13 +* Wed May 28 2008 kmachalkova(a)suse.cz +- Do not create pop-up dialogs on the stack (disk space, deps), this + may lead to segfault (bnc#384471) and/or the latest pop-up being + always on the top (bnc#384467) +- 2.16.12 * Wed May 21 2008 gs(a)suse.de - YOU: correct condition for unneeded patches - 2.16.11 ++++++ yast2-ncurses-pkg-2.16.11.tar.bz2 -> yast2-ncurses-pkg-2.16.13.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.16.11/configure new/yast2-ncurses-pkg-2.16.13/configure --- old/yast2-ncurses-pkg-2.16.11/configure 2008-05-21 10:50:12.000000000 +0200 +++ new/yast2-ncurses-pkg-2.16.13/configure 2008-05-29 10:22:35.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-ncurses-pkg 2.16.11. +# Generated by GNU Autoconf 2.61 for yast2-ncurses-pkg 2.16.13. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -728,8 +728,8 @@ # Identity of this package. PACKAGE_NAME='yast2-ncurses-pkg' PACKAGE_TARNAME='yast2-ncurses-pkg' -PACKAGE_VERSION='2.16.11' -PACKAGE_STRING='yast2-ncurses-pkg 2.16.11' +PACKAGE_VERSION='2.16.13' +PACKAGE_STRING='yast2-ncurses-pkg 2.16.13' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1439,7 +1439,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-ncurses-pkg 2.16.11 to adapt to many kinds of systems. +\`configure' configures yast2-ncurses-pkg 2.16.13 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1510,7 +1510,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-ncurses-pkg 2.16.11:";; + short | recursive ) echo "Configuration of yast2-ncurses-pkg 2.16.13:";; esac cat <<\_ACEOF @@ -1619,7 +1619,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-ncurses-pkg configure 2.16.11 +yast2-ncurses-pkg configure 2.16.13 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1633,7 +1633,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-ncurses-pkg $as_me 2.16.11, which was +It was created by yast2-ncurses-pkg $as_me 2.16.13, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2454,7 +2454,7 @@ # Define the identity of the package. PACKAGE='yast2-ncurses-pkg' - VERSION='2.16.11' + VERSION='2.16.13' cat >>confdefs.h <<_ACEOF @@ -2682,7 +2682,7 @@ -VERSION="2.16.11" +VERSION="2.16.13" RPMNAME="yast2-ncurses-pkg" MAINTAINER="Katarina Machalkova <kmachalkova(a)suse.cz>" @@ -21213,7 +21213,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-ncurses-pkg $as_me 2.16.11, which was +This file was extended by yast2-ncurses-pkg $as_me 2.16.13, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21266,7 +21266,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-ncurses-pkg config.status 2.16.11 +yast2-ncurses-pkg config.status 2.16.13 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.16.11/configure.in new/yast2-ncurses-pkg-2.16.13/configure.in --- old/yast2-ncurses-pkg-2.16.11/configure.in 2008-05-21 10:50:03.000000000 +0200 +++ new/yast2-ncurses-pkg-2.16.13/configure.in 2008-05-29 10:22:26.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ncurses-pkg, 2.16.11, http://bugs.opensuse.org/, yast2-ncurses-pkg) +AC_INIT(yast2-ncurses-pkg, 2.16.13, http://bugs.opensuse.org/, yast2-ncurses-pkg) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.16.11" +VERSION="2.16.13" RPMNAME="yast2-ncurses-pkg" MAINTAINER="Katarina Machalkova <kmachalkova(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.16.11/src/NCPackageSelector.cc new/yast2-ncurses-pkg-2.16.13/src/NCPackageSelector.cc --- old/yast2-ncurses-pkg-2.16.11/src/NCPackageSelector.cc 2008-05-21 10:26:42.000000000 +0200 +++ new/yast2-ncurses-pkg-2.16.13/src/NCPackageSelector.cc 2008-05-29 09:02:23.000000000 +0200 @@ -124,8 +124,8 @@ testMode = true; saveState (); + diskspacePopup = new NCPkgDiskspace( testMode ); - // The creation of the popups is moved to createPopups() } @@ -140,33 +140,27 @@ // NCPackageSelectorPlugin::runPkgSelection } -/////////////////////////////////////////////////////////////////// -// -// createPopups() -// -// Create popups -// -// Don't create the popups any longer in constructur because the current dialog -// wouldn't be the PackageSelector dialog then but a PopupDialog and -// NCPackageSelectorPlugin::runPkgSelection wouldn't find the selector widget. -// Call NCPackageSelector::createPopups() instead after the PackageSelector dialog -// is created (see NCPackageSelectorStart::showDefaultList()). -// -void NCPackageSelector::createPopups() +bool NCPackageSelector::checkNow( bool *ok ) { - // Patterns, Languages, Repositories, RPM Groups and Search filter are part of NCPkgFilterMain. - // NCPkgFilterPattern, NCPkgLocaleTable, NCPkgRepoTable, NCPkgFilterRPMGroups and - // NCPkgFilterSearch are created in NCPackageSelector::replaceFilter. + bool ret = false; - // the dependency popup depsPopup = new NCPkgPopupDeps( wpos( 3, 8 ), this ); - - // the disk space popup - diskspacePopup = new NCPkgPopupDiskspace( wpos( (NCurses::lines() - 15)/2, NCurses::cols()/6 ), testMode ); + ret = depsPopup->showDependencies( NCPkgPopupDeps::S_Solve, ok ); + YDialog::deleteTopmostDialog(); + return ret; } +bool NCPackageSelector::verifySystem( bool *ok ) +{ + bool ret = false; -/////////////////////////////////////////////////////////////////// + depsPopup = new NCPkgPopupDeps( wpos( 3, 8 ), this ); + ret = depsPopup->showDependencies( NCPkgPopupDeps::S_Verify, ok ); + YDialog::deleteTopmostDialog(); + return ret; +} + +////////////////////////////////////////////////////////////////// // // detection whether the user has made any changes // @@ -1246,11 +1240,10 @@ bool ok = false; bool cancel = false; - if ( depsPopup - && (doit || autoCheck) ) + if ( doit || autoCheck ) { yuiMilestone() << "Checking dependencies" << endl; - cancel = depsPopup->showDependencies( NCPkgPopupDeps::S_Solve, &ok ); + cancel = checkNow( & ok ); } return cancel; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.16.11/src/NCPackageSelector.h new/yast2-ncurses-pkg-2.16.13/src/NCPackageSelector.h --- old/yast2-ncurses-pkg-2.16.11/src/NCPackageSelector.h 2008-05-06 17:07:07.000000000 +0200 +++ new/yast2-ncurses-pkg-2.16.13/src/NCPackageSelector.h 2008-05-29 09:02:23.000000000 +0200 @@ -55,7 +55,7 @@ class NCPkgRepoTable; class LangCode; class NCPkgPopupDeps; -class NCPkgPopupDiskspace; +class NCPkgDiskspace; class NCPkgFilterRPMGroups; class NCPkgFilterSearch; class NCPkgPopupFile; @@ -111,7 +111,7 @@ NCPkgLocaleTable * languagePopup; // language popup NCPkgRepoTable * repoPopup; - NCPkgPopupDiskspace * diskspacePopup; // the popup showing the disk usage + NCPkgDiskspace * diskspacePopup; // the popup showing the disk usage NCPkgFilterSearch * searchPopup; // the package search popup @@ -191,12 +191,6 @@ virtual ~NCPackageSelector(); /** - * Create all NCPkgPopus - * @return void - */ - void createPopups(); - - /** * Create layout for the PackageSelector * @param parent Parent is PackageSelectorStart * @param type The package table type @@ -214,7 +208,7 @@ // returns the package table widget NCPkgTable * PackageList(); NCPkgPopupDeps *DepsPopup() { return depsPopup; } - NCPkgPopupDiskspace *diskSpacePopup() { return diskspacePopup; } + NCPkgDiskspace *diskSpacePopup() { return diskspacePopup; } YLabel *PackageLabel() { return packageLabel; } YLabel *PatternLabel() { return patternLabel; } @@ -232,9 +226,8 @@ NCPkgSearchSettings *SearchSettings() { return searchSet; } void setSearchButton( NCPushButton *pb ) { searchButton = pb; } - bool checkNow( bool *ok ) { return depsPopup->showDependencies( NCPkgPopupDeps::S_Solve, ok ); } - - bool verifySystem( bool *ok ) { return depsPopup->showDependencies( NCPkgPopupDeps::S_Verify, ok ); } + bool checkNow( bool *ok ); + bool verifySystem( bool *ok ); /** * Fills the package table with YOU patches matching the filter diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.16.11/src/NCPackageSelectorStart.cc new/yast2-ncurses-pkg-2.16.13/src/NCPackageSelectorStart.cc --- old/yast2-ncurses-pkg-2.16.11/src/NCPackageSelectorStart.cc 2008-05-20 11:42:59.000000000 +0200 +++ new/yast2-ncurses-pkg-2.16.13/src/NCPackageSelectorStart.cc 2008-05-29 09:02:23.000000000 +0200 @@ -131,9 +131,6 @@ if ( packager ) { - // create the NCPkgPoups - packager->createPopups(); - // always do an initial dependency solving - BEFORE filling the default list packager->showPackageDependencies( true ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.16.11/src/NCPkgFilterLocale.cc new/yast2-ncurses-pkg-2.16.13/src/NCPkgFilterLocale.cc --- old/yast2-ncurses-pkg-2.16.11/src/NCPkgFilterLocale.cc 2008-04-29 12:43:26.000000000 +0200 +++ new/yast2-ncurses-pkg-2.16.13/src/NCPkgFilterLocale.cc 2008-05-29 10:00:38.000000000 +0200 @@ -20,8 +20,8 @@ #include "NCPkgFilterLocale.h" -NCPkgLocaleTag::NCPkgLocaleTag ( zypp::sat::LocaleSupport loc) - : YTableCell(string(" ")) +NCPkgLocaleTag::NCPkgLocaleTag ( zypp::sat::LocaleSupport loc, string status ) + : YTableCell( status ) , locale ( loc ) { @@ -47,13 +47,13 @@ setHeader( header); } -void NCPkgLocaleTable::addLine ( zypp::sat::LocaleSupport l, const vector <string> & cols ) +void NCPkgLocaleTable::addLine ( zypp::sat::LocaleSupport l, const vector <string> & cols, string status ) { //use default ctor, add cell in the next step YTableItem *tabItem = new YTableItem(); //place tag (with repo reference) to the 0th column - tabItem->addCell( new NCPkgLocaleTag ( l ) ); + tabItem->addCell( new NCPkgLocaleTag ( l, status ) ); // and append the rest (name, URL and stuff) for ( unsigned i = 1; i < cols.size() + 1; ++i ) { @@ -66,6 +66,27 @@ } +string NCPkgLocaleTable::status( zypp::Locale lang ) +{ + ZyppStatus status; + + if ( zypp::getZYpp()->pool().isRequestedLocale( lang ) ) + status = S_Install; + else + status = S_NoInst; + + // convert ZyppStatus to string + switch ( status ) + { + case S_NoInst: + return " "; + case S_Install: + return " :-)"; + default: + return "####"; + } +} + void NCPkgLocaleTable::fillLocaleList() { vector <string> oneLine; @@ -77,7 +98,7 @@ zypp::sat::LocaleSupport myLocale( *it ); oneLine.push_back( myLocale.locale().code() ); oneLine.push_back( myLocale.locale().name() ); - addLine( myLocale, oneLine); + addLine( myLocale, oneLine, status(*it) ); } myPad()->setOrder(1); @@ -127,6 +148,31 @@ packageList->showInformation(); } +void NCPkgLocaleTable::toggleStatus() +{ + int index = getCurrentItem(); + zypp::sat::LocaleSupport myLocale = getLocale( index ); + NCPkgLocaleTag * t = getTag ( index ); + NCTableLine *line = myPad()->ModifyLine( index ); + + if ( !t || !line ) + return; + + yuiMilestone() << "Toggle status of: " << myLocale.locale().code() << endl; + + if ( zypp::getZYpp()->pool().isRequestedLocale( myLocale.locale() ) ) + { + zypp::getZYpp()->pool().eraseRequestedLocale( myLocale.locale() ); + } + else + { + zypp::getZYpp()->pool().addRequestedLocale( myLocale.locale() ); + } + packager->showPackageDependencies( true ); + + cellChanged( index, 0, status( myLocale.locale() ) ); +} + NCursesEvent NCPkgLocaleTable::wHandleInput( wint_t ch ) { NCursesEvent ret = NCursesEvent::none; @@ -144,10 +190,17 @@ showLocalePackages(); break; } - + case KEY_SPACE: + case KEY_RETURN: { + ret = NCursesEvent::handled; + toggleStatus(); + showLocalePackages(); + break; + } + default: - ret = NCTable::wHandleInput( ch ) ; - } + ret = NCTable::wHandleInput( ch ) ; + } return ret; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.16.11/src/NCPkgFilterLocale.h new/yast2-ncurses-pkg-2.16.13/src/NCPkgFilterLocale.h --- old/yast2-ncurses-pkg-2.16.11/src/NCPkgFilterLocale.h 2008-04-29 12:43:26.000000000 +0200 +++ new/yast2-ncurses-pkg-2.16.13/src/NCPkgFilterLocale.h 2008-05-29 09:39:14.000000000 +0200 @@ -34,7 +34,7 @@ public: - NCPkgLocaleTag ( zypp::sat::LocaleSupport locale); + NCPkgLocaleTag ( zypp::sat::LocaleSupport locale, string status ); ~NCPkgLocaleTag() { }; @@ -57,12 +57,14 @@ virtual ~NCPkgLocaleTable() {}; void fillHeader(); - void addLine ( zypp::sat::LocaleSupport, const vector <string> & cols ); + void addLine ( zypp::sat::LocaleSupport, const vector <string> & cols, string status ); void fillLocaleList(); void showLocalePackages(); NCPkgLocaleTag* getTag (const int & index ); zypp::sat::LocaleSupport getLocale( int index ); + string status( zypp::Locale lang ); + void toggleStatus(); NCursesEvent wHandleInput( wint_t ch ); }; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.16.11/src/NCPkgMenuDeps.cc new/yast2-ncurses-pkg-2.16.13/src/NCPkgMenuDeps.cc --- old/yast2-ncurses-pkg-2.16.11/src/NCPkgMenuDeps.cc 2008-05-06 17:02:35.000000000 +0200 +++ new/yast2-ncurses-pkg-2.16.13/src/NCPkgMenuDeps.cc 2008-05-29 09:02:23.000000000 +0200 @@ -145,35 +145,31 @@ yuiMilestone() << "Verifying system" << endl; - if ( pkg->DepsPopup() ) + pkg->saveState(); + //call the solver (with S_Verify it displays no popup) + cancel = pkg->verifySystem ( &ok ); + + //display the popup with automatic changes + NCPkgPopupTable * autoChangePopup = new NCPkgPopupTable( wpos( 3, 8 ), pkg ); + NCursesEvent input = autoChangePopup->showInfoPopup(); + + if ( input == NCursesEvent::cancel ) { - pkg->saveState(); - //call the solver (with S_Verify it displays no popup) - //cancel = depsPopup->showDependencies( NCPkgPopupDeps::S_Verify, &ok ); - cancel = pkg->verifySystem ( &ok ); - - //display the popup with automatic changes - NCPkgPopupTable * autoChangePopup = new NCPkgPopupTable( wpos( 3, 8 ), pkg ); - NCursesEvent input = autoChangePopup->showInfoPopup(); - - if ( input == NCursesEvent::cancel ) - { - // user clicked on Cancel - pkg->restoreState(); - cancel = true; - } - if ( ok && input == NCursesEvent::button ) - { - // dependencies OK, no automatic changes/the user has accepted the changes - NCPopupInfo * info = new NCPopupInfo( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-30)/2 ), - "", - _( "System dependencies verify OK." ), - NCPkgStrings::OKLabel() - ); - info->setNiceSize( 35, 5 ); - info->showInfoPopup(); - YDialog::deleteTopmostDialog(); - } + // user clicked on Cancel + pkg->restoreState(); + cancel = true; + } + if ( ok && input == NCursesEvent::button ) + { + // dependencies OK, no automatic changes/the user has accepted the changes + NCPopupInfo * info = new NCPopupInfo( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-30)/2 ), + "", + _( "System dependencies verify OK." ), + NCPkgStrings::OKLabel() + ); + info->setNiceSize( 35, 5 ); + info->showInfoPopup(); + YDialog::deleteTopmostDialog(); } YDialog::deleteTopmostDialog(); // delete NCPopupInfo dialog diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.16.11/src/NCPkgMenuExtras.cc new/yast2-ncurses-pkg-2.16.13/src/NCPkgMenuExtras.cc --- old/yast2-ncurses-pkg-2.16.11/src/NCPkgMenuExtras.cc 2008-05-06 16:22:32.000000000 +0200 +++ new/yast2-ncurses-pkg-2.16.13/src/NCPkgMenuExtras.cc 2008-05-27 13:30:49.000000000 +0200 @@ -301,8 +301,7 @@ bool NCPkgMenuExtras::showDiskSpace() { - pkg->diskSpacePopup()->showInfoPopup( NCPkgStrings::DiskspaceLabel() ); - YDialog::deleteTopmostDialog(); + pkg->diskSpacePopup()->showInfoPopup( NCPkgStrings::DiskspaceLabel() ); //FIXME: move focus back to pkg table? return true; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.16.11/src/NCPkgPopupDiskspace.cc new/yast2-ncurses-pkg-2.16.13/src/NCPkgPopupDiskspace.cc --- old/yast2-ncurses-pkg-2.16.11/src/NCPkgPopupDiskspace.cc 2008-04-02 11:47:04.000000000 +0200 +++ new/yast2-ncurses-pkg-2.16.13/src/NCPkgPopupDiskspace.cc 2008-05-27 13:30:49.000000000 +0200 @@ -60,13 +60,10 @@ // // DESCRIPTION : // -NCPkgPopupDiskspace::NCPkgPopupDiskspace( const wpos at, bool testMode ) - : NCPopup( at, false ) - , partitions( 0 ) - , okButton( 0 ) - , testmode( testMode ) +NCPkgDiskspace::NCPkgDiskspace( bool testMode ) + : testmode( testMode ) + , popupWin( 0 ) { - createLayout( ); if ( testMode ) { @@ -84,38 +81,8 @@ // // DESCRIPTION : // -NCPkgPopupDiskspace::~NCPkgPopupDiskspace() -{ -} - -/////////////////////////////////////////////////////////////////// -// -// -// METHOD NAME : NCPkgPopupDiskspace::createLayout -// METHOD TYPE : void -// -// DESCRIPTION : -// -void NCPkgPopupDiskspace::createLayout( ) +NCPkgDiskspace::~NCPkgDiskspace() { - // the vertical split is the (only) child of the dialog - NCLayoutBox * split = new NCLayoutBox( this, YD_VERT ); - - head = new NCLabel( split, "", true, false ); // isHeading = true - - YTableHeader * tableHeader = new YTableHeader(); - tableHeader->addColumn( NCPkgStrings::Partition(), YAlignBegin ); - tableHeader->addColumn( NCPkgStrings::UsedSpace(), YAlignBegin ); - tableHeader->addColumn( NCPkgStrings::FreeSpace(), YAlignBegin ); - tableHeader->addColumn( NCPkgStrings::TotalSpace(), YAlignBegin ); - tableHeader->addColumn( "% ", YAlignBegin ); - - // add the partition table - partitions = new NCTable( split, tableHeader ); - - // add the ok button - okButton = new NCPushButton( split, NCPkgStrings::OKLabel() ); - okButton->setFunctionKey( 10 ); } /////////////////////////////////////////////////////////////////// @@ -126,8 +93,9 @@ // // DESCRIPTION : // -void NCPkgPopupDiskspace::fillPartitionTable() +void NCPkgDiskspace::fillPartitionTable() { + NCTable * partitions = popupWin->Partitions(); partitions->deleteAllItems(); // clear table YTableItem * newItem; @@ -179,7 +147,7 @@ // // DESCRIPTION : // -string NCPkgPopupDiskspace::checkDiskSpace() +string NCPkgDiskspace::checkDiskSpace() { string text = ""; @@ -219,7 +187,7 @@ return text; } -void NCPkgPopupDiskspace::checkRemainingDiskSpace( const ZyppPartitionDu & partition ) +void NCPkgDiskspace::checkRemainingDiskSpace( const ZyppPartitionDu & partition ) { FSize usedSize ( partition.pkg_size, FSize::K ); FSize totalSize ( partition.total_size, FSize::K ); @@ -282,7 +250,7 @@ // DESCRIPTION : for testing only; called from PackageSelector // if running in testMode // -void NCPkgPopupDiskspace::setDiskSpace( wint_t ch ) +void NCPkgDiskspace::setDiskSpace( wint_t ch ) { int percent = 0; @@ -319,7 +287,7 @@ // // DESCRIPTION : // -void NCPkgPopupDiskspace::checkDiskSpaceRange( ) +void NCPkgDiskspace::checkDiskSpaceRange( ) { // see YQPkgDiskUsageList::updateDiskUsage() runningOutWarning.clear(); @@ -362,7 +330,7 @@ } -string NCPkgPopupDiskspace::usedPercent( FSize used, FSize total ) +string NCPkgDiskspace::usedPercent( FSize used, FSize total ) { int percent = 0; char percentStr[10]; @@ -383,23 +351,54 @@ // // DESCRIPTION : // -void NCPkgPopupDiskspace::showInfoPopup( string headline ) +void NCPkgDiskspace::showInfoPopup( string headline ) { - if ( head ) - head->setLabel( headline ); + popupWin = new NCPkgPopupDiskspace (wpos( (NCurses::lines() - 15)/2, NCurses::cols()/6 ), headline ); // update values in partition table fillPartitionTable(); - - postevent = NCursesEvent(); - do { - // show the popup - popupDialog( ); - } while ( postAgain() ); - - popdownDialog(); + popupWin->doit(); + YDialog::deleteTopmostDialog(); + } + + +NCPkgPopupDiskspace::NCPkgPopupDiskspace( const wpos at, string headline ) + : NCPopup( at, false ) + , partitions( 0 ) + , okButton( 0 ) + , head( 0 ) +{ + createLayout( headline ); +} + +NCPkgPopupDiskspace::~NCPkgPopupDiskspace() +{ } +void NCPkgPopupDiskspace::createLayout( string headline ) +{ + // the vertical split is the (only) child of the dialog + NCLayoutBox * split = new NCLayoutBox( this, YD_VERT ); + + head = new NCLabel( split, "", true, false ); // isHeading = true + head->setLabel( headline ); + + YTableHeader * tableHeader = new YTableHeader(); + tableHeader->addColumn( NCPkgStrings::Partition(), YAlignBegin ); + tableHeader->addColumn( NCPkgStrings::UsedSpace(), YAlignBegin ); + tableHeader->addColumn( NCPkgStrings::FreeSpace(), YAlignBegin ); + tableHeader->addColumn( NCPkgStrings::TotalSpace(), YAlignBegin ); + tableHeader->addColumn( "% ", YAlignBegin ); + + // add the partition table + partitions = new NCTable( split, tableHeader ); + + // add the ok button + okButton = new NCPushButton( split, NCPkgStrings::OKLabel() ); + okButton->setFunctionKey( 10 ); +} + + /////////////////////////////////////////////////////////////////// // // @@ -425,6 +424,17 @@ return NCurses::lines()-4; } +void NCPkgPopupDiskspace::doit() +{ + postevent = NCursesEvent(); + do { + // show the popup + popupDialog( ); + } while ( postAgain() ); + + popdownDialog(); + +} /////////////////////////////////////////////////////////////////// // // diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.16.11/src/NCPkgPopupDiskspace.h new/yast2-ncurses-pkg-2.16.13/src/NCPkgPopupDiskspace.h --- old/yast2-ncurses-pkg-2.16.11/src/NCPkgPopupDiskspace.h 2008-05-06 16:35:33.000000000 +0200 +++ new/yast2-ncurses-pkg-2.16.13/src/NCPkgPopupDiskspace.h 2008-05-27 13:30:49.000000000 +0200 @@ -132,6 +132,33 @@ bool _warningPosted; }; +class NCPkgPopupDiskspace : public NCPopup { + +private: + NCTable * partitions; + NCPushButton * okButton; + NCLabel * head; + +protected: + + virtual bool postAgain(); + + virtual NCursesEvent wHandleInput( wint_t ch ); + +public: + NCPkgPopupDiskspace( const wpos at, string headline ); + + virtual ~NCPkgPopupDiskspace(); + + void createLayout( string headline ); + void doit(); + + NCTable *Partitions() { return partitions; } + + virtual int preferredWidth(); + virtual int preferredHeight(); + +}; /////////////////////////////////////////////////////////////////// // @@ -139,17 +166,15 @@ // // DESCRIPTION : // -class NCPkgPopupDiskspace : public NCPopup { +class NCPkgDiskspace { - NCPkgPopupDiskspace & operator=( const NCPkgPopupDiskspace & ); - NCPkgPopupDiskspace ( const NCPkgPopupDiskspace & ); + NCPkgDiskspace & operator=( const NCPkgDiskspace & ); + NCPkgDiskspace ( const NCPkgDiskspace & ); private: - NCTable * partitions; - NCPushButton * okButton; - NCLabel * head; bool testmode; + NCPkgPopupDiskspace *popupWin; ZyppDuSet testDiskUsage; string usedPercent( FSize used, FSize total ); @@ -164,20 +189,13 @@ **/ NCPkgWarningRangeNotifier overflowWarning; -protected: - - virtual bool postAgain(); - - virtual NCursesEvent wHandleInput( wint_t ch ); - + public: - NCPkgPopupDiskspace( const wpos at, bool testSpaceMode ); + NCPkgDiskspace( bool testSpaceMode ); - virtual ~NCPkgPopupDiskspace(); + virtual ~NCPkgDiskspace(); - virtual int preferredWidth(); - virtual int preferredHeight(); void fillPartitionTable(); @@ -187,17 +205,12 @@ void checkDiskSpaceRange( ); - void createLayout( ); - void showInfoPopup( string headline ); - + void checkRemainingDiskSpace( const ZyppPartitionDu & partition ); }; - - - /////////////////////////////////////////////////////////////////// diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.16.11/VERSION new/yast2-ncurses-pkg-2.16.13/VERSION --- old/yast2-ncurses-pkg-2.16.11/VERSION 2008-05-21 10:36:56.000000000 +0200 +++ new/yast2-ncurses-pkg-2.16.13/VERSION 2008-05-29 10:11:59.000000000 +0200 @@ -1 +1 @@ -2.16.11 +2.16.13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0