January 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60443 - in /branches/SuSE-Code-11-SP1-Branch/gtk: ChangeLog src/YGTable.cc
by rpmcruz＠svn.opensuse.org 19 Jan '10

19 Jan '10

Author: rpmcruz Date: Tue Jan 19 11:24:40 2010 New Revision: 60443 URL: http://svn.opensuse.org/viewcvs/yast?rev=60443&view=rev Log: * src/YGTable.cc: bug fix 567505: simply backported SVN code. Modified: branches/SuSE-Code-11-SP1-Branch/gtk/ChangeLog branches/SuSE-Code-11-SP1-Branch/gtk/src/YGTable.cc Modified: branches/SuSE-Code-11-SP1-Branch/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/gtk/C… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/gtk/ChangeLog (original) +++ branches/SuSE-Code-11-SP1-Branch/gtk/ChangeLog Tue Jan 19 11:24:40 2010 @@ -1,3 +1,7 @@ +2010-01-19 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/YGTable.cc: bug fix 567505: simply backported SVN code. + 2009-11-11 Martin Kudlvasr <mkudlvasr(a)novell.com> * backport PackageSelector and zyppwrapper changes from 11.2 * Version 2.17.15 Modified: branches/SuSE-Code-11-SP1-Branch/gtk/src/YGTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/gtk/s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/gtk/src/YGTable.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/gtk/src/YGTable.cc Tue Jan 19 11:24:40 2010 @@ -2,22 +2,22 @@ * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * ********************************************************************/ -#include <config.h> -#include <YGUI.h> +#define YUILogComponent "gtk" +#include "config.h" +#include "YGUI.h" #include "YGUtils.h" #include "YGWidget.h" #include "YSelectionWidget.h" #include "YGSelectionModel.h" #include "ygtkcellrenderertextpixbuf.h" #include "ygtkscrolledwindow.h" -#include <time.h> /* A generic widget for table related widgets. */ class YGTableView : public YGScrolledWidget, public YGSelectionModel { protected: int m_colsNb; - time_t m_blockTime; // GtkTreeSelection signals act weird + guint m_blockTimeout; public: YGTableView (YWidget *ywidget, YWidget *parent, const string &label, @@ -26,8 +26,6 @@ YGTK_TYPE_TREE_VIEW, NULL) , YGSelectionModel ((YSelectionWidget *) ywidget, ordinaryModel, isTree) { - IMPL - m_blockTime = time (NULL); if (ordinaryModel) { appendIconTextColumn ("", YAlignUnchanged, YGSelectionModel::ICON_COLUMN, YGSelectionModel::LABEL_COLUMN); @@ -41,6 +39,14 @@ gtk_tree_selection_set_mode (getSelection(), GTK_SELECTION_BROWSE); // let the derivates do the event hooks. They have subtile differences. + + m_blockTimeout = 0; // GtkTreeSelection idiotically fires when showing widget + g_signal_connect (getWidget(), "map", G_CALLBACK (block_init_cb), this); + } + + virtual ~YGTableView() + { + if (m_blockTimeout) g_source_remove (m_blockTimeout); } inline GtkTreeView *getView() @@ -50,7 +56,6 @@ void appendIconTextColumn (string header, YAlignmentType align, int icon_col, int text_col) { - IMPL GtkTreeViewColumn *column; GtkCellRenderer *renderer; @@ -108,12 +113,24 @@ virtual bool immediateEvent() { return true; } - // YGSelectionModel + static gboolean block_selected_timeout_cb (gpointer data) + { + YGTableView *pThis = (YGTableView *) data; + pThis->m_blockTimeout = 0; + return FALSE; + } + + void blockSelected() + { // GtkTreeSelection only fires when idle; so set a timeout + if (m_blockTimeout) g_source_remove (m_blockTimeout); + m_blockTimeout = g_timeout_add_full (G_PRIORITY_LOW, 250, block_selected_timeout_cb, this, NULL); + } + // YGSelectionModel virtual void doSelectItem (GtkTreeIter *iter) { if (!gtk_tree_selection_iter_is_selected (getSelection(), iter)) { - m_blockTime = time (NULL); + blockSelected(); GtkTreePath *path = gtk_tree_model_get_path (getModel(), iter); gtk_tree_view_expand_to_path (getView(), path); @@ -128,7 +145,7 @@ virtual void doUnselectAll() { if (gtk_tree_selection_count_selected_rows (getSelection())) { - m_blockTime = time (NULL); + blockSelected(); gtk_tree_selection_unselect_all (getSelection()); } } @@ -156,10 +173,13 @@ return 80; } + // GTK callbacks + static void block_init_cb (GtkWidget *widget, YGTableView *pThis) + { pThis->blockSelected(); } + // toggled by user (through clicking on the renderer or some other action) void toggle (GtkTreePath *path, gint column) { - IMPL GtkTreeIter iter; if (!gtk_tree_model_get_iter (getModel(), &iter, path)) return; @@ -174,7 +194,7 @@ static void selection_changed_cb (GtkTreeSelection *selection, YGTableView *pThis) { - if (time (NULL) - pThis->m_blockTime <= 2) + if (pThis->m_blockTimeout) return; if (!pThis->toggleMode()) { GtkTreeSelection *selection = pThis->getSelection(); @@ -199,17 +219,24 @@ static void toggled_cb (GtkCellRendererToggle *renderer, gchar *path_str, YGTableView *pThis) { - IMPL GtkTreePath *path = gtk_tree_path_new_from_string (path_str); gint column = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (renderer), "column")); pThis->toggle (path, column); gtk_tree_path_free (path); } + +#if YAST2_VERSION > 2018003 + static void right_click_cb (YGtkTreeView *view, gboolean outreach, YGTableView *pThis) + { + pThis->emitEvent (YEvent::ContextMenuActivated); + } +#endif }; #include "YTable.h" #include "YGDialog.h" #include <gdk/gdkkeysyms.h> +#include <string.h> class YGTable : public YTable, public YGTableView { @@ -223,7 +250,6 @@ #endif , YGTableView (this, parent, string(), false, false) { - IMPL gtk_tree_view_set_headers_visible (getView(), TRUE); gtk_tree_view_set_rules_hint (getView(), columns() > 1); #if YAST2_VERSION >= 2017005 @@ -250,7 +276,7 @@ connect (getWidget(), "row-activated", G_CALLBACK (activated_cb), (YGTableView *) this); connect (getSelection(), "changed", G_CALLBACK (selection_changed_cb), (YGTableView *) this); - connect (getWidget(), "right-click", G_CALLBACK (right_click_cb), this); + connect (getWidget(), "right-click", G_CALLBACK (hack_right_click_cb), this); connect (getWidget(), "key-press-event", G_CALLBACK (key_press_event_cb), this); } @@ -284,7 +310,6 @@ void setSortable (bool sortable) { - IMPL if (!sortable && !GTK_WIDGET_REALIZED (getWidget())) return; int n = 0; @@ -297,6 +322,9 @@ int index = (n*2)+1; if (!sortable) index = -1; + gtk_tree_sortable_set_sort_func ( + GTK_TREE_SORTABLE (getModel()), index, tree_sort_cb, + GINT_TO_POINTER (index), NULL); gtk_tree_view_column_set_sort_column_id (column, index); } else @@ -313,8 +341,6 @@ virtual unsigned int getMinSize (YUIDimension dim) { return 30; } - YGWIDGET_IMPL_COMMON (YTable) - // YGSelectionModel virtual void doAddItem (YItem *_item) @@ -330,8 +356,6 @@ yuiError() << "Can only add YTableItems to a YTable.\n"; } - YGSELECTION_WIDGET_IMPL (YTable) - // callbacks // hack up a popup menu and honor the delete key as suggested at: @@ -342,8 +366,12 @@ YGUI::ui()->sendEvent (event); } - static void right_click_cb (YGtkTreeView *view, gboolean outreach, YGTable *pThis) + static void hack_right_click_cb (YGtkTreeView *view, gboolean outreach, YGTable *pThis) { +#if YAST2_VERSION > 2018003 + if (pThis->notifyContextMenu()) + return YGTableView::right_click_cb (view, outreach, pThis); +#endif if (!YGDialog::currentDialog()->getFunctionWidget (5) || // undetermined case -- more than one table exists YGDialog::currentDialog()->getClassWidgets ("YTable").size() > 1) { @@ -390,6 +418,21 @@ return FALSE; } + static gint tree_sort_cb (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, + gpointer _index) + { + int index = GPOINTER_TO_INT (_index); + gchar *str_a, *str_b; + gtk_tree_model_get (model, a, index, &str_a, -1); + gtk_tree_model_get (model, b, index, &str_b, -1); + int ret = strcmp (str_a, str_b); + g_free (str_a); + g_free (str_b); + return ret; + } + + YGLABEL_WIDGET_IMPL (YTable) + YGSELECTION_WIDGET_IMPL (YTable) }; #if YAST2_VERSION >= 2017005 @@ -416,19 +459,19 @@ { connect (getWidget(), "row-activated", G_CALLBACK (activated_cb), (YGTableView *) this); connect (getSelection(), "changed", G_CALLBACK (selection_changed_cb), (YGTableView *) this); +#if YAST2_VERSION > 2018003 + connect (getWidget(), "right-click", G_CALLBACK (right_click_cb), this); +#endif } virtual bool isShrinkable() { return shrinkable(); } - YGWIDGET_IMPL_COMMON (YSelectionBox) + YGLABEL_WIDGET_IMPL (YSelectionBox) YGSELECTION_WIDGET_IMPL (YSelectionBox) }; YSelectionBox *YGWidgetFactory::createSelectionBox (YWidget *parent, const string &label) -{ - IMPL - return new YGSelectionBox (parent, label); -} +{ return new YGSelectionBox (parent, label); } #include "YMultiSelectionBox.h" @@ -446,11 +489,15 @@ createModel (types); appendCheckColumn ("", 0); appendIconTextColumn ("", YAlignUnchanged, 1, 2); + gtk_tree_view_set_search_column (getView(), 2); setModel(); connect (getSelection(), "changed", G_CALLBACK (selection_changed_cb), (YGTableView *) this); // Let the user toggle, using space/enter or double click (not an event). connect (getWidget(), "row-activated", G_CALLBACK (multi_activated_cb), this); +#if YAST2_VERSION > 2018003 + connect (getWidget(), "right-click", G_CALLBACK (right_click_cb), this); +#endif } // YMultiSelectionBox @@ -483,7 +530,6 @@ { pThis->toggle (path, 0); } // YGSelectionModel - virtual void doSelectItem (GtkTreeIter *iter) { setCellToggle (iter, 0, true); @@ -500,18 +546,14 @@ } // YGWidget - virtual bool isShrinkable() { return shrinkable(); } - YGWIDGET_IMPL_COMMON (YMultiSelectionBox) + + YGLABEL_WIDGET_IMPL (YMultiSelectionBox) YGSELECTION_WIDGET_IMPL (YMultiSelectionBox) }; -YMultiSelectionBox *YGWidgetFactory::createMultiSelectionBox (YWidget *parent, - const string &label) -{ - IMPL - return new YGMultiSelectionBox (parent, label); -} +YMultiSelectionBox *YGWidgetFactory::createMultiSelectionBox (YWidget *parent, const string &label) +{ return new YGMultiSelectionBox (parent, label); } #include "YTree.h" #include "YTreeItem.h" @@ -527,6 +569,9 @@ connect (getWidget(), "row-expanded", G_CALLBACK (row_expanded_cb), this); connect (getWidget(), "cursor-changed", G_CALLBACK (row_selected_cb), this); connect (getWidget(), "row-activated", G_CALLBACK (activated_cb), (YGTableView *) this); +#if YAST2_VERSION > 2018003 + connect (getWidget(), "right-click", G_CALLBACK (right_click_cb), this); +#endif } // YTree @@ -596,7 +641,7 @@ GtkTreeIter iter; if (gtk_tree_selection_get_selected (selection, NULL, &iter)) pThis->expand (&iter); - YGTableView::selection_changed_cb (selection, pThis); + YGTable::selection_changed_cb (selection, pThis); } virtual unsigned int getMinSize (YUIDimension dim) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] Build failed in Hudson: webyast-service-11.1-i586 #716
by Hudson Integration Service 19 Jan '10

19 Jan '10

See <http://yast.suse.de:3334/job/webyast-service-11.1-i586/716/changes> Changes: [Stefan Schubert] example added [Stefan Schubert] directory added [Stefan Schubert] added restdoc in spec file ------------------------------------------ [...truncated 4898 lines...] Requires(rpmlib): rpmlib(PayloadFilesHavePrefix) <= 4.0-1 rpmlib(CompressedFileNames) <= 3.0.4-1 Checking for unpackaged file(s): /usr/lib/rpm/check-files /var/tmp/yast2-webservice-eulas-0.0.5-build Checking for unpackaged file(s): /usr/lib/rpm/check-files /var/tmp/yast2-webservice-eulas-0.0.5-build Wrote: /artifacts/webyast/rest-service/rpms/noarch/yast2-webservice-eulas-0.0.5-0.noarch.rpm Executing(%clean): /bin/sh -e /var/tmp/rpm-tmp.77825 + umask 022 + cd /tmp/rpmbuild + cd www + rm -rf /var/tmp/yast2-webservice-eulas-0.0.5-build + exit 0 + check_exit 0 + '[' -z 0 ']' + MYEXIT=0 + '[' 0 == 0 ']' + echo 'exit code: 0 ... good, lets continue' exit code: 0 ... good, lets continue + return + popd /src/rest-service + for rpmdir in '${SUBDIR}/package' '`find ./plugins -name package | grep -v "rpam\|ruby-polkit"`' ++ dirname ./plugins/ntp/package + pkgdir=./plugins/ntp ++ basename ./plugins/ntp + pkgname=ntp + destination=/artifacts/webyast/rest-service/package/yast2-webservice-ntp + mkdir -p /artifacts/webyast/rest-service/package/yast2-webservice-ntp + rm -rf '/artifacts/webyast/rest-service/package/yast2-webservice-ntp/*' + rm -rf ./plugins/ntp/package/www + cp -r ./plugins/ntp/package/NTP.pm ./plugins/ntp/package/org.opensuse.yast.modules.yapi.ntp.policy ./plugins/ntp/package/www.tar.bz2 ./plugins/ntp/package/yast2-webservice-ntp.changes ./plugins/ntp/package/yast2-webservice-ntp.spec /artifacts/webyast/rest-service/package/yast2-webservice-ntp + pushd ./plugins/ntp/package /src/rest-service/plugins/ntp/package /src/rest-service + case "${pkgdir}" in + build_spec + rpm --rebuilddb + mkdir -p /tmp + mkdir -p /artifacts/webyast/rest-service/rpms + mkdir -p /tmp/rpmbuild + mkdir -p /tmp/buildroot + cat + check_exit 0 + '[' -z 0 ']' + MYEXIT=0 + '[' 0 == 0 ']' + echo 'exit code: 0 ... good, lets continue' exit code: 0 ... good, lets continue + return + /usr/bin/rpmbuild -bb --define 'run_testsuite 1' yast2-webservice-ntp.spec Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.26528 + umask 022 + cd /tmp/rpmbuild + cd /tmp/rpmbuild + rm -rf www + /usr/bin/bzip2 -dc /src/rest-service/plugins/ntp/package/www.tar.bz2 + tar -xf - + STATUS=0 + '[' 0 -ne 0 ']' + cd www ++ /usr/bin/id -u + '[' 0 = 0 ']' + /bin/chown -Rhf root . ++ /usr/bin/id -u + '[' 0 = 0 ']' + /bin/chgrp -Rhf root . + /bin/chmod -Rf a+rX,u+w,g-w,o-w . + exit 0 Executing(%build): /bin/sh -e /var/tmp/rpm-tmp.26528 + umask 022 + cd /tmp/rpmbuild + /bin/rm -rf /var/tmp/yast2-webservice-ntp-0.0.8-build ++ dirname /var/tmp/yast2-webservice-ntp-0.0.8-build + /bin/mkdir -p /var/tmp + /bin/mkdir /var/tmp/yast2-webservice-ntp-0.0.8-build + cd www + mkdir -p public/ntp/restdoc + export RAILS_PARENT=/srv/www/yastws + RAILS_PARENT=/srv/www/yastws + env LANG=en rake restdoc XML Schema 'sync_request.xsd' is missing. XML Schema 'ntp.xsd' is missing. (in /tmp/rpmbuild/www) Generating REST API documentation in public/ntp/restdoc... + rm -rf restdoc + exit 0 Executing(%install): /bin/sh -e /var/tmp/rpm-tmp.79692 + umask 022 + cd /tmp/rpmbuild + cd www + mkdir -p /var/tmp/yast2-webservice-ntp-0.0.8-build/srv/www/yastws/vendor/plugins/ntp + cp -a COPYING README Rakefile app config init.rb install.rb public uninstall.rb /var/tmp/yast2-webservice-ntp-0.0.8-build/srv/www/yastws/vendor/plugins/ntp + rm -f /var/tmp/yast2-webservice-ntp-0.0.8-build/srv/www/yastws/vendor/plugins/ntp/COPYING + mkdir -p /var/tmp/yast2-webservice-ntp-0.0.8-build/usr/share/YaST2/modules/YaPI/ + cp /src/rest-service/plugins/ntp/package/NTP.pm /var/tmp/yast2-webservice-ntp-0.0.8-build/usr/share/YaST2/modules/YaPI/ + mkdir -p /var/tmp/yast2-webservice-ntp-0.0.8-build/usr/share/PolicyKit/policy/ + cp /src/rest-service/plugins/ntp/package/org.opensuse.yast.modules.yapi.ntp.policy /var/tmp/yast2-webservice-ntp-0.0.8-build/usr/share/PolicyKit/policy/ + RPM_BUILD_ROOT=/var/tmp/yast2-webservice-ntp-0.0.8-build + export RPM_BUILD_ROOT + test -x /usr/sbin/Check -a 0 = 0 -o -x /usr/sbin/Check -a '!' -z /var/tmp/yast2-webservice-ntp-0.0.8-build + echo 'I call /usr/sbin/Check...' I call /usr/sbin/Check... + /usr/sbin/Check + /usr/lib/rpm/brp-compress + /usr/lib/rpm/brp-strip-debug + /usr/lib/rpm/brp-check-la + /usr/lib/rpm/brp-symlink + /usr/lib/rpm/brp-desktop WARNING: '/usr/lib/rpm/brp-desktop.data/suse-screensavers.menu' does not exist WARNING: '/usr/lib/rpm/brp-desktop.data/preferences-gnome.menu' does not exist WARNING: '/usr/lib/rpm/brp-desktop.data/applications-kmenuedit.menu' does not exist + /usr/lib/rpm/brp-rpath + /usr/lib/rpm/brp-pie + /usr/lib/rpm/brp-rootfs + /usr/lib/rpm/brp-tcl + /usr/lib/rpm/brp-check-python + /usr/lib/rpm/brp-check-bytecode-version + /usr/lib/rpm/brp-boot-scripts + /usr/lib/rpm/brp-hook Processing files: yast2-webservice-ntp-0.0.8-0 Executing(%doc): /bin/sh -e /var/tmp/rpm-tmp.75705 + umask 022 + cd /tmp/rpmbuild + cd www + DOCDIR=/var/tmp/yast2-webservice-ntp-0.0.8-build/usr/share/doc/packages/yast2-webservice-ntp + export DOCDIR + rm -rf /var/tmp/yast2-webservice-ntp-0.0.8-build/usr/share/doc/packages/yast2-webservice-ntp + /bin/mkdir -p /var/tmp/yast2-webservice-ntp-0.0.8-build/usr/share/doc/packages/yast2-webservice-ntp + cp -pr COPYING /var/tmp/yast2-webservice-ntp-0.0.8-build/usr/share/doc/packages/yast2-webservice-ntp + exit 0 Finding Provides: /usr/lib/rpm/find-provides yast2-webservice-ntp Finding Requires: /usr/lib/rpm/find-requires yast2-webservice-ntp Finding Supplements: /usr/lib/rpm/find-supplements yast2-webservice-ntp Provides: perl(YaPI::NTP) Requires(interp): /bin/sh /bin/sh Requires(rpmlib): rpmlib(PayloadFilesHavePrefix) <= 4.0-1 rpmlib(CompressedFileNames) <= 3.0.4-1 Requires(post): /bin/sh Requires(postun): /bin/sh Checking for unpackaged file(s): /usr/lib/rpm/check-files /var/tmp/yast2-webservice-ntp-0.0.8-build Checking for unpackaged file(s): /usr/lib/rpm/check-files /var/tmp/yast2-webservice-ntp-0.0.8-build Wrote: /artifacts/webyast/rest-service/rpms/noarch/yast2-webservice-ntp-0.0.8-0.noarch.rpm Executing(%clean): /bin/sh -e /var/tmp/rpm-tmp.75705 + umask 022 + cd /tmp/rpmbuild + cd www + rm -rf /var/tmp/yast2-webservice-ntp-0.0.8-build + exit 0 + check_exit 0 + '[' -z 0 ']' + MYEXIT=0 + '[' 0 == 0 ']' + echo 'exit code: 0 ... good, lets continue' exit code: 0 ... good, lets continue + return + popd /src/rest-service + for rpmdir in '${SUBDIR}/package' '`find ./plugins -name package | grep -v "rpam\|ruby-polkit"`' ++ dirname ./plugins/status/package + pkgdir=./plugins/status ++ basename ./plugins/status + pkgname=status + destination=/artifacts/webyast/rest-service/package/yast2-webservice-status + mkdir -p /artifacts/webyast/rest-service/package/yast2-webservice-status + rm -rf '/artifacts/webyast/rest-service/package/yast2-webservice-status/*' + rm -rf ./plugins/status/package/www + cp -r ./plugins/status/package/LogFile.rb ./plugins/status/package/org.opensuse.yast.modules.logfile.policy ./plugins/status/package/org.opensuse.yast.system.status.policy ./plugins/status/package/www.tar.bz2 ./plugins/status/package/yast2-webservice-status.changes ./plugins/status/package/yast2-webservice-status.spec /artifacts/webyast/rest-service/package/yast2-webservice-status + pushd ./plugins/status/package /src/rest-service/plugins/status/package /src/rest-service + case "${pkgdir}" in + build_spec + rpm --rebuilddb + mkdir -p /tmp + mkdir -p /artifacts/webyast/rest-service/rpms + mkdir -p /tmp/rpmbuild + mkdir -p /tmp/buildroot + cat + check_exit 0 + '[' -z 0 ']' + MYEXIT=0 + '[' 0 == 0 ']' + echo 'exit code: 0 ... good, lets continue' exit code: 0 ... good, lets continue + return + /usr/bin/rpmbuild -bb --define 'run_testsuite 1' yast2-webservice-status.spec Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.5504 + umask 022 + cd /tmp/rpmbuild + cd /tmp/rpmbuild + rm -rf www + /usr/bin/bzip2 -dc /src/rest-service/plugins/status/package/www.tar.bz2 + tar -xf - + STATUS=0 + '[' 0 -ne 0 ']' + cd www ++ /usr/bin/id -u + '[' 0 = 0 ']' + /bin/chown -Rhf root . ++ /usr/bin/id -u + '[' 0 = 0 ']' + /bin/chgrp -Rhf root . + /bin/chmod -Rf a+rX,u+w,g-w,o-w . + exit 0 Executing(%build): /bin/sh -e /var/tmp/rpm-tmp.5504 + umask 022 + cd /tmp/rpmbuild + /bin/rm -rf /var/tmp/yast2-webservice-status-0.0.10-build ++ dirname /var/tmp/yast2-webservice-status-0.0.10-build + /bin/mkdir -p /var/tmp + /bin/mkdir /var/tmp/yast2-webservice-status-0.0.10-build + cd www + mkdir public/status/restdoc mkdir: cannot create directory `public/status/restdoc': File exists error: Bad exit status from /var/tmp/rpm-tmp.5504 (%build) RPM build errors: Bad exit status from /var/tmp/rpm-tmp.5504 (%build) + check_exit 1 + '[' -z 1 ']' + MYEXIT=1 + '[' 1 == 0 ']' + footer_and_exit 1 + '[' -z 1 ']' + MYEXIT=1 + '[' 1 == 0 ']' + ascii_failed + cat ( ) ( ) ( ) _ ) ( \_ _(_\ \)__ (____\___)) build failed + echo 'stopping dbus..' stopping dbus.. + /etc/init.d/dbus stop Shutting down D-Bus daemon..done + exit 1 ... unmounting sys ... unmounting proc ... unmounting pts [locks-and-latches] Releasing all the locks [locks-and-latches] All the locks released Archiving artifacts Build wasn't successful, skipping saikuro coverage report Publishing rails stats report... [workspace] $ rake --silent stats Failed to send e-mail to Stefan Schubert because no e-mail address is known, and no default e-mail domain is configured -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 2

[yast-commit] Build failed in Hudson: webyast-service-head-i586 #669
by Hudson Integration Service 19 Jan '10

19 Jan '10

See <http://yast.suse.de:3334/job/webyast-service-head-i586/669/changes> Changes: [Stefan Schubert] example added [Stefan Schubert] directory added [Stefan Schubert] added restdoc in spec file ------------------------------------------ [...truncated 4899 lines...] + DOCDIR=/usr/src/packages/BUILDROOT/yast2-webservice-eulas-0.0.5-0.i386/usr/share/doc/packages/yast2-webservice-eulas + export DOCDIR + rm -rf /usr/src/packages/BUILDROOT/yast2-webservice-eulas-0.0.5-0.i386/usr/share/doc/packages/yast2-webservice-eulas + /bin/mkdir -p /usr/src/packages/BUILDROOT/yast2-webservice-eulas-0.0.5-0.i386/usr/share/doc/packages/yast2-webservice-eulas + cp -pr COPYING /usr/src/packages/BUILDROOT/yast2-webservice-eulas-0.0.5-0.i386/usr/share/doc/packages/yast2-webservice-eulas + exit 0 Finding Provides: /usr/lib/rpm/find-provides yast2-webservice-eulas Finding Requires: /usr/lib/rpm/find-requires yast2-webservice-eulas Finding Supplements: /usr/lib/rpm/find-supplements yast2-webservice-eulas Requires(rpmlib): rpmlib(PayloadFilesHavePrefix) <= 4.0-1 rpmlib(CompressedFileNames) <= 3.0.4-1 Requires(pre): yast2-webservice Requires(preun): yast2-webservice Checking for unpackaged file(s): /usr/lib/rpm/check-files /usr/src/packages/BUILDROOT/yast2-webservice-eulas-0.0.5-0.i386 Wrote: /artifacts/webyast/rest-service/rpms/noarch/yast2-webservice-eulas-0.0.5-0.noarch.rpm Executing(%clean): /bin/sh -e /var/tmp/rpm-tmp.gMGvQt + umask 022 + cd /tmp/rpmbuild + cd www + rm -rf /usr/src/packages/BUILDROOT/yast2-webservice-eulas-0.0.5-0.i386 + exit 0 + check_exit 0 + '[' -z 0 ']' + MYEXIT=0 + '[' 0 == 0 ']' + echo 'exit code: 0 ... good, lets continue' exit code: 0 ... good, lets continue + return + popd /src/rest-service + for rpmdir in '${SUBDIR}/package' '`find ./plugins -name package | grep -v "rpam\|ruby-polkit"`' ++ dirname ./plugins/ntp/package + pkgdir=./plugins/ntp ++ basename ./plugins/ntp + pkgname=ntp + destination=/artifacts/webyast/rest-service/package/yast2-webservice-ntp + mkdir -p /artifacts/webyast/rest-service/package/yast2-webservice-ntp + rm -rf '/artifacts/webyast/rest-service/package/yast2-webservice-ntp/*' + rm -rf ./plugins/ntp/package/www + cp -r ./plugins/ntp/package/NTP.pm ./plugins/ntp/package/org.opensuse.yast.modules.yapi.ntp.policy ./plugins/ntp/package/www.tar.bz2 ./plugins/ntp/package/yast2-webservice-ntp.changes ./plugins/ntp/package/yast2-webservice-ntp.spec /artifacts/webyast/rest-service/package/yast2-webservice-ntp + pushd ./plugins/ntp/package /src/rest-service/plugins/ntp/package /src/rest-service + case "${pkgdir}" in + build_spec + rpm --rebuilddb + mkdir -p /tmp + mkdir -p /artifacts/webyast/rest-service/rpms + mkdir -p /tmp/rpmbuild + mkdir -p /tmp/buildroot + cat + check_exit 0 + '[' -z 0 ']' + MYEXIT=0 + '[' 0 == 0 ']' + echo 'exit code: 0 ... good, lets continue' exit code: 0 ... good, lets continue + return + /usr/bin/rpmbuild -bb --define 'run_testsuite 1' yast2-webservice-ntp.spec Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.ACSvPu + umask 022 + cd /tmp/rpmbuild + cd /tmp/rpmbuild + rm -rf www + /usr/bin/bzip2 -dc /src/rest-service/plugins/ntp/package/www.tar.bz2 + /bin/tar -xf - + STATUS=0 + '[' 0 -ne 0 ']' + cd www + /bin/chmod -Rf a+rX,u+w,g-w,o-w . + exit 0 Executing(%build): /bin/sh -e /var/tmp/rpm-tmp.0oZsIO + umask 022 + cd /tmp/rpmbuild + /bin/rm -rf /usr/src/packages/BUILDROOT/yast2-webservice-ntp-0.0.8-0.i386 ++ dirname /usr/src/packages/BUILDROOT/yast2-webservice-ntp-0.0.8-0.i386 + /bin/mkdir -p /usr/src/packages/BUILDROOT + /bin/mkdir /usr/src/packages/BUILDROOT/yast2-webservice-ntp-0.0.8-0.i386 + cd www + mkdir -p public/ntp/restdoc + export RAILS_PARENT=/srv/www/yastws + RAILS_PARENT=/srv/www/yastws + env LANG=en rake restdoc XML Schema 'sync_request.xsd' is missing. XML Schema 'ntp.xsd' is missing. (in /tmp/rpmbuild/www) Generating REST API documentation in public/ntp/restdoc... + rm -rf restdoc + exit 0 Executing(%install): /bin/sh -e /var/tmp/rpm-tmp.psvqfT + umask 022 + cd /tmp/rpmbuild + cd www + mkdir -p /usr/src/packages/BUILDROOT/yast2-webservice-ntp-0.0.8-0.i386/srv/www/yastws/vendor/plugins/ntp + cp -a COPYING README Rakefile app config init.rb install.rb public uninstall.rb /usr/src/packages/BUILDROOT/yast2-webservice-ntp-0.0.8-0.i386/srv/www/yastws/vendor/plugins/ntp + rm -f /usr/src/packages/BUILDROOT/yast2-webservice-ntp-0.0.8-0.i386/srv/www/yastws/vendor/plugins/ntp/COPYING + mkdir -p /usr/src/packages/BUILDROOT/yast2-webservice-ntp-0.0.8-0.i386/usr/share/YaST2/modules/YaPI/ + cp /src/rest-service/plugins/ntp/package/NTP.pm /usr/src/packages/BUILDROOT/yast2-webservice-ntp-0.0.8-0.i386/usr/share/YaST2/modules/YaPI/ + mkdir -p /usr/src/packages/BUILDROOT/yast2-webservice-ntp-0.0.8-0.i386/usr/share/PolicyKit/policy/ + cp /src/rest-service/plugins/ntp/package/org.opensuse.yast.modules.yapi.ntp.policy /usr/src/packages/BUILDROOT/yast2-webservice-ntp-0.0.8-0.i386/usr/share/PolicyKit/policy/ + RPM_BUILD_ROOT=/usr/src/packages/BUILDROOT/yast2-webservice-ntp-0.0.8-0.i386 + export RPM_BUILD_ROOT + test -x /usr/sbin/Check -a 0 = 0 -o -x /usr/sbin/Check -a '!' -z /usr/src/packages/BUILDROOT/yast2-webservice-ntp-0.0.8-0.i386 + echo 'I call /usr/sbin/Check...' I call /usr/sbin/Check... + /usr/sbin/Check + /usr/lib/rpm/brp-compress + /usr/lib/rpm/brp-strip-debug + /usr/lib/rpm/brp-check-la + /usr/lib/rpm/brp-symlink + /usr/lib/rpm/brp-desktop WARNING: '/usr/lib/rpm/brp-desktop.data/suse-screensavers.menu' does not exist WARNING: '/usr/lib/rpm/brp-desktop.data/preferences-gnome.menu' does not exist WARNING: '/usr/lib/rpm/brp-desktop.data/applications-kmenuedit.menu' does not exist + /usr/lib/rpm/brp-rpath + /usr/lib/rpm/brp-pie + /usr/lib/rpm/brp-rootfs + /usr/lib/rpm/brp-tcl + /usr/lib/rpm/brp-check-python + /usr/lib/rpm/brp-check-bytecode-version + /usr/lib/rpm/brp-boot-scripts + /usr/lib/rpm/brp-hook Processing files: yast2-webservice-ntp-0.0.8-0.noarch Executing(%doc): /bin/sh -e /var/tmp/rpm-tmp.wHCtuY + umask 022 + cd /tmp/rpmbuild + cd www + DOCDIR=/usr/src/packages/BUILDROOT/yast2-webservice-ntp-0.0.8-0.i386/usr/share/doc/packages/yast2-webservice-ntp + export DOCDIR + rm -rf /usr/src/packages/BUILDROOT/yast2-webservice-ntp-0.0.8-0.i386/usr/share/doc/packages/yast2-webservice-ntp + /bin/mkdir -p /usr/src/packages/BUILDROOT/yast2-webservice-ntp-0.0.8-0.i386/usr/share/doc/packages/yast2-webservice-ntp + cp -pr COPYING /usr/src/packages/BUILDROOT/yast2-webservice-ntp-0.0.8-0.i386/usr/share/doc/packages/yast2-webservice-ntp + exit 0 Finding Provides: /usr/lib/rpm/find-provides yast2-webservice-ntp Finding Requires: /usr/lib/rpm/find-requires yast2-webservice-ntp Finding Supplements: /usr/lib/rpm/find-supplements yast2-webservice-ntp Provides: perl(YaPI::NTP) Requires(interp): /bin/sh /bin/sh Requires(rpmlib): rpmlib(PayloadFilesHavePrefix) <= 4.0-1 rpmlib(CompressedFileNames) <= 3.0.4-1 Requires(pre): yast2-webservice Requires(post): /bin/sh Requires(preun): yast2-webservice Requires(postun): /bin/sh Checking for unpackaged file(s): /usr/lib/rpm/check-files /usr/src/packages/BUILDROOT/yast2-webservice-ntp-0.0.8-0.i386 Wrote: /artifacts/webyast/rest-service/rpms/noarch/yast2-webservice-ntp-0.0.8-0.noarch.rpm Executing(%clean): /bin/sh -e /var/tmp/rpm-tmp.I8LRGe + umask 022 + cd /tmp/rpmbuild + cd www + rm -rf /usr/src/packages/BUILDROOT/yast2-webservice-ntp-0.0.8-0.i386 + exit 0 + check_exit 0 + '[' -z 0 ']' + MYEXIT=0 + '[' 0 == 0 ']' + echo 'exit code: 0 ... good, lets continue' exit code: 0 ... good, lets continue + return + popd /src/rest-service + for rpmdir in '${SUBDIR}/package' '`find ./plugins -name package | grep -v "rpam\|ruby-polkit"`' ++ dirname ./plugins/status/package + pkgdir=./plugins/status ++ basename ./plugins/status + pkgname=status + destination=/artifacts/webyast/rest-service/package/yast2-webservice-status + mkdir -p /artifacts/webyast/rest-service/package/yast2-webservice-status + rm -rf '/artifacts/webyast/rest-service/package/yast2-webservice-status/*' + rm -rf ./plugins/status/package/www + cp -r ./plugins/status/package/LogFile.rb ./plugins/status/package/org.opensuse.yast.modules.logfile.policy ./plugins/status/package/org.opensuse.yast.system.status.policy ./plugins/status/package/www.tar.bz2 ./plugins/status/package/yast2-webservice-status.changes ./plugins/status/package/yast2-webservice-status.spec /artifacts/webyast/rest-service/package/yast2-webservice-status + pushd ./plugins/status/package /src/rest-service/plugins/status/package /src/rest-service + case "${pkgdir}" in + build_spec + rpm --rebuilddb + mkdir -p /tmp + mkdir -p /artifacts/webyast/rest-service/rpms + mkdir -p /tmp/rpmbuild + mkdir -p /tmp/buildroot + cat + check_exit 0 + '[' -z 0 ']' + MYEXIT=0 + '[' 0 == 0 ']' + echo 'exit code: 0 ... good, lets continue' exit code: 0 ... good, lets continue + return + /usr/bin/rpmbuild -bb --define 'run_testsuite 1' yast2-webservice-status.spec Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.Z8Z4si + umask 022 + cd /tmp/rpmbuild + cd /tmp/rpmbuild + rm -rf www + /usr/bin/bzip2 -dc /src/rest-service/plugins/status/package/www.tar.bz2 + /bin/tar -xf - + STATUS=0 + '[' 0 -ne 0 ']' + cd www + /bin/chmod -Rf a+rX,u+w,g-w,o-w . + exit 0 Executing(%build): /bin/sh -e /var/tmp/rpm-tmp.49wb8s + umask 022 + cd /tmp/rpmbuild + /bin/rm -rf /usr/src/packages/BUILDROOT/yast2-webservice-status-0.0.10-0.i386 ++ dirname /usr/src/packages/BUILDROOT/yast2-webservice-status-0.0.10-0.i386 + /bin/mkdir -p /usr/src/packages/BUILDROOT + /bin/mkdir /usr/src/packages/BUILDROOT/yast2-webservice-status-0.0.10-0.i386 + cd www + mkdir public/status/restdoc mkdir: cannot create directory `public/status/restdoc': File exists error: Bad exit status from /var/tmp/rpm-tmp.49wb8s (%build) RPM build errors: Bad exit status from /var/tmp/rpm-tmp.49wb8s (%build) + check_exit 1 + '[' -z 1 ']' + MYEXIT=1 + '[' 1 == 0 ']' + footer_and_exit 1 + '[' -z 1 ']' + MYEXIT=1 + '[' 1 == 0 ']' + ascii_failed + cat ( ) ( ) ( ) _ ) ( \_ _(_\ \)__ (____\___)) build failed + echo 'stopping dbus..' stopping dbus.. + /etc/init.d/dbus stop Shutting down D-Bus daemon..done + exit 1 ... unmounting sys ... unmounting proc ... unmounting pts [locks-and-latches] Releasing all the locks [locks-and-latches] All the locks released Publishing Javadoc Archiving artifacts Build wasn't successful, skipping saikuro coverage report Publishing rails stats report... [workspace] $ rake --silent stats Failed to send e-mail to Stefan Schubert because no e-mail address is known, and no default e-mail domain is configured -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 2

[yast-commit] r60442 - /trunk/qt-pkg/src/YQPackageSelector.cc
by tgoettlicher＠svn.opensuse.org 19 Jan '10

19 Jan '10

Author: tgoettlicher Date: Tue Jan 19 10:54:31 2010 New Revision: 60442 URL: http://svn.opensuse.org/viewcvs/yast?rev=60442&view=rev Log: regexp fine tuning Modified: trunk/qt-pkg/src/YQPackageSelector.cc Modified: trunk/qt-pkg/src/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPackageSelector.cc?… ============================================================================== --- trunk/qt-pkg/src/YQPackageSelector.cc (original) +++ trunk/qt-pkg/src/YQPackageSelector.cc Tue Jan 19 10:54:31 2010 @@ -783,7 +783,7 @@ this, SLOT( pkgExcludeDebugChanged( bool ) ), Qt::Key_F8 ); _showDebugAction->setCheckable(true); _showDebugAction->setChecked(true); - _excludeDebugInfoPkgs = new YQPkgObjList::ExcludeRule( _pkgList, QRegExp( ".*-(debuginfo|debugsource)(-\\d+bit)?$" ), _pkgList->nameCol() ); + _excludeDebugInfoPkgs = new YQPkgObjList::ExcludeRule( _pkgList, QRegExp( ".*-(debuginfo|debugsource)(-32bit)?$" ), _pkgList->nameCol() ); YUI_CHECK_NEW( _excludeDebugInfoPkgs ); _excludeDebugInfoPkgs->enable( false ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60441 - /tags/stable-2_19_0/nfs-client/
by aschnell＠svn.opensuse.org 19 Jan '10

19 Jan '10

Author: aschnell Date: Tue Jan 19 10:29:17 2010 New Revision: 60441 URL: http://svn.opensuse.org/viewcvs/yast?rev=60441&view=rev Log: Created tag stable-2_19_0 for nfs-client Added: tags/stable-2_19_0/nfs-client/ - copied from r60440, trunk/nfs-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] Build failed in Hudson: webyast-service-11.1-i586 #673
by Hudson Integration Service 18 Jan '10

18 Jan '10

See http://yast.suse.de:3334/job/webyast-service-11.1-i586/673/changes Changes: [Josef Reidinger] don't silently fail if granting permissions fail (bnc#554946) [Josef Reidinger] don't pass if granting permissions fail (bnc#554946) [Josef Reidinger] allow synchronize action only if ntp is available (bnc#552071) [Josef Reidinger] adapt policy file [Josef Reidinger] fix definition of available call [Josef Reidinger] fix passing hardware clock settings to ntp (bnc#556467) [Josef Reidinger] Merge branch 'fix_bnc556467' [Josef Reidinger] Merge branch 'fix_bnc554946' [Josef Reidinger] Merge branch 'fix_bnc552071' Conflicts: plugins/ntp/app/models/ntp.rb ------------------------------------------ [...truncated 2746 lines...] www/config/resources/licenses/SLES-11/license.de.txt www/config/resources/licenses/SLES-11/license.txt www/config/resources/licenses/SLES-11/license.ru.txt www/config/resources/licenses/SLES-11/license.ja.txt www/config/resources/licenses/SLES-11/license.pt_BR.txt www/config/resources/licenses/SLES-11/license.ko.txt www/config/resources/licenses/SLES-11/license.sv.txt www/config/resources/licenses/SLES-11/license.zh_CN.txt www/config/resources/licenses/SLES-11/license.it.txt www/config/resources/licenses/SLES-11/license.fr.txt www/config/resources/licenses/SLES-11/license.zh_TW.txt www/config/resources/licenses/SLES-11/license.ar.txt www/config/resources/licenses/openSUSE-11.1/ www/config/resources/licenses/openSUSE-11.1/license.es.txt www/config/resources/licenses/openSUSE-11.1/license.de.txt www/config/resources/licenses/openSUSE-11.1/license.txt www/config/resources/licenses/openSUSE-11.1/license.ja.txt www/config/resources/licenses/openSUSE-11.1/license.pt_BR.txt www/config/resources/licenses/openSUSE-11.1/no-acceptance-needed www/config/resources/licenses/openSUSE-11.1/license.zh_CN.txt www/config/resources/licenses/openSUSE-11.1/license.it.txt www/config/resources/licenses/openSUSE-11.1/license.fr.txt www/config/resources/licenses/openSUSE-11.1/license.zh_TW.txt www/app/ www/app/models/ www/app/models/license.rb www/app/controllers/ www/app/controllers/eulas_controller.rb www/app/views/ www/app/views/eulas/ www/app/views/eulas/show.html.erb www/app/views/eulas/index.html.erb www/COPYING www/install.rb www/doc/ www/doc/README_FOR_APP www/doc/eulas_example.yml www/Rakefile www/init.rb www/uninstall.rb cd - mkdir -p package mkdir -p package/www/. rm -f package/www/./.gitignore ln ./.gitignore package/www/./.gitignore rm -f package/www/./COPYING ln ./COPYING package/www/./COPYING rm -f package/www/./README ln ./README package/www/./README rm -f package/www/./Rakefile ln ./Rakefile package/www/./Rakefile mkdir -p package/www/./app/controllers rm -f package/www/./app/controllers/ntp_controller.rb ln ./app/controllers/ntp_controller.rb package/www/./app/controllers/ntp_controller.rb mkdir -p package/www/./app/models rm -f package/www/./app/models/ntp.rb ln ./app/models/ntp.rb package/www/./app/models/ntp.rb mkdir -p package/www/./config rm -f package/www/./config/rails_parent.rb ln ./config/rails_parent.rb package/www/./config/rails_parent.rb mkdir -p package/www/./config/resources rm -f package/www/./config/resources/ntp.yml ln ./config/resources/ntp.yml package/www/./config/resources/ntp.yml rm -f package/www/./init.rb ln ./init.rb package/www/./init.rb rm -f package/www/./install.rb ln ./install.rb package/www/./install.rb mkdir -p package/www/./restdoc rm -f package/www/./restdoc/api.txt ln ./restdoc/api.txt package/www/./restdoc/api.txt rm -f package/www/./restdoc/ntp.xml ln ./restdoc/ntp.xml package/www/./restdoc/ntp.xml rm -f package/www/./restdoc/sync_request.xml ln ./restdoc/sync_request.xml package/www/./restdoc/sync_request.xml rm -f package/www/./uninstall.rb ln ./uninstall.rb package/www/./uninstall.rb cd package tar jcvf www.tar.bz2 www (in /src/rest-service/plugins/ntp) www/ www/README www/config/ www/config/rails_parent.rb www/config/resources/ www/config/resources/ntp.yml www/.gitignore www/app/ www/app/models/ www/app/models/ntp.rb www/app/controllers/ www/app/controllers/ntp_controller.rb www/COPYING www/install.rb www/Rakefile www/init.rb www/uninstall.rb www/restdoc/ www/restdoc/ntp.xml www/restdoc/api.txt www/restdoc/sync_request.xml cd - mkdir -p package mkdir -p package/www/. rm -f package/www/./.gitignore ln ./.gitignore package/www/./.gitignore rm -f package/www/./COPYING ln ./COPYING package/www/./COPYING rm -f package/www/./README ln ./README package/www/./README rm -f package/www/./Rakefile ln ./Rakefile package/www/./Rakefile mkdir -p package/www/./app/controllers rm -f package/www/./app/controllers/logs_controller.rb ln ./app/controllers/logs_controller.rb package/www/./app/controllers/logs_controller.rb rm -f package/www/./app/controllers/metrics_controller.rb ln ./app/controllers/metrics_controller.rb package/www/./app/controllers/metrics_controller.rb rm -f package/www/./app/controllers/status_controller.rb ln ./app/controllers/status_controller.rb package/www/./app/controllers/status_controller.rb mkdir -p package/www/./app/models rm -f package/www/./app/models/metric.rb ln ./app/models/metric.rb package/www/./app/models/metric.rb mkdir -p package/www/./app/views/status rm -f package/www/./app/views/status/show.html.erb ln ./app/views/status/show.html.erb package/www/./app/views/status/show.html.erb rm -f package/www/./app/views/status/show.xml.erb ln ./app/views/status/show.xml.erb package/www/./app/views/status/show.xml.erb mkdir -p package/www/./config rm -f package/www/./config/rails_parent.rb ln ./config/rails_parent.rb package/www/./config/rails_parent.rb mkdir -p package/www/./config/resources rm -f package/www/./config/resources/logs.yml ln ./config/resources/logs.yml package/www/./config/resources/logs.yml rm -f package/www/./config/resources/metrics.yml ln ./config/resources/metrics.yml package/www/./config/resources/metrics.yml rm -f package/www/./config/resources/status.yml ln ./config/resources/status.yml package/www/./config/resources/status.yml mkdir -p package/www/./doc rm -f package/www/./doc/README_FOR_APP ln ./doc/README_FOR_APP package/www/./doc/README_FOR_APP rm -f package/www/./doc/logs.yml ln ./doc/logs.yml package/www/./doc/logs.yml mkdir -p package/www/./lib rm -f package/www/./lib/status.rb ln ./lib/status.rb package/www/./lib/status.rb mkdir -p package/www/./tasks rm -f package/www/./tasks/status_tasks.rake ln ./tasks/status_tasks.rake package/www/./tasks/status_tasks.rake cd package tar jcvf www.tar.bz2 www (in /src/rest-service/plugins/status) www/ www/README www/lib/ www/lib/status.rb www/config/ www/config/rails_parent.rb www/config/resources/ www/config/resources/logs.yml www/config/resources/metrics.yml www/config/resources/status.yml www/.gitignore www/app/ www/app/models/ www/app/models/metric.rb www/app/controllers/ www/app/controllers/logs_controller.rb www/app/controllers/metrics_controller.rb www/app/controllers/status_controller.rb www/app/views/ www/app/views/status/ www/app/views/status/show.xml.erb www/app/views/status/show.html.erb www/COPYING www/tasks/ www/tasks/status_tasks.rake www/doc/ www/doc/logs.yml www/doc/README_FOR_APP www/Rakefile cd - ++ find ./plugins -name package ++ grep -v 'rpam\|ruby-polkit' + for rpmdir in '${SUBDIR}/package' '`find ./plugins -name package | grep -v "rpam\|ruby-polkit"`' ++ dirname webservice/package + pkgdir=webservice ++ basename webservice + pkgname=webservice + destination=/artifacts/webyast/rest-service/package/yast2-webservice-webservice + mkdir -p /artifacts/webyast/rest-service/package/yast2-webservice-webservice + rm -rf '/artifacts/webyast/rest-service/package/yast2-webservice-webservice/*' + rm -rf webservice/package/www + cp -r webservice/package/cleanurl-v5.lua webservice/package/grantwebyastrights webservice/package/lighttpd.conf webservice/package/modules.conf webservice/package/org.opensuse.yast.permissions.policy webservice/package/rails.include webservice/package/webyast webservice/package/www.tar.bz2 webservice/package/yast.conf webservice/package/yast2-webservice.changes webservice/package/yast2-webservice.spec webservice/package/yast_user_roles webservice/package/yastws /artifacts/webyast/rest-service/package/yast2-webservice-webservice + pushd webservice/package /src/rest-service/webservice/package /src/rest-service + case "${pkgdir}" in + build_install_spec + build_spec + rpm --rebuilddb + mkdir -p /tmp + mkdir -p /artifacts/webyast/rest-service/rpms + mkdir -p /tmp/rpmbuild + mkdir -p /tmp/buildroot + cat + check_exit 0 + '[' -z 0 ']' + MYEXIT=0 + '[' 0 == 0 ']' + echo 'exit code: 0 ... good, lets continue' exit code: 0 ... good, lets continue + return + /usr/bin/rpmbuild -bb --define 'run_testsuite 1' yast2-webservice.spec error: Failed build dependencies: rubygem-rails-2_3 = 2.3.4 is needed by yast2-webservice-0.0.19-0.noarch + check_exit 1 + '[' -z 1 ']' + MYEXIT=1 + '[' 1 == 0 ']' + footer_and_exit 1 + '[' -z 1 ']' + MYEXIT=1 + '[' 1 == 0 ']' + ascii_failed + cat ( ) ( ) ( ) _ ) ( \_ _(_\ \)__ (____\___)) build failed + echo 'stopping dbus..' stopping dbus.. + /etc/init.d/dbus stop Shutting down D-Bus daemon..done + exit 1 ... unmounting sys ... unmounting proc ... unmounting pts umount: /data/hudson/HUDSON-CHROOT/webyast-11.1-i586/dev/pts: not mounted Can't unmount devpts /data/hudson/HUDSON-CHROOT/webyast-11.1-i586/dev/pts [locks-and-latches] Releasing all the locks [locks-and-latches] All the locks released Archiving artifacts Build wasn't successful, skipping saikuro coverage report Publishing rails stats report... [workspace] $ rake --silent stats -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 41

[yast-commit] Build failed in Hudson: webyast-service-head-i586 #635
by Hudson Integration Service 18 Jan '10

18 Jan '10

See http://yast.suse.de:3334/job/webyast-service-head-i586/635/changes Changes: [Josef Reidinger] use alias_method instead of alias for better error handling and more ruby like style instead of built-in alias ------------------------------------------ A SCM change trigger started this job Checkout [workspace] $ git fetch Checking out origin/master [workspace] $ git checkout -f origin/master Previous HEAD position was 0aefaf4... update spec file after merging branches HEAD is now at f1b3429... use alias_method instead of alias for better error handling and more ruby like style instead of built-in alias [workspace] $ git rev-parse origin/master [workspace] $ git log --numstat -M --summary --pretty=raw 0aefaf4f696e2200be2a720c6b37fd9c10a8ae87..f1b34295ec11570903b6ff0ad65adcde216fe5b1 [locks-and-latches] Checking to see if we really have the locks [locks-and-latches] Have all the locks, build can start [workspace] $ /bin/sh -xe /tmp/hudson8593913499965108117.sh + sudo -E /data/hudson/bin/build-chroot.sh webyast rest-service head-i586 SCRIPT ID: I am /data/hudson/bin/build-chroot.sh at http://yast.suse.de:3334/job/webyast-service-head-i586/ws/ ..copying source code http://yast.suse.de:3334/job/webyast-service-head-i586/ws/* /data/hudson/HUDSON-CHROOT/webyast-head-i586/src/rest-service ..copying make script to /data/hudson/HUDSON-CHROOT/webyast-head-i586/root ... mounting sys ... mounting proc ... mounting pts mount: special device none does not exist Can't mount devpts /data/hudson/HUDSON-CHROOT/webyast-head-i586/dev/pts ... switching to chroot and starting build SCRIPT ID: I am /root/make-zypp.sh at / hostname: Host name lookup failure /root/make-zypp.sh: line 83: icecc: command not found ??,????????'????????,????,????????'????????,????,????????'????????,????,????????'????????,????,????????'????????,?? + echo webyast-rest-service webyast-rest-service + case "${MODULE}" in + SUBDIR=webservice + cd /src/rest-service + echo /src/rest-service /src/rest-service + ls INSTALL Makefile README Rakefile doc index.html.template plugins policy-tools rpam ruby-polkit webservice webservice-tasks + [[ rest-service == \r\e\s\t\-\s\e\r\v\i\c\e ]] + echo 'start dbus..' start dbus.. + /etc/init.d/dbus start /root/make-zypp.sh: line 583: /etc/init.d/dbus: No such file or directory ++ error_exit 127 ++ echo 'ERROR: detected exit code 127' ERROR: detected exit code 127 ++ footer_and_exit 1 ++ '[' -z 1 ']' ++ MYEXIT=1 ++ '[' 1 == 0 ']' ++ ascii_failed ++ cat ( ) ( ) ( ) _ ) ( \_ _(_\ \)__ (____\___)) build failed ++ echo 'stopping dbus..' stopping dbus.. ++ /etc/init.d/dbus stop /root/make-zypp.sh: line 110: /etc/init.d/dbus: No such file or directory ++ exit 1 ... unmounting sys ... unmounting proc ... unmounting pts umount: /data/hudson/HUDSON-CHROOT/webyast-head-i586/dev/pts: not mounted Can't unmount devpts /data/hudson/HUDSON-CHROOT/webyast-head-i586/dev/pts [locks-and-latches] Releasing all the locks [locks-and-latches] All the locks released Publishing Javadoc Archiving artifacts Build wasn't successful, skipping saikuro coverage report Publishing rails stats report... [workspace] $ rake --silent stats -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 32

[yast-commit] r60440 - in /trunk/storage: package/yast2-storage.changes storage/src/include/ep-nfs.ycp storage/src/modules/FileSystems.ycp storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 18 Jan '10

18 Jan '10

Author: aschnell Date: Mon Jan 18 18:11:31 2010 New Revision: 60440 URL: http://svn.opensuse.org/viewcvs/yast?rev=60440&view=rev Log: - added NFS4 support (fate #305171) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-nfs.ycp trunk/storage/storage/src/modules/FileSystems.ycp trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Jan 18 18:11:31 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jan 18 17:50:59 CET 2010 - aschnell(a)suse.de + +- added NFS4 support (fate #305171) + +------------------------------------------------------------------- Mon Jan 18 11:53:51 CET 2010 - aschnell(a)suse.de - show textual error messages during commit (bnc #546012) Modified: trunk/storage/storage/src/include/ep-nfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-n… ============================================================================== --- trunk/storage/storage/src/include/ep-nfs.ycp (original) +++ trunk/storage/storage/src/include/ep-nfs.ycp Mon Jan 18 18:11:31 2010 @@ -113,9 +113,13 @@ target_map = Storage::GetTargetMap(); list<map> nfs_list = target_map["/dev/nfs", "partitions"]:[]; - integer sizeK = Storage::CheckNfsVolume (entry["device"]:"", entry["fstopt"]:""); + string device = entry["device"]:""; + string mount = entry["mount"]:""; + string opts = entry["fstopt"]:""; + boolean nfs4 = entry["vfstype"]:"nfs" == "nfs4"; - if ( sizeK <= 0) + integer sizeK = Storage::CheckNfsVolume(device, opts, nfs4); + if (sizeK <= 0) { //rollback only if user does not want to save (#450060) //the mount might fail later if the errors are not corrected, but the user has been warned @@ -130,7 +134,7 @@ //real size - Perl then wants to die in addNfsVolume call sizeK = 0; } - Storage::AddNfsVolume( entry["device"]:"", entry["fstopt"]:"", sizeK, entry["mount"]:""); + Storage::AddNfsVolume(device, opts, sizeK, mount, nfs4); } void EditShare( map <string, any> entry ) @@ -156,6 +160,7 @@ { m["fstopt"] = entry["fstopt"]:""; m["mount"] = entry["mount"]:""; + m["vfstype"] = entry["used_fs"]:`nfs == `nfs ? "nfs" : "nfs4"; } return m; }); @@ -210,8 +215,6 @@ //a hack - we don't have overviews for nfs dirs, so let's switch to the main panel ... CreateNfsMainPanel( user_data ); UI::ChangeWidget(`tree, `CurrentItem, `nfs ); - } - - } +} Modified: trunk/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/File… ============================================================================== --- trunk/storage/storage/src/modules/FileSystems.ycp (original) +++ trunk/storage/storage/src/modules/FileSystems.ycp Mon Jan 18 18:11:31 2010 @@ -44,6 +44,7 @@ LibStorage::NTFS() : `ntfs, LibStorage::SWAP() : `swap, LibStorage::NFS() : `nfs, + LibStorage::NFS4() : `nfs4, LibStorage::FSNONE() : `none ] ]; @@ -959,14 +960,18 @@ } } - global define string GetName( symbol used_fs, string defaultv )``{ + + global string GetName( symbol used_fs, string defaultv ) + { map<symbol,any> fsmap = GetFsMap( used_fs); string ret = fsmap[`name]:""; if ( ret == "" && used_fs == `ntfs ) ret = "NTFS"; // obsolete? (included in RealFileSystems) - if ( ret == "" && used_fs == `nfs ) ret = "NFS"; + if ( ret == "" && used_fs == `nfs ) ret = "NFS"; + if ( ret == "" && used_fs == `nfs4 ) ret = "NFS4"; if ( ret == "" ) ret = defaultv; return ret; - } + } + global define integer GetFsid( symbol used_fs )``{ map<symbol,any> fsmap = GetFsMap( used_fs); Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Mon Jan 18 18:11:31 2010 @@ -2599,27 +2599,25 @@ return( ret==0 ); } -global boolean AddNfsVolume( string nfsdev, string opts, integer sz, string mp ) +global boolean AddNfsVolume( string nfsdev, string opts, integer sz, string mp, boolean nfs4 ) { - y2milestone( "AddNfsVolume dev:%1 opts:%2 size:%3 mp:%4", nfsdev, opts, - sz, mp ); + y2milestone("AddNfsVolume dev:%1 opts:%2 size:%3 mp:%4 nfs4:%5", nfsdev, opts, sz, mp, nfs4); integer ret = 0; string dummy = ""; - ret = LibStorage::StorageInterface::addNfsDevice( sint, nfsdev, opts, sz, mp ); + ret = LibStorage::StorageInterface::addNfsDevice(sint, nfsdev, opts, sz, mp, nfs4); if( ret<0 ) y2error( "AddNfsVolume sint ret:%1", ret ); UpdateTargetMapDisk( "/dev/nfs" ); return( ret==0 ); } -global integer CheckNfsVolume( string nfsdev, string opts ) +global integer CheckNfsVolume(string nfsdev, string opts, boolean nfs4) { - y2milestone( "CheckNfsVolume dev:%1 opts:%2", nfsdev, opts ); + y2milestone("CheckNfsVolume dev:%1 opts:%2 nfs4:%3", nfsdev, opts, nfs4); integer ret = 0; integer sz = 0; string dummy = ""; - ret = LibStorage::StorageInterface::checkNfsDevice( sint, nfsdev, opts, - sz ); + ret = LibStorage::StorageInterface::checkNfsDevice(sint, nfsdev, opts, nfs4, sz); if( ret<0 ) y2error( "CheckNfsVolume sint ret:%1", ret ); else @@ -2973,8 +2971,8 @@ } else if( ctype == `CT_NFS ) { - ret = Storage::AddNfsVolume( p["device"]:"", p["fstopt"]:"", - p["size_k"]:0, p["mount"]:"" ); + ret = Storage::AddNfsVolume( p["device"]:"", p["fstopt"]:"", p["size_k"]:0, + p["mount"]:"", p["used_fs"]:`nfs == `nfs4 ); } y2milestone( "CreateAny ret:%1", ret ); return( ret ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60439 - in /trunk/nfs-client: VERSION package/yast2-nfs-client.changes src/nfs-client4part.ycp
by aschnell＠svn.opensuse.org 18 Jan '10

18 Jan '10

Author: aschnell Date: Mon Jan 18 18:11:08 2010 New Revision: 60439 URL: http://svn.opensuse.org/viewcvs/yast?rev=60439&view=rev Log: - adapted to NFS4 support in yast2-storage Modified: trunk/nfs-client/VERSION trunk/nfs-client/package/yast2-nfs-client.changes trunk/nfs-client/src/nfs-client4part.ycp Modified: trunk/nfs-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/VERSION?rev=60439&r1=… ============================================================================== --- trunk/nfs-client/VERSION (original) +++ trunk/nfs-client/VERSION Mon Jan 18 18:11:08 2010 @@ -1 +1 @@ -2.18.0 +2.19.0 Modified: trunk/nfs-client/package/yast2-nfs-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/package/yast2-nfs-cli… ============================================================================== --- trunk/nfs-client/package/yast2-nfs-client.changes (original) +++ trunk/nfs-client/package/yast2-nfs-client.changes Mon Jan 18 18:11:08 2010 @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 18 18:07:08 CET 2010 - aschnell(a)suse.de + +- adapted to NFS4 support in yast2-storage +- 2.19.0 + ------------------------------------------------------------------ Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz Modified: trunk/nfs-client/src/nfs-client4part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/nfs-client4part.y… ============================================================================== --- trunk/nfs-client/src/nfs-client4part.ycp (original) +++ trunk/nfs-client/src/nfs-client4part.ycp Mon Jan 18 18:11:08 2010 @@ -35,7 +35,8 @@ ret = $[ "device" : entry["spec"]:"", "mount" : entry["file"]:"", - "fstopt" : entry["mntops"]:"" + "fstopt" : entry["mntops"]:"", + "vfstype" : entry["vfstype"]:"nfs" ]; if (haskey ( entry, "old" )) ret = add(ret, "old_device" , entry["old"]:"" ); @@ -54,12 +55,10 @@ list <map <string, any> > shares = ( list < map <string, any> >) param["shares"]:[]; Nfs::nfs_entries = maplist( map <string, any> entry, shares, { - return ( $[ "spec" : entry["device"]:"", "file" : entry["mount"]:"", - //FIXME:: nfsv4 - "vfstype" : "nfs", + "vfstype" : entry["used_fs"]:`nfs == `nfs ? "nfs" : "nfs4", "mntops": entry["fstopt"]:"" ]); }); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60438 - /tags/branch-Code-11-2_17_39_2/pkg-bindings/
by lslezak＠svn.opensuse.org 18 Jan '10

18 Jan '10

Author: lslezak Date: Mon Jan 18 16:32:48 2010 New Revision: 60438 URL: http://svn.opensuse.org/viewcvs/yast?rev=60438&view=rev Log: Created tag branch-Code-11-2_17_39_2 for pkg-bindings Added: tags/branch-Code-11-2_17_39_2/pkg-bindings/ - copied from r60437, branches/SuSE-Code-11-Branch/pkg-bindings/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60437 - /tags/branch-Code-11-2_17_39_2/
by lslezak＠svn.opensuse.org 18 Jan '10

18 Jan '10

Author: lslezak Date: Mon Jan 18 16:32:46 2010 New Revision: 60437 URL: http://svn.opensuse.org/viewcvs/yast?rev=60437&view=rev Log: Created tag branch-Code-11-2_17_39_2 Added: tags/branch-Code-11-2_17_39_2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60436 - in /branches/SuSE-Code-11-Branch/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/Resolvable_Properties.cc
by lslezak＠svn.opensuse.org 18 Jan '10

18 Jan '10

Author: lslezak Date: Mon Jan 18 16:32:22 2010 New Revision: 60436 URL: http://svn.opensuse.org/viewcvs/yast?rev=60436&view=rev Log: - Pkg::ResolvableProperties() - return 'product' value from <upgrade> section (bnc#571621) - 2.17.39.2 Modified: branches/SuSE-Code-11-Branch/pkg-bindings/VERSION branches/SuSE-Code-11-Branch/pkg-bindings/package/yast2-pkg-bindings.changes branches/SuSE-Code-11-Branch/pkg-bindings/src/Resolvable_Properties.cc Modified: branches/SuSE-Code-11-Branch/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pkg-bindi… ============================================================================== --- branches/SuSE-Code-11-Branch/pkg-bindings/VERSION (original) +++ branches/SuSE-Code-11-Branch/pkg-bindings/VERSION Mon Jan 18 16:32:22 2010 @@ -1 +1 @@ -2.17.39.1 +2.17.39.2 Modified: branches/SuSE-Code-11-Branch/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pkg-bindi… ============================================================================== --- branches/SuSE-Code-11-Branch/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ branches/SuSE-Code-11-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Mon Jan 18 16:32:22 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jan 18 14:40:21 UTC 2010 - lslezak(a)suse.cz + +- Pkg::ResolvableProperties() - return 'product' value from + <upgrade> section (bnc#571621) +- 2.17.39.2 + +------------------------------------------------------------------- Fri Jan 8 13:00:43 UTC 2010 - lslezak(a)suse.cz - Pkg::ResolvableProperties() - return product file and it's Modified: branches/SuSE-Code-11-Branch/pkg-bindings/src/Resolvable_Properties.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pkg-bindi… ============================================================================== --- branches/SuSE-Code-11-Branch/pkg-bindings/src/Resolvable_Properties.cc (original) +++ branches/SuSE-Code-11-Branch/pkg-bindings/src/Resolvable_Properties.cc Mon Jan 18 16:32:22 2010 @@ -401,6 +401,7 @@ upgrades->add(YCPString("repository"), YCPString(upgrade.repository())); upgrades->add(YCPString("notify"), YCPBoolean(upgrade.notify())); upgrades->add(YCPString("status"), YCPString(upgrade.status())); + upgrades->add(YCPString("product"), YCPString(upgrade.product())); upgrade_list->add(upgrades); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60435 - in /trunk/pkg-bindings: package/yast2-pkg-bindings.changes src/Resolvable_Properties.cc
by lslezak＠svn.opensuse.org 18 Jan '10

18 Jan '10

Author: lslezak Date: Mon Jan 18 16:31:01 2010 New Revision: 60435 URL: http://svn.opensuse.org/viewcvs/yast?rev=60435&view=rev Log: - Pkg::ResolvableProperties() - return 'product' value from <upgrade> section (bnc#571621) Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Resolvable_Properties.cc Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Mon Jan 18 16:31:01 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 18 14:40:21 UTC 2010 - lslezak(a)suse.cz + +- Pkg::ResolvableProperties() - return 'product' value from + <upgrade> section (bnc#571621) + +------------------------------------------------------------------- Wed Jan 6 17:50:26 UTC 2010 - lslezak(a)suse.cz - Pkg::ResolvableProperties() - always return "transact_by" flag, Modified: trunk/pkg-bindings/src/Resolvable_Properties.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Resolvable_Prop… ============================================================================== --- trunk/pkg-bindings/src/Resolvable_Properties.cc (original) +++ trunk/pkg-bindings/src/Resolvable_Properties.cc Mon Jan 18 16:31:01 2010 @@ -401,6 +401,7 @@ upgrades->add(YCPString("repository"), YCPString(upgrade.repository())); upgrades->add(YCPString("notify"), YCPBoolean(upgrade.notify())); upgrades->add(YCPString("status"), YCPString(upgrade.status())); + upgrades->add(YCPString("product"), YCPString(upgrade.product())); upgrade_list->add(upgrades); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60434 - /tags/branch-Code-11-SP1-2_17_44/pkg-bindings/
by lslezak＠svn.opensuse.org 18 Jan '10

18 Jan '10

Author: lslezak Date: Mon Jan 18 15:48:26 2010 New Revision: 60434 URL: http://svn.opensuse.org/viewcvs/yast?rev=60434&view=rev Log: Created tag branch-Code-11-SP1-2_17_44 for pkg-bindings Added: tags/branch-Code-11-SP1-2_17_44/pkg-bindings/ (props changed) - copied from r60433, branches/SuSE-Code-11-SP1-Branch/pkg-bindings/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60433 - /tags/branch-Code-11-SP1-2_17_44/
by lslezak＠svn.opensuse.org 18 Jan '10

18 Jan '10

Author: lslezak Date: Mon Jan 18 15:48:21 2010 New Revision: 60433 URL: http://svn.opensuse.org/viewcvs/yast?rev=60433&view=rev Log: Created tag branch-Code-11-SP1-2_17_44 Added: tags/branch-Code-11-SP1-2_17_44/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60432 - in /branches/SuSE-Code-11-SP1-Branch/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/Resolvable_Properties.cc
by lslezak＠svn.opensuse.org 18 Jan '10

18 Jan '10

Author: lslezak Date: Mon Jan 18 15:47:37 2010 New Revision: 60432 URL: http://svn.opensuse.org/viewcvs/yast?rev=60432&view=rev Log: - Pkg::ResolvableProperties() - return 'product' value from <upgrade> section (bnc#571621) - 2.17.44 Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Resolvable_Properties.cc Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION Mon Jan 18 15:47:37 2010 @@ -1 +1 @@ -2.17.43 +2.17.44 Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Mon Jan 18 15:47:37 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jan 18 14:40:21 UTC 2010 - lslezak(a)suse.cz + +- Pkg::ResolvableProperties() - return 'product' value from + <upgrade> section (bnc#571621) +- 2.17.44 + +------------------------------------------------------------------- Fri Jan 8 13:00:43 UTC 2010 - lslezak(a)suse.cz - Pkg::ResolvableProperties() - return product file and it's Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Resolvable_Properties.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Resolvable_Properties.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Resolvable_Properties.cc Mon Jan 18 15:47:37 2010 @@ -401,6 +401,7 @@ upgrades->add(YCPString("repository"), YCPString(upgrade.repository())); upgrades->add(YCPString("notify"), YCPBoolean(upgrade.notify())); upgrades->add(YCPString("status"), YCPString(upgrade.status())); + upgrades->add(YCPString("product"), YCPString(upgrade.product())); upgrade_list->add(upgrades); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60431 - /tags/stable-2_19_5/yast2/
by jsuchome＠svn.opensuse.org 18 Jan '10

18 Jan '10

Author: jsuchome Date: Mon Jan 18 14:47:52 2010 New Revision: 60431 URL: http://svn.opensuse.org/viewcvs/yast?rev=60431&view=rev Log: Created tag stable-2_19_5 for yast2 Added: tags/stable-2_19_5/yast2/ - copied from r60430, trunk/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60430 - in /trunk/yast2: VERSION library/runlevel/src/YaPI/SERVICES.pm package/yast2.changes
by jsuchome＠svn.opensuse.org 18 Jan '10

18 Jan '10

Author: jsuchome Date: Mon Jan 18 14:47:40 2010 New Revision: 60430 URL: http://svn.opensuse.org/viewcvs/yast?rev=60430&view=rev Log: - SERVICES.pm: read descriptions (bnc#570298); get single service status from the Read function (bnc#570968) - 2.19.5 Modified: trunk/yast2/VERSION trunk/yast2/library/runlevel/src/YaPI/SERVICES.pm trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=60430&r1=60429… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Mon Jan 18 14:47:40 2010 @@ -1 +1 @@ -2.19.4 +2.19.5 Modified: trunk/yast2/library/runlevel/src/YaPI/SERVICES.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/runlevel/src/YaPI/… ============================================================================== --- trunk/yast2/library/runlevel/src/YaPI/SERVICES.pm (original) +++ trunk/yast2/library/runlevel/src/YaPI/SERVICES.pm Mon Jan 18 14:47:40 2010 @@ -116,9 +116,11 @@ # Return the map of services enabled in given runlevel # Parameter is an argument map with possible keys: # "runlevel" : integer -# "read_status" : if present, service status will be queried -# "custom" : if present, custom services (defined in config file) will be read -# returns array of hashes +# "read_status" : if true, service status will be queried +# "custom" : if true, custom services (defined in config file) will be read +# "description" : if true, read the description of each service +# "service" : if defined, the status of this given service will be returned +# @returns array of hashes BEGIN{$TYPEINFO{Read} = ["function", ["list", [ "map", "string", "any"]], ["map", "string", "any"]]; @@ -131,6 +133,21 @@ my $runlevel = 5; $runlevel = $args->{"runlevel"} if defined $args->{"runlevel"}; + # only read status of one service if the name was given + if ($args->{"service"} || "") { + my $exec = $self->Execute ({ + "name" => $args->{"service"} || "", + "action" => "status", + "custom" => $args->{"custom"} || 0 + }); + my $s = { + "name" => $args->{"service"} || "", + "status" => $exec->{"exit"} || 0 + }; + push @ret, $s; + return \@ret; + } + if ($args->{"custom"} || 0) { return read_custom_services ($args); } @@ -140,6 +157,11 @@ "name" => $name }; $s->{"status"} = Service->Status ($name) if ($args->{"read_status"} || 0); + if (($args->{"description"} || 0) || ($args->{"shortdescription"} || 0)) { + my $info = Service->Info ($name); + $s->{"description"} = ($info->{"description"} || "") if $args->{"description"} || 0; + $s->{"shortdescription"}= ($info->{"shortdescription"} || "") if $args->{"shortdescription"} || 0; + } push @ret, $s; } return \@ret; Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Mon Jan 18 14:47:40 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jan 18 14:36:37 CET 2010 - jsuchome(a)suse.cz + +- SERVICES.pm: read descriptions (bnc#570298); get single service + status from the Read function (bnc#570968) +- 2.19.5 + +------------------------------------------------------------------- Fri Jan 15 11:44:39 CET 2010 - aschnell(a)suse.de - extended Report and Popup module (needed for fate #304500) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60429 - /tags/branch-Code-11-SP1-2_17_83/yast2/
by jsuchome＠svn.opensuse.org 18 Jan '10

18 Jan '10

Author: jsuchome Date: Mon Jan 18 14:47:30 2010 New Revision: 60429 URL: http://svn.opensuse.org/viewcvs/yast?rev=60429&view=rev Log: Created tag branch-Code-11-SP1-2_17_83 for yast2 Added: tags/branch-Code-11-SP1-2_17_83/yast2/ (props changed) - copied from r60428, branches/SuSE-Code-11-SP1-Branch/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60428 - in /branches/SuSE-Code-11-SP1-Branch/yast2: VERSION library/runlevel/src/YaPI/SERVICES.pm package/yast2.changes
by jsuchome＠svn.opensuse.org 18 Jan '10

18 Jan '10

Author: jsuchome Date: Mon Jan 18 14:47:23 2010 New Revision: 60428 URL: http://svn.opensuse.org/viewcvs/yast?rev=60428&view=rev Log: - SERVICES.pm: read descriptions (bnc#570298); get single service status from the Read function (bnc#570968) - 2.17.83 Modified: branches/SuSE-Code-11-SP1-Branch/yast2/VERSION branches/SuSE-Code-11-SP1-Branch/yast2/library/runlevel/src/YaPI/SERVICES.pm branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes Modified: branches/SuSE-Code-11-SP1-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/VERSION Mon Jan 18 14:47:23 2010 @@ -1 +1 @@ -2.17.82 +2.17.83 Modified: branches/SuSE-Code-11-SP1-Branch/yast2/library/runlevel/src/YaPI/SERVICES.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/library/runlevel/src/YaPI/SERVICES.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/library/runlevel/src/YaPI/SERVICES.pm Mon Jan 18 14:47:23 2010 @@ -116,9 +116,11 @@ # Return the map of services enabled in given runlevel # Parameter is an argument map with possible keys: # "runlevel" : integer -# "read_status" : if present, service status will be queried -# "custom" : if present, custom services (defined in config file) will be read -# returns array of hashes +# "read_status" : if true, service status will be queried +# "custom" : if true, custom services (defined in config file) will be read +# "description" : if true, read the description of each service +# "service" : if defined, the status of this given service will be returned +# @returns array of hashes BEGIN{$TYPEINFO{Read} = ["function", ["list", [ "map", "string", "any"]], ["map", "string", "any"]]; @@ -131,6 +133,21 @@ my $runlevel = 5; $runlevel = $args->{"runlevel"} if defined $args->{"runlevel"}; + # only read status of one service if the name was given + if ($args->{"service"} || "") { + my $exec = $self->Execute ({ + "name" => $args->{"service"} || "", + "action" => "status", + "custom" => $args->{"custom"} || 0 + }); + my $s = { + "name" => $args->{"service"} || "", + "status" => $exec->{"exit"} || 0 + }; + push @ret, $s; + return \@ret; + } + if ($args->{"custom"} || 0) { return read_custom_services ($args); } @@ -140,6 +157,11 @@ "name" => $name }; $s->{"status"} = Service->Status ($name) if ($args->{"read_status"} || 0); + if (($args->{"description"} || 0) || ($args->{"shortdescription"} || 0)) { + my $info = Service->Info ($name); + $s->{"description"} = ($info->{"description"} || "") if $args->{"description"} || 0; + $s->{"shortdescription"}= ($info->{"shortdescription"} || "") if $args->{"shortdescription"} || 0; + } push @ret, $s; } return \@ret; Modified: branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes Mon Jan 18 14:47:23 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jan 18 14:38:15 CET 2010 - jsuchome(a)suse.cz + +- SERVICES.pm: read descriptions (bnc#570298); get single service + status from the Read function (bnc#570968) +- 2.17.83 + +------------------------------------------------------------------- Thu Jan 14 17:21:30 CET 2010 - mzugec(a)suse.cz - NetworkStorage: adapt functions needed for iBFT (bnc#551380) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60427 - in /trunk/storage: package/yast2-storage.changes storage/src/modules/StorageClients.ycp
by aschnell＠svn.opensuse.org 18 Jan '10

18 Jan '10

Author: aschnell Date: Mon Jan 18 12:13:47 2010 New Revision: 60427 URL: http://svn.opensuse.org/viewcvs/yast?rev=60427&view=rev Log: - show textual error messages during commit (bnc #546012) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/StorageClients.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Jan 18 12:13:47 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jan 18 11:53:51 CET 2010 - aschnell(a)suse.de + +- show textual error messages during commit (bnc #546012) + +------------------------------------------------------------------- Fri Jan 15 11:42:55 CET 2010 - aschnell(a)suse.de - implemented popup to query user whether to ignore failures during Modified: trunk/storage/storage/src/modules/StorageClients.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageClients.ycp (original) +++ trunk/storage/storage/src/modules/StorageClients.ycp Mon Jan 18 12:13:47 2010 @@ -15,8 +15,15 @@ import "SlideShow"; import "StorageCallbacks"; + import "LibStorage"; + import "LibStorage::StorageInterface"; + textdomain "storage"; + + any sint = nil; + + boolean enable_popup = false; list<string> texts = []; @@ -84,6 +91,12 @@ string text = _("Failure occurred during following action:") + "\n" + last_action + "\n\n"; + string tmp = LibStorage::StorageInterface::getErrorString(sint, error); + if (!isempty(tmp)) + { + text = text + tmp + "\n\n"; + } + text = text + sformat(_("System error code was: %1"), error) + "\n\n"; if (!isempty(extended_message)) @@ -131,9 +144,12 @@ } -global void InstallCallbacks(any sint) +global void InstallCallbacks(any value) { y2milestone( "InstallCallbacks" ); + + sint = value; + StorageCallbacks::ProgressBar("StorageClients::ProgressBar"); StorageCallbacks::ShowInstallInfo("StorageClients::ShowInstallInfo"); StorageCallbacks::InfoPopup("StorageClients::InfoPopup"); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60426 - in /trunk/qt-pkg: VERSION.cmake package/yast2-qt-pkg.changes src/YQPackageSelector.cc
by tgoettlicher＠svn.opensuse.org 18 Jan '10

18 Jan '10

Author: tgoettlicher Date: Mon Jan 18 10:38:29 2010 New Revision: 60426 URL: http://svn.opensuse.org/viewcvs/yast?rev=60426&view=rev Log: - fixed bnc #571200 - filter out 32 bit debuginfo packages - V 2.18.20 Modified: trunk/qt-pkg/VERSION.cmake trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPackageSelector.cc Modified: trunk/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=60426&r… ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Mon Jan 18 10:38:29 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "18") -SET(VERSION_PATCH "19") +SET(VERSION_PATCH "20") Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.chan… ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Mon Jan 18 10:38:29 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 18 10:34:08 CET 2010 - tgoettlicher(a)suse.de + +- fixed bnc #571200 - filter out 32 bit debuginfo packages +- V 2.18.20 + +------------------------------------------------------------------- Mon Dec 21 12:39:06 CET 2009 - tgoettlicher(a)suse.de - fixed bnc #564321: Alt-P shortcut overloaded in YaST2 Software Management Modified: trunk/qt-pkg/src/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPackageSelector.cc?… ============================================================================== --- trunk/qt-pkg/src/YQPackageSelector.cc (original) +++ trunk/qt-pkg/src/YQPackageSelector.cc Mon Jan 18 10:38:29 2010 @@ -783,7 +783,7 @@ this, SLOT( pkgExcludeDebugChanged( bool ) ), Qt::Key_F8 ); _showDebugAction->setCheckable(true); _showDebugAction->setChecked(true); - _excludeDebugInfoPkgs = new YQPkgObjList::ExcludeRule( _pkgList, QRegExp( ".*-(debuginfo|debugsource)$" ), _pkgList->nameCol() ); + _excludeDebugInfoPkgs = new YQPkgObjList::ExcludeRule( _pkgList, QRegExp( ".*-(debuginfo|debugsource)(-\\d+bit)?$" ), _pkgList->nameCol() ); YUI_CHECK_NEW( _excludeDebugInfoPkgs ); _excludeDebugInfoPkgs->enable( false ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60425 - /trunk/storage/storage/src/testsuite/
by aschnell＠svn.opensuse.org 18 Jan '10

18 Jan '10

Author: aschnell Date: Mon Jan 18 10:36:19 2010 New Revision: 60425 URL: http://svn.opensuse.org/viewcvs/yast?rev=60425&view=rev Log: - ignore generated directories Modified: trunk/storage/storage/src/testsuite/ (props changed) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60409 - in /trunk/gtk: ChangeLog src/pkg/YGPackageSelector.cc
by rpmcruz＠svn.opensuse.org 16 Jan '10

16 Jan '10

Author: rpmcruz Date: Sat Jan 16 21:04:58 2010 New Revision: 60409 URL: http://svn.opensuse.org/viewcvs/yast?rev=60409&view=rev Log: * src/pkg/YGPackageSelector.cc: made "view changes" working, and sticked a close button as well. Modified: trunk/gtk/ChangeLog trunk/gtk/src/pkg/YGPackageSelector.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=60409&r1=60408… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Sat Jan 16 21:04:58 2010 @@ -7,6 +7,9 @@ * src/ygtkwizard.h/c: added method for custom menu-bar. + * src/pkg/YGPackageSelector.cc: made "view changes" + working, and sticked a close button as well. + 2010-01-15 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/pkg/YGPackageSelector.cc: added repositories combo and Modified: trunk/gtk/src/pkg/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/YGPackageSelector.cc… ============================================================================== --- trunk/gtk/src/pkg/YGPackageSelector.cc (original) +++ trunk/gtk/src/pkg/YGPackageSelector.cc Sat Jan 16 21:04:58 2010 @@ -340,7 +340,7 @@ GtkWidget *getWidget() { return m_handle_box; } - ChangesPane() + ChangesPane (bool show_handle) : m_entries (NULL) { GtkWidget *heading = gtk_label_new (_("To perform now:")); @@ -358,7 +358,6 @@ gtk_box_pack_start (GTK_BOX (vbox), heading, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), m_empty_label, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), m_entries_box, TRUE, TRUE, 0); - g_signal_connect (G_OBJECT (vbox), "expose-event", G_CALLBACK (paint_white_expose_cb), NULL); @@ -377,41 +376,50 @@ gtk_widget_set_size_request (vbox, width, -1); gtk_widget_show_all (vbox); - GtkWidget *frame = gtk_frame_new (NULL); - gtk_container_add (GTK_CONTAINER (frame), scroll); - - m_handle_box = gtk_handle_box_new(); - gtk_container_add (GTK_CONTAINER (m_handle_box), frame); - gtk_handle_box_set_handle_position (GTK_HANDLE_BOX (m_handle_box), GTK_POS_TOP); - gtk_handle_box_set_snap_edge (GTK_HANDLE_BOX (m_handle_box), GTK_POS_RIGHT); + if (show_handle) { + GtkWidget *frame = gtk_frame_new (NULL); + gtk_container_add (GTK_CONTAINER (frame), scroll); + + m_handle_box = gtk_handle_box_new(); + gtk_container_add (GTK_CONTAINER (m_handle_box), frame); + gtk_handle_box_set_handle_position (GTK_HANDLE_BOX (m_handle_box), GTK_POS_TOP); + gtk_handle_box_set_snap_edge (GTK_HANDLE_BOX (m_handle_box), GTK_POS_RIGHT); + } + else + m_handle_box = scroll; Ypp::QueryBase *query = new Ypp::QueryProperty ("to-modify", true); -/* if (pkg_selector->onlineUpdateMode()) - query->addType (Ypp::Package::PATCH_TYPE);*/ +// if (pkg_selector->onlineUpdateMode()) m_pool = Ypp::PkgQuery (Ypp::Package::PACKAGE_TYPE, query); // initialize list -- there could already be packages modified for (int i = 0; i < m_pool.size(); i++) ChangesPane::entryInserted (m_pool, i, m_pool.get (i)); m_pool.addListener (this); - if (undo_log_all || undo_log_changed) { - GtkWidget *log_box = gtk_vbox_new (FALSE, 2); - GtkWidget *heading = gtk_label_new (_("Past changes:")); - YGUtils::setWidgetFont (heading, PANGO_STYLE_NORMAL, PANGO_WEIGHT_BOLD, PANGO_SCALE_MEDIUM); - gtk_misc_set_alignment (GTK_MISC (heading), 0, 0.5); - gtk_box_pack_start (GTK_BOX (vbox), heading, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (vbox), log_box, TRUE, TRUE, 0); - - for (int i = 0; Ypp::get()->getLog()->getEntry (i); i++) { - Ypp::Log::Entry *entry = Ypp::get()->getLog()->getEntry (i); - if (entry->package) - if (undo_log_all || LogEntry::canUndo (entry->package, entry->action)) { - // FIXME: free these stuff - LogEntry *log_entry = new LogEntry (entry->package, entry->action); - gtk_box_pack_start (GTK_BOX (log_box), log_entry->getWidget(), FALSE, TRUE, 0); - } - } + if (undo_log_all || undo_log_changed) + gtk_box_pack_start (GTK_BOX (vbox), createPastChangesWidget(), TRUE, TRUE, 0); + } + + GtkWidget *createPastChangesWidget() + { + GtkWidget *vbox = gtk_vbox_new (FALSE, 6); + GtkWidget *log_box = gtk_vbox_new (FALSE, 2); + GtkWidget *heading = gtk_label_new (_("Past changes:")); + YGUtils::setWidgetFont (heading, PANGO_STYLE_NORMAL, PANGO_WEIGHT_BOLD, PANGO_SCALE_MEDIUM); + gtk_misc_set_alignment (GTK_MISC (heading), 0, 0.5); + gtk_box_pack_start (GTK_BOX (vbox), heading, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox), log_box, TRUE, TRUE, 0); + + for (int i = 0; Ypp::get()->getLog()->getEntry (i); i++) { + Ypp::Log::Entry *entry = Ypp::get()->getLog()->getEntry (i); + if (entry->package) + if (undo_log_all || LogEntry::canUndo (entry->package, entry->action)) { + // FIXME: free these stuff + LogEntry *log_entry = new LogEntry (entry->package, entry->action); + gtk_box_pack_start (GTK_BOX (log_box), log_entry->getWidget(), FALSE, TRUE, 0); + } } + return vbox; } ~ChangesPane() @@ -3281,17 +3289,20 @@ } }; +// undo box + class UndoBox : public Ypp::PkgList::Listener { -GtkWidget *m_undo_box, *m_undo_package, *m_undo_details; +GtkWidget *m_undo_box, *m_undo_package, *m_undo_details, *m_title; Ypp::PkgList m_pool; Ypp::Package *m_package; +bool m_closed; public: GtkWidget *getWidget() { return m_undo_box; } - UndoBox() + UndoBox() : m_closed (false) { Ypp::QueryBase *query = new Ypp::QueryProperty ("to-modify", true); // if (pkg_selector->onlineUpdateMode()) @@ -3303,10 +3314,16 @@ GtkWidget *vbox = gtk_vbox_new (FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (vbox), 6); gtk_container_add (GTK_CONTAINER (m_undo_box), vbox); - GtkWidget *title = gtk_label_new (_("Software changes")); - gtk_misc_set_alignment (GTK_MISC (title), 0, .5); - YGUtils::setWidgetFont (title, PANGO_STYLE_NORMAL, PANGO_WEIGHT_BOLD, PANGO_SCALE_MEDIUM); - gtk_box_pack_start (GTK_BOX (vbox), title, FALSE, TRUE, 0); + m_title = gtk_label_new (_("Software changes")); + gtk_misc_set_alignment (GTK_MISC (m_title), .5, .5); + YGUtils::setWidgetFont (m_title, PANGO_STYLE_NORMAL, PANGO_WEIGHT_BOLD, PANGO_SCALE_MEDIUM); + GtkWidget *close_button = create_small_button (GTK_STOCK_CLOSE, _("Close")); + g_signal_connect (G_OBJECT (close_button), "clicked", + G_CALLBACK (close_clicked_cb), this); + GtkWidget *title_box = gtk_hbox_new (FALSE, 2); + gtk_box_pack_start (GTK_BOX (title_box), m_title, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (title_box), close_button, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox), title_box, FALSE, TRUE, 0); GtkWidget *package_box = gtk_hbox_new (FALSE, 4); m_undo_package = gtk_label_new (""); gtk_misc_set_alignment (GTK_MISC (m_undo_package), 0, .5); @@ -3319,10 +3336,17 @@ m_undo_details = gtk_label_new (""); gtk_misc_set_alignment (GTK_MISC (m_undo_details), 0, .5); gtk_box_pack_start (GTK_BOX (vbox), m_undo_details, FALSE, TRUE, 0); - GtkWidget *details_button = gtk_link_button_new (_("View details...")); - GtkWidget *details_align = gtk_alignment_new (1, .5, 0, 0); - gtk_container_add (GTK_CONTAINER (details_align), details_button); - gtk_box_pack_start (GTK_BOX (vbox), details_align, FALSE, TRUE, 0); + char *details_str = g_strdup_printf ("<a href=\"details\">%s</a>", _("View details...")); + GtkWidget *details_label = gtk_label_new (details_str); + gtk_label_set_use_markup (GTK_LABEL (details_label), TRUE); + g_free (details_str); + gtk_label_set_track_visited_links (GTK_LABEL (details_label), FALSE); + gtk_misc_set_alignment (GTK_MISC (details_label), 1, .5); + gtk_box_pack_start (GTK_BOX (vbox), details_label, FALSE, TRUE, 0); + g_signal_connect (G_OBJECT (details_label), "activate-link", + G_CALLBACK (details_link_cb), this); + + // TODO: start by showing available disk space } ~UndoBox() @@ -3335,6 +3359,7 @@ void setPackage (Ypp::Package *package) { + if (m_closed) return; m_package = package; std::string action; @@ -3364,6 +3389,7 @@ Ypp::Disk *disk = Ypp::get()->getDisk(); for (int i = 0; disk->getPartition (i); i++) { const Ypp::Disk::Partition *part = disk->getPartition (i); + // FIXME: check for '/' in a soft manner, /usr/ as a hard check if (part->path == "/usr" || part->path == "/usr/" || part->path == "/") delta_str = part->delta_str; } @@ -3389,12 +3415,71 @@ { setPackage (package); } virtual void entryDeleted (const Ypp::PkgList list, int index, Ypp::Package *package) - { gtk_widget_hide (m_undo_box); } + { if (package == m_package) gtk_widget_hide (m_undo_box); } virtual void entryChanged (const Ypp::PkgList list, int index, Ypp::Package *package) {} static void undo_clicked_cb (GtkButton *button, UndoBox *pThis) { pThis->m_package->undo(); } + + static void close_clicked_cb (GtkButton *button, UndoBox *pThis) + { gtk_widget_hide (pThis->m_undo_box); pThis->m_closed = true; } + + static GtkWidget *createViewPort (GtkWidget *child) + { + GtkWidget *scroll = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll), + GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scroll), child); + GtkWidget *port = gtk_bin_get_child (GTK_BIN (scroll)); + gtk_viewport_set_shadow_type (GTK_VIEWPORT (port), GTK_SHADOW_NONE); + return scroll; + } + + static void past_expander_expanded_cb (GObject *object, + GParamSpec *param_spec, ChangesPane *changes) + { + GtkExpander *expander = GTK_EXPANDER (object); + gboolean expanded = gtk_expander_get_expanded (expander); + if (expanded && !g_object_get_data (object, "has-expanded")) { + g_object_set_data (object, "has-expanded", GINT_TO_POINTER (1)); + GtkWidget *widget = createViewPort (changes->createPastChangesWidget()); + gtk_widget_show_all (widget); + gtk_container_add (GTK_CONTAINER (object), widget); + } + GtkWidget *widget = GTK_WIDGET (object); + gtk_box_set_child_packing (GTK_BOX (gtk_widget_get_parent (widget)), + widget, expanded, TRUE, 0, GTK_PACK_START); + } + + static gboolean details_link_cb (GtkLabel *label, gchar *uri, UndoBox *pThis) + { + ChangesPane *changes = new ChangesPane (false); + + GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_NONE, + "%s", _("Review of changes")); + gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE); + gtk_window_set_default_size (GTK_WINDOW (dialog), 550, 500); + gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE); + + GtkWidget *vbox = gtk_vbox_new (FALSE, 6); + gtk_box_pack_start (GTK_BOX (vbox), changes->getWidget(), TRUE, TRUE, 0); + GtkWidget *expander = gtk_expander_new (_("Past changes")); + g_signal_connect (G_OBJECT (expander), "notify::expanded", + G_CALLBACK (past_expander_expanded_cb), changes); + gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE, TRUE, 0); + + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox); + gtk_widget_show_all (dialog); + changes->startHack(); + + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + delete changes; + return TRUE; + } }; class UI : public YGtkPackageView::Listener, _QueryListener, Ypp::Disk::Listener @@ -3546,7 +3631,7 @@ GtkWidget *undo_widget; if (undo_side) { if (undo_old_style) { - changes_pane = new ChangesPane(); + changes_pane = new ChangesPane (true); undo_widget = changes_pane->getWidget(); } else -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60408 - in /trunk/gtk: ChangeLog src/YGPackageSelectorPluginStub.cc src/pkg/YGPackageSelector.cc src/pkg/ygtkpackageview.cc src/ygtkwizard.c src/ygtkwizard.h
by rpmcruz＠svn.opensuse.org 16 Jan '10

16 Jan '10

Author: rpmcruz Date: Sat Jan 16 17:17:07 2010 New Revision: 60408 URL: http://svn.opensuse.org/viewcvs/yast?rev=60408&view=rev Log: * src/pkg/YGPackageSelector.cc: added --undo-box flag. * src/pkg/YGPackageSelector.cc: added menu-bar (not enabled by default yet). * src/ygtkwizard.h/c: added method for custom menu-bar. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGPackageSelectorPluginStub.cc trunk/gtk/src/pkg/YGPackageSelector.cc trunk/gtk/src/pkg/ygtkpackageview.cc trunk/gtk/src/ygtkwizard.c trunk/gtk/src/ygtkwizard.h Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=60408&r1=60407… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Sat Jan 16 17:17:07 2010 @@ -1,3 +1,12 @@ +2010-01-16 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/pkg/YGPackageSelector.cc: added --undo-box flag. + + * src/pkg/YGPackageSelector.cc: added menu-bar (not + enabled by default yet). + + * src/ygtkwizard.h/c: added method for custom menu-bar. + 2010-01-15 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/pkg/YGPackageSelector.cc: added repositories combo and Modified: trunk/gtk/src/YGPackageSelectorPluginStub.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelectorPluginS… ============================================================================== --- trunk/gtk/src/YGPackageSelectorPluginStub.cc (original) +++ trunk/gtk/src/YGPackageSelectorPluginStub.cc Sat Jan 16 17:17:07 2010 @@ -20,6 +20,7 @@ status_side = true, status_top = false, status_tabs = false, status_tabs_as_actions = false, undo_side = false, undo_tab = true, undo_old_style = false, undo_log_all = false, undo_log_changed = false, + undo_box = false, status_col = false, action_col = true, action_col_as_button = false, action_col_as_check = false, action_col_label = true, version_col = true, single_line_rows = false, colorful_rows = false, @@ -56,6 +57,7 @@ { "undo-old-style", &undo_old_style }, { "undo-log-all", &undo_log_all }, { "undo-log-changed", &undo_log_changed }, + { "undo-box", &undo_box }, { "status-col", &status_col }, { "action-col", &action_col }, { "action-col-as-button", &action_col_as_button }, Modified: trunk/gtk/src/pkg/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/YGPackageSelector.cc… ============================================================================== --- trunk/gtk/src/pkg/YGPackageSelector.cc (original) +++ trunk/gtk/src/pkg/YGPackageSelector.cc Sat Jan 16 17:17:07 2010 @@ -33,7 +33,8 @@ categories_side, repositories_side, categories_top, repositories_top, status_side, status_top, status_tabs, status_tabs_as_actions, - undo_side, undo_tab, undo_old_style, undo_log_all, undo_log_changed, status_col, + undo_side, undo_tab, undo_old_style, undo_log_all, undo_log_changed, undo_box, + status_col, action_col, action_col_as_button, action_col_as_check, version_col, single_line_rows, details_start_hide, toolbar_top, toolbar_yast, arrange_by; @@ -42,8 +43,8 @@ static gboolean paint_white_expose_cb (GtkWidget *widget, GdkEventExpose *event) { cairo_t *cr = gdk_cairo_create (widget->window); - GdkColor color = { 0, 255 << 8, 255 << 8, 255 << 8 }; - gdk_cairo_set_source_color (cr, &color); + GdkColor white = { 0, 255 << 8, 255 << 8, 255 << 8 }; + gdk_cairo_set_source_color (cr, &white); cairo_rectangle (cr, event->area.x, event->area.y, event->area.width, event->area.height); cairo_fill (cr); @@ -353,7 +354,7 @@ gtk_misc_set_alignment (GTK_MISC (m_empty_label), 0.5, 0.5); GtkWidget *vbox = gtk_vbox_new (FALSE, 6); - gtk_container_set_border_width (GTK_CONTAINER (vbox), 4); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 4); // FIXME: are these inner borders? gtk_box_pack_start (GTK_BOX (vbox), heading, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), m_empty_label, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), m_entries_box, TRUE, TRUE, 0); @@ -1676,6 +1677,104 @@ }; #endif +static void errorMsg (const std::string &header, const std::string &message) +{ + GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, + "%s", header.c_str()); + gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), + "%s", message.c_str()); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); +} + +static void import_file_cb (GtkMenuItem *item) +{ + GtkWidget *dialog; + dialog = gtk_file_chooser_dialog_new (_("Import Package List"), + YGDialog::currentWindow(), GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, + GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); + + int ret = gtk_dialog_run (GTK_DIALOG (dialog)); + if (ret == GTK_RESPONSE_ACCEPT) { + char *filename; + filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); + if (!Ypp::get()->importList (filename)) { + std::string error = _("Couldn't load package list from: "); + error += filename; + errorMsg (_("Import Failed"), error); + } + g_free (filename); + } + gtk_widget_destroy (dialog); +} + +static void export_file_cb (GtkMenuItem *item) +{ + GtkWidget *dialog; + dialog = gtk_file_chooser_dialog_new (_("Export Package List"), + YGDialog::currentWindow(), GTK_FILE_CHOOSER_ACTION_SAVE, + GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, + GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); + + int ret = gtk_dialog_run (GTK_DIALOG (dialog)); + if (ret == GTK_RESPONSE_ACCEPT) { + char *filename; + filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); + if (!Ypp::get()->exportList (filename)) { + std::string error = _("Couldn't save package list to: "); + error += filename; + errorMsg (_("Export Failed"), error); + } + g_free (filename); + } + gtk_widget_destroy (dialog); +} + +static void create_solver_testcase_cb (GtkMenuItem *item) +{ + const char *dirname = "/var/log/YaST2/solverTestcase"; + std::string msg = _("Use this to generate extensive logs to help tracking down " + "bugs in the dependency resolver.\nThe logs will be stored in " + "directory: "); + msg += dirname; + + GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_OK_CANCEL, + "%s", _("Create Dependency Resolver Test Case")); + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", msg.c_str()); + int ret = gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + + if (ret == GTK_RESPONSE_OK) { + if (Ypp::get()->createSolverTestcase (dirname)) { + GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, + GTK_BUTTONS_YES_NO, "%s", _("Success")); + msg = _("Dependency resolver test case written to"); + msg += " <tt>"; + msg += dirname; + msg += "</tt>\n"; + msg += _("Prepare <tt>y2logs.tgz tar</tt> archive to attach to Bugzilla?"); + gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), + "%s", msg.c_str()); + ret = gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + if (ret == GTK_RESPONSE_YES) + YGUI::ui()->askSaveLogs(); + } + else { + msg = _("Failed to create dependency resolver test case.\n" + "Please check disk space and permissions for"); + msg += " <tt>"; + msg += dirname; + msg += "</tt>"; + errorMsg ("Error", msg.c_str()); + } + } +} + class ToolsBox { GtkWidget *m_box; @@ -1710,105 +1809,6 @@ gtk_box_pack_start (GTK_BOX (m_box), button, FALSE, TRUE, 0); gtk_widget_show_all (m_box); } - -private: - static void errorMsg (const std::string &header, const std::string &message) - { - GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), - GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, - "%s", header.c_str()); - gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), - "%s", message.c_str()); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - } - - static void import_file_cb (GtkMenuItem *item, ToolsBox *pThis) - { - GtkWidget *dialog; - dialog = gtk_file_chooser_dialog_new (_("Import Package List"), - YGDialog::currentWindow(), GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); - - int ret = gtk_dialog_run (GTK_DIALOG (dialog)); - if (ret == GTK_RESPONSE_ACCEPT) { - char *filename; - filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); - if (!Ypp::get()->importList (filename)) { - std::string error = _("Couldn't load package list from: "); - error += filename; - errorMsg (_("Import Failed"), error); - } - g_free (filename); - } - gtk_widget_destroy (dialog); - } - - static void export_file_cb (GtkMenuItem *item, ToolsBox *pThis) - { - GtkWidget *dialog; - dialog = gtk_file_chooser_dialog_new (_("Export Package List"), - YGDialog::currentWindow(), GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); - - int ret = gtk_dialog_run (GTK_DIALOG (dialog)); - if (ret == GTK_RESPONSE_ACCEPT) { - char *filename; - filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); - if (!Ypp::get()->exportList (filename)) { - std::string error = _("Couldn't save package list to: "); - error += filename; - errorMsg (_("Export Failed"), error); - } - g_free (filename); - } - gtk_widget_destroy (dialog); - } - - static void create_solver_testcase_cb (GtkMenuItem *item) - { - const char *dirname = "/var/log/YaST2/solverTestcase"; - std::string msg = _("Use this to generate extensive logs to help tracking down " - "bugs in the dependency resolver.\nThe logs will be stored in " - "directory: "); - msg += dirname; - - GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), - GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_OK_CANCEL, - "%s", _("Create Dependency Resolver Test Case")); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", msg.c_str()); - int ret = gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - - if (ret == GTK_RESPONSE_OK) { - if (Ypp::get()->createSolverTestcase (dirname)) { - GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), - GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, - GTK_BUTTONS_YES_NO, "%s", _("Success")); - msg = _("Dependency resolver test case written to"); - msg += " <tt>"; - msg += dirname; - msg += "</tt>\n"; - msg += _("Prepare <tt>y2logs.tgz tar</tt> archive to attach to Bugzilla?"); - gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), - "%s", msg.c_str()); - ret = gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - if (ret == GTK_RESPONSE_YES) - YGUI::ui()->askSaveLogs(); - } - else { - msg = _("Failed to create dependency resolver test case.\n" - "Please check disk space and permissions for"); - msg += " <tt>"; - msg += dirname; - msg += "</tt>"; - errorMsg ("Error", msg.c_str()); - } - } - } }; //** Dialogs @@ -2931,6 +2931,8 @@ return vpaned; } +// expander box + static void ygtk_expander_box_size_allocate (GtkWidget *vbox, GtkAllocation *alloc) { GtkContainer *container = GTK_CONTAINER (vbox); @@ -2996,6 +2998,47 @@ return widget; } +// tooltip box + +typedef struct YGtkTooltipBox +{ GtkEventBox parent; } YGtkTooltipBox; + +typedef struct YGtkTooltipBoxClass +{ GtkEventBoxClass parent_class; } YGtkTooltipBoxClass; + +G_DEFINE_TYPE (YGtkTooltipBox, ygtk_tooltip_box, GTK_TYPE_EVENT_BOX) + +static void ygtk_tooltip_box_init (YGtkTooltipBox *tooltip) +{ + GdkColor yellow = { 0, 246 << 8, 246 << 8, 187 << 8 }; + gtk_widget_modify_bg (GTK_WIDGET (tooltip), GTK_STATE_NORMAL, &yellow); +} + +static gboolean ygtk_tooltip_box_expose_event (GtkWidget *tooltip, GdkEventExpose *event) +{ + gtk_paint_flat_box (tooltip->style, tooltip->window, + GTK_STATE_NORMAL, GTK_SHADOW_OUT, NULL, tooltip, + "tooltip", 0, 0, tooltip->allocation.width, + tooltip->allocation.height); + GtkWidget *child = GTK_BIN (tooltip)->child; + if (child) + gtk_container_propagate_expose (GTK_CONTAINER (tooltip), child, event); + return TRUE; +} + +static void ygtk_tooltip_box_class_init (YGtkTooltipBoxClass *klass) +{ + ygtk_tooltip_box_parent_class = g_type_class_peek_parent (klass); + + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); + widget_class->expose_event = ygtk_tooltip_box_expose_event; +} + +static GtkWidget *ygtk_tooltip_box_new (void) +{ return (GtkWidget *) g_object_new (ygtk_tooltip_box_get_type(), NULL); } + +// stack (or deck) widget + class StackWidget { GtkWidget *m_combo, *m_placeholder, *m_widget; @@ -3014,7 +3057,7 @@ else { m_combo = gtk_combo_box_new_text(); m_placeholder = gtk_event_box_new(); - m_widget = gtk_vbox_new (FALSE, 2); + m_widget = gtk_vbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (m_widget), m_combo, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (m_widget), m_placeholder, TRUE, TRUE, 0); g_signal_connect (G_OBJECT (m_combo), "changed", @@ -3071,7 +3114,7 @@ m_list_widget = list_widget; m_widget = gtk_vbox_new (FALSE, 12); - gtk_container_set_border_width (GTK_CONTAINER (m_widget), 12); + gtk_container_set_border_width (GTK_CONTAINER (m_widget), 12); // FIXME: are these the inner borders? g_signal_connect (G_OBJECT (m_widget), "expose-event", G_CALLBACK (paint_white_expose_cb), NULL); @@ -3238,6 +3281,122 @@ } }; +class UndoBox : public Ypp::PkgList::Listener +{ +GtkWidget *m_undo_box, *m_undo_package, *m_undo_details; +Ypp::PkgList m_pool; +Ypp::Package *m_package; + +public: + GtkWidget *getWidget() + { return m_undo_box; } + + UndoBox() + { + Ypp::QueryBase *query = new Ypp::QueryProperty ("to-modify", true); +// if (pkg_selector->onlineUpdateMode()) + m_pool = Ypp::PkgQuery (Ypp::Package::PACKAGE_TYPE, query); + // TODO: there could already be packages modified + m_pool.addListener (this); + + m_undo_box = ygtk_tooltip_box_new(); + GtkWidget *vbox = gtk_vbox_new (FALSE, 0); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 6); + gtk_container_add (GTK_CONTAINER (m_undo_box), vbox); + GtkWidget *title = gtk_label_new (_("Software changes")); + gtk_misc_set_alignment (GTK_MISC (title), 0, .5); + YGUtils::setWidgetFont (title, PANGO_STYLE_NORMAL, PANGO_WEIGHT_BOLD, PANGO_SCALE_MEDIUM); + gtk_box_pack_start (GTK_BOX (vbox), title, FALSE, TRUE, 0); + GtkWidget *package_box = gtk_hbox_new (FALSE, 4); + m_undo_package = gtk_label_new (""); + gtk_misc_set_alignment (GTK_MISC (m_undo_package), 0, .5); + GtkWidget *undo_button = gtk_button_new_from_stock (GTK_STOCK_UNDO); + g_signal_connect (G_OBJECT (undo_button), "clicked", + G_CALLBACK (undo_clicked_cb), this); + gtk_box_pack_start (GTK_BOX (package_box), m_undo_package, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (package_box), undo_button, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox), package_box, FALSE, TRUE, 6); + m_undo_details = gtk_label_new (""); + gtk_misc_set_alignment (GTK_MISC (m_undo_details), 0, .5); + gtk_box_pack_start (GTK_BOX (vbox), m_undo_details, FALSE, TRUE, 0); + GtkWidget *details_button = gtk_link_button_new (_("View details...")); + GtkWidget *details_align = gtk_alignment_new (1, .5, 0, 0); + gtk_container_add (GTK_CONTAINER (details_align), details_button); + gtk_box_pack_start (GTK_BOX (vbox), details_align, FALSE, TRUE, 0); + } + + ~UndoBox() + { + m_pool.removeListener (this); + } + + void startHack() // call after init, after you did a show_all in the dialog + { gtk_widget_hide (m_undo_box); } + + void setPackage (Ypp::Package *package) + { + m_package = package; + + std::string action; + if (package->toInstall()) { + if (package->isInstalled()) + action = _("upgrade"); + else + action = _("add"); + } + else //if (package->toRemove()) + action = _("remove"); + + gchar *package_str = g_strdup_printf ("%s %s", action.c_str(), package->name().c_str()); + gtk_label_set_text (GTK_LABEL (m_undo_package), package_str); + g_free (package_str); + + const Ypp::PkgList packages (Ypp::get()->getPackages (Ypp::Package::PACKAGE_TYPE)); + int added = 0, removed = 0; + for (int i = 0; i < packages.size(); i++) { + if (packages.get (i)->toInstall()) + added++; + if (packages.get (i)->toRemove()) + removed++; + } + + std::string delta_str; + Ypp::Disk *disk = Ypp::get()->getDisk(); + for (int i = 0; disk->getPartition (i); i++) { + const Ypp::Disk::Partition *part = disk->getPartition (i); + if (part->path == "/usr" || part->path == "/usr/" || part->path == "/") + delta_str = part->delta_str; + } + + gchar *added_str = 0, *removed_str = 0; + if (added) + added_str = g_strdup_printf (_("Added %d packages\n"), added); + if (removed) + removed_str = g_strdup_printf (_("Removed %d packages\n"), removed); + + gchar *details = g_strdup_printf (_("%s%sTotalling: %s"), added_str ? added_str : "", removed_str ? removed_str : "", delta_str.c_str()); + gtk_label_set_text (GTK_LABEL (m_undo_details), details); + g_free (details); + if (added_str) + g_free (added_str); + if (removed_str) + g_free (removed_str); + + gtk_widget_show (m_undo_box); + } + + virtual void entryInserted (const Ypp::PkgList list, int index, Ypp::Package *package) + { setPackage (package); } + + virtual void entryDeleted (const Ypp::PkgList list, int index, Ypp::Package *package) + { gtk_widget_hide (m_undo_box); } + + virtual void entryChanged (const Ypp::PkgList list, int index, Ypp::Package *package) {} + + static void undo_clicked_cb (GtkButton *button, UndoBox *pThis) + { pThis->m_package->undo(); } +}; + class UI : public YGtkPackageView::Listener, _QueryListener, Ypp::Disk::Listener { GtkWidget *m_widget, *m_disk_label, *m_arrange_combo; @@ -3248,6 +3407,7 @@ StartupMenu *m_startup_menu; Ypp::Package::Type m_type; Toolbar *m_toolbar; +UndoBox *m_undo_box; public: GtkWidget *getWidget() { return m_widget; } @@ -3503,6 +3663,12 @@ gtk_box_pack_start (GTK_BOX (side_vbox), vpaned, TRUE, TRUE, 0); } + m_undo_box = 0; + if (undo_box) { + m_undo_box = new UndoBox(); + gtk_box_pack_start (GTK_BOX (side_vbox), m_undo_box->getWidget(), FALSE, TRUE, 0); + } + GtkWidget *side_pane = gtk_hpaned_new(); gtk_paned_pack1 (GTK_PANED (side_pane), side_vbox, FALSE, TRUE); gtk_paned_pack2 (GTK_PANED (side_pane), view_pane, TRUE, FALSE); @@ -3525,6 +3691,8 @@ gtk_widget_hide (side_vbox); if (changes_pane) changes_pane->startHack(); + if (m_undo_box) + m_undo_box->startHack(); if (startup_menu) { m_startup_menu = new StartupMenu (m_widget); @@ -3549,6 +3717,7 @@ delete *it; delete m_disk; delete m_startup_menu; + delete m_undo_box; } private: @@ -3765,7 +3934,41 @@ #if 0 m_tools = new ToolsBox(); - ygtk_wizard_set_extra_button (YGTK_WIZARD (getWidget()), m_tools->getWidget()); + ygtk_wizard_set_extra_button (wizard, m_tools->getWidget()); +#endif + +#if 0 + GtkWidget *menu_bar = gtk_menu_bar_new(), *item, *submenu, *subitem; + item = gtk_menu_item_new_with_label (_("File")); + submenu = gtk_menu_new(); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), submenu); + subitem = gtk_menu_item_new_with_label (_("Import...")); + gtk_menu_shell_append (GTK_MENU_SHELL (submenu), subitem); + g_signal_connect (G_OBJECT (subitem), "activate", + G_CALLBACK (import_file_cb), this); + subitem = gtk_menu_item_new_with_label (_("Export...")); + gtk_menu_shell_append (GTK_MENU_SHELL (submenu), subitem); + g_signal_connect (G_OBJECT (subitem), "activate", + G_CALLBACK (export_file_cb), this); + subitem = gtk_separator_menu_item_new(); + gtk_menu_shell_append (GTK_MENU_SHELL (submenu), subitem); + subitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_SAVE, NULL); + gtk_menu_shell_append (GTK_MENU_SHELL (submenu), subitem); + subitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_QUIT, NULL); + gtk_menu_shell_append (GTK_MENU_SHELL (submenu), subitem); + gtk_menu_shell_append (GTK_MENU_SHELL (menu_bar), item); + item = gtk_menu_item_new_with_label (_("View")); + gtk_menu_shell_append (GTK_MENU_SHELL (menu_bar), item); + item = gtk_menu_item_new_with_label (_("Tools")); + submenu = gtk_menu_new(); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), submenu); + subitem = gtk_menu_item_new_with_label (_("Generate Dependency Testcase...")); + gtk_menu_shell_append (GTK_MENU_SHELL (submenu), subitem); + g_signal_connect (G_OBJECT (subitem), "activate", + G_CALLBACK (create_solver_testcase_cb), this); + gtk_menu_shell_append (GTK_MENU_SHELL (menu_bar), item); + gtk_widget_show_all (menu_bar); + ygtk_wizard_set_custom_menu (wizard, menu_bar); #endif m_progressbar = gtk_progress_bar_new(); Modified: trunk/gtk/src/pkg/ygtkpackageview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpackageview.cc?r… ============================================================================== --- trunk/gtk/src/pkg/ygtkpackageview.cc (original) +++ trunk/gtk/src/pkg/ygtkpackageview.cc Sat Jan 16 17:17:07 2010 @@ -728,10 +728,10 @@ clear(); if (action_col) { - if (action_col_as_check) - appendCheckColumn ("is-installed"); //("to-install"); - else //if (action_col_as_button) + if (action_col_as_button) appendButtonColumn (NULL, "to-install"); + else //if (action_col_as_check) + appendCheckColumn ("is-installed"); //("to-install"); } if (status_col) appendIconColumn (NULL, "icon"); Modified: trunk/gtk/src/ygtkwizard.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.c?rev=60408&r… ============================================================================== --- trunk/gtk/src/ygtkwizard.c (original) +++ trunk/gtk/src/ygtkwizard.c Sat Jan 16 17:17:07 2010 @@ -920,19 +920,17 @@ { if (!wizard->menu) { wizard->menu = gtk_menu_bar_new(); - gtk_container_add (GTK_CONTAINER (wizard->m_menu_box), wizard->menu); - // we probably want to hide the title, so the menu is more visible - gtk_widget_hide (wizard->m_title); + ygtk_wizard_set_custom_menu (wizard, wizard->menu); + gtk_widget_show (wizard->menu); } GtkWidget *entry = gtk_menu_item_new_with_mnemonic (text); - gtk_menu_shell_append (GTK_MENU_SHELL (wizard->menu), entry); - GtkWidget *submenu = gtk_menu_new(); gtk_menu_item_set_submenu (GTK_MENU_ITEM (entry), submenu); + gtk_menu_shell_append (GTK_MENU_SHELL (wizard->menu), entry); + gtk_widget_show_all (entry); g_hash_table_insert (wizard->menu_ids, g_strdup (id), submenu); - gtk_widget_show_all (wizard->m_menu_box); } gboolean ygtk_wizard_add_menu_entry (YGtkWizard *wizard, const char *parent_id, @@ -970,13 +968,12 @@ return FALSE; GtkWidget *entry = gtk_menu_item_new_with_mnemonic (text); - gtk_menu_shell_append (GTK_MENU_SHELL (parent), entry); - GtkWidget *submenu = gtk_menu_new(); gtk_menu_item_set_submenu (GTK_MENU_ITEM (entry), submenu); + gtk_menu_shell_append (GTK_MENU_SHELL (parent), entry); + gtk_widget_show_all (entry); g_hash_table_insert (wizard->menu_ids, g_strdup (id), submenu); - gtk_widget_show_all (entry); return TRUE; } @@ -1004,6 +1001,14 @@ } } +void ygtk_wizard_set_custom_menu (YGtkWizard *wizard, GtkWidget *menu_bar) +{ + gtk_container_add (GTK_CONTAINER (wizard->m_menu_box), menu_bar); + gtk_widget_show (wizard->m_menu_box); + // we probably want to hide the title, so the menu is more visible + gtk_widget_hide (wizard->m_title); +} + void ygtk_wizard_add_step_header (YGtkWizard *wizard, const char *text) { g_return_if_fail (wizard->steps != NULL); Modified: trunk/gtk/src/ygtkwizard.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.h?rev=60408&r… ============================================================================== --- trunk/gtk/src/ygtkwizard.h (original) +++ trunk/gtk/src/ygtkwizard.h Sat Jan 16 17:17:07 2010 @@ -162,6 +162,7 @@ const char *text, const char *id); gboolean ygtk_wizard_add_menu_separator (YGtkWizard *wizard, const char *parent_id); void ygtk_wizard_clear_menu (YGtkWizard *wizard); +void ygtk_wizard_set_custom_menu (YGtkWizard *wizard, GtkWidget *menu_bar); void ygtk_wizard_add_step_header (YGtkWizard *wizard, const char *text); void ygtk_wizard_add_step (YGtkWizard *wizard, const char* text, const char *id); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0