January 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60631 - in /trunk/gtk: ChangeLog src/ygtkwizard.c src/ygtkwizard.h
by rpmcruz＠svn.opensuse.org 30 Jan '10

30 Jan '10

Author: rpmcruz Date: Sat Jan 30 11:42:05 2010 New Revision: 60631 URL: http://svn.opensuse.org/viewcvs/yast?rev=60631&view=rev Log: * src/ygtkwizard.h/c: touched up steps look. Modified: trunk/gtk/ChangeLog 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=60631&r1=60630… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Sat Jan 30 11:42:05 2010 @@ -1,5 +1,9 @@ 2010-01-29 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + * src/ygtkwizard.h/c: touched up steps look. + +2010-01-29 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + * src/YGTable.cc: bug fix 567505: crash when cell is unset: see firewall tool. Modified: trunk/gtk/src/ygtkwizard.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.c?rev=60631&r… ============================================================================== --- trunk/gtk/src/ygtkwizard.c (original) +++ trunk/gtk/src/ygtkwizard.c Sat Jan 30 11:42:05 2010 @@ -613,11 +613,13 @@ //** The menu and the navigation widgets will be created when requested. // space for them wizard->m_menu_box = gtk_event_box_new(); + wizard->m_info_box = gtk_event_box_new(); wizard->m_pane = gtk_hpaned_new(); gtk_widget_show (wizard->m_pane); wizard->m_contents_box = gtk_hbox_new (FALSE, 6); + gtk_box_pack_start (GTK_BOX (wizard->m_contents_box), wizard->m_info_box, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (wizard->m_contents_box), wizard->m_pane, TRUE, TRUE, 0); gtk_widget_show (wizard->m_contents_box); @@ -628,13 +630,9 @@ gtk_box_pack_start (GTK_BOX (vbox), wizard->m_buttons, FALSE, TRUE, 0); gtk_widget_show (vbox); - wizard->m_contents_buttons_box = gtk_hbox_new (FALSE, 6); - gtk_box_pack_start (GTK_BOX (wizard->m_contents_buttons_box), vbox, TRUE, TRUE, 0); - gtk_widget_show (wizard->m_contents_buttons_box); - gtk_box_pack_start (GTK_BOX (wizard), wizard->m_menu_box, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (wizard), wizard->m_title, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (wizard), wizard->m_contents_buttons_box, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (wizard), vbox, TRUE, TRUE, 0); } static void ygtk_wizard_realize (GtkWidget *widget) @@ -711,33 +709,13 @@ gtk_paned_pack2 (GTK_PANED (wizard->m_pane), child, TRUE, TRUE); } -static gboolean ygtk_wizard_set_information_expose_cb (GtkWidget *widget, GdkEventExpose *event, - GtkAllocation *alloc) -{ - cairo_t *cr = gdk_cairo_create (widget->window); - int x = alloc->x, y = alloc->y, w = alloc->width, h = alloc->height; - cairo_pattern_t *pattern = cairo_pattern_create_linear (x, y, x, y+h); - cairo_pattern_add_color_stop_rgba (pattern, 0, 1, 1, 1, 1); - cairo_pattern_add_color_stop_rgba (pattern, 1, 1, 1, 1, 0); - cairo_set_source (cr, pattern); - cairo_rectangle (cr, x, y, w, h); - cairo_fill (cr); - cairo_pattern_destroy (pattern); - cairo_destroy (cr); - return FALSE; -} - -void ygtk_wizard_set_information_expose_hook (GtkWidget *widget, GtkAllocation *alloc) -{ - g_signal_connect (G_OBJECT (widget), "expose-event", - G_CALLBACK (ygtk_wizard_set_information_expose_cb), alloc); -} - -void ygtk_wizard_set_information_widget (YGtkWizard *wizard, GtkWidget *widget, - gboolean complete_side) +void ygtk_wizard_set_information_widget (YGtkWizard *wizard, GtkWidget *widget) { - GtkWidget *box = complete_side ? wizard->m_contents_buttons_box : wizard->m_contents_box; - gtk_box_pack_start (GTK_BOX (box), widget, FALSE, TRUE, 0); + GtkWidget *hbox = gtk_hbox_new (FALSE, 2), *sep = gtk_vseparator_new(); + gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), sep, FALSE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (wizard->m_info_box), hbox); + gtk_widget_show_all (wizard->m_info_box); } void ygtk_wizard_set_control_widget (YGtkWizard *wizard, GtkWidget *widget) @@ -749,12 +727,7 @@ { g_return_if_fail (wizard->steps == NULL); wizard->steps = ygtk_steps_new(); - gtk_widget_show (wizard->steps); - GtkWidget *box = gtk_event_box_new(); // so that expose affects only this window - gtk_container_add (GTK_CONTAINER (box), wizard->steps); - gtk_widget_show (box); - ygtk_wizard_set_information_widget (wizard, box, TRUE); - ygtk_wizard_set_information_expose_hook (wizard->steps, &wizard->steps->allocation); + ygtk_wizard_set_information_widget (wizard, wizard->steps); } void ygtk_wizard_enable_tree (YGtkWizard *wizard) Modified: trunk/gtk/src/ygtkwizard.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.h?rev=60631&r… ============================================================================== --- trunk/gtk/src/ygtkwizard.h (original) +++ trunk/gtk/src/ygtkwizard.h Sat Jan 30 11:42:05 2010 @@ -99,8 +99,8 @@ GHashTable *steps_ids; /* gchar* -> guint */ /* For layout */ - GtkWidget *m_menu_box, *m_title, *m_contents_box, *m_contents_buttons_box, - *m_control_bar, *m_child, *m_pane, *m_buttons; + GtkWidget *m_menu_box, *m_title, *m_contents_box, *m_control_bar, + *m_child, *m_pane, *m_buttons, *m_info_box; /* Widgets we need to access. */ GtkWidget *tree_view, *steps, *menu, @@ -131,8 +131,7 @@ // convinience method that removes the current child, if set, and swaps it by // the given one (you may pass NULL to just remove current child) void ygtk_wizard_set_child (YGtkWizard *wizard, GtkWidget *widget); -void ygtk_wizard_set_information_widget (YGtkWizard *wizard, GtkWidget *widget, gboolean full_side); -void ygtk_wizard_set_information_expose_hook (GtkWidget *widget, GtkAllocation *alloc); +void ygtk_wizard_set_information_widget (YGtkWizard *wizard, GtkWidget *widget); void ygtk_wizard_set_control_widget (YGtkWizard *wizard, GtkWidget *widget); // commands -- 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] r60630 - in /branches/tmp/bubli/ncurses: Makefile.am Makefile.cvs RPMNAME configure.in configure.in.in libyui-ncurses.spec.in yast2-ncurses.spec.in
by kmachalkova＠svn.opensuse.org 29 Jan '10

29 Jan '10

Author: kmachalkova Date: Fri Jan 29 18:35:22 2010 New Revision: 60630 URL: http://svn.opensuse.org/viewcvs/yast?rev=60630&view=rev Log: Files in, files out Added: branches/tmp/bubli/ncurses/Makefile.am branches/tmp/bubli/ncurses/configure.in branches/tmp/bubli/ncurses/libyui-ncurses.spec.in Removed: branches/tmp/bubli/ncurses/configure.in.in branches/tmp/bubli/ncurses/yast2-ncurses.spec.in Modified: branches/tmp/bubli/ncurses/Makefile.cvs branches/tmp/bubli/ncurses/RPMNAME Added: branches/tmp/bubli/ncurses/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses/Makefile.am… ============================================================================== --- branches/tmp/bubli/ncurses/Makefile.am (added) +++ branches/tmp/bubli/ncurses/Makefile.am Fri Jan 29 18:35:22 2010 @@ -0,0 +1,19 @@ +# +# Makefile.am for libyui +# + +SUBDIRS = src + +AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip + +EXTRA_DIST = MAINTAINER RPMNAME VERSION + +$(RPMNAME)-$(VERSION).tar.bz2: dist-bzip2 + +package-local: $(RPMNAME)-$(VERSION).tar.bz2 + rm -f package/$(RPMNAME)-*.tar.bz2 + rm -f package/*~ + rm -f package/*.bak + mv $(RPMNAME)-$(VERSION).tar.bz2 package/ + +package: package-local Modified: branches/tmp/bubli/ncurses/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses/Makefile.cv… ============================================================================== --- branches/tmp/bubli/ncurses/Makefile.cvs (original) +++ branches/tmp/bubli/ncurses/Makefile.cvs Fri Jan 29 18:35:22 2010 @@ -2,16 +2,17 @@ # Makefile.cvs # -LIB = $(shell y2tool get-lib) +#LIB = $(shell y2tool get-lib) PREFIX = /usr configure: all - ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) + ./configure --prefix=$(PREFIX) all: - y2tool y2autoconf - y2tool y2automake + aclocal + autoconf + autoheader autoreconf --force --install install: configure Modified: branches/tmp/bubli/ncurses/RPMNAME URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses/RPMNAME?rev… ============================================================================== --- branches/tmp/bubli/ncurses/RPMNAME (original) +++ branches/tmp/bubli/ncurses/RPMNAME Fri Jan 29 18:35:22 2010 @@ -1 +1 @@ -yast2-ncurses +libyui-ncurses Added: branches/tmp/bubli/ncurses/configure.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses/configure.i… ============================================================================== --- branches/tmp/bubli/ncurses/configure.in (added) +++ branches/tmp/bubli/ncurses/configure.in Fri Jan 29 18:35:22 2010 @@ -0,0 +1,48 @@ +AC_INIT(src/YNCursesUI.h) + +VERSION=`cat ./VERSION` +RPMNAME=`cat ./RPMNAME` + +AM_INIT_AUTOMAKE(libyui-ncurses, $VERSION) +AM_CONFIG_HEADER(config.h) + +AC_DISABLE_STATIC + +AC_PROG_CXX +AC_PROG_LIBTOOL +AM_PROG_LIBTOOL + +AC_PREFIX_DEFAULT(/usr) + +CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes" + +CXXFLAGS="${CXXFLAGS} -std=gnu++0x -DHAVE_CXX0X -Wall -Wformat=2 -Wnon-virtual-dtor" + +AC_CHECK_HEADER([ncursesw/curses.h], + [CXXFLAGS="$CXXFLAGS -I/usr/include/ncursesw"]) + +AC_LANG_PUSH([C++]) +AC_CHECK_HEADERS([yui/YWidgetFactory.h], + [], + [AC_MSG_ERROR([libyui headers not found - install package libyui-devel!])]) +AC_LANG_POP + +docdir=\${prefix}/share/doc/packages/libyui +includedir=\${prefix}/include/ +pkgconfigdir=\${libdir}/pkgconfig +plugindir=\${libdir}/yui/ +themedir=\${prefix}/share/YaST2/theme/ + +AC_SUBST(VERSION) +AC_SUBST(RPMNAME) +AC_SUBST(docdir) +AC_SUBST(includedir) +AC_SUBST(pkgconfigdir) +AC_SUBST(plugindir) +AC_SUBST(themedir) + +AC_OUTPUT( + Makefile + src/Makefile + package/libyui-ncurses.spec:libyui-ncurses.spec.in +) Added: branches/tmp/bubli/ncurses/libyui-ncurses.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses/libyui-ncur… ============================================================================== --- branches/tmp/bubli/ncurses/libyui-ncurses.spec.in (added) +++ branches/tmp/bubli/ncurses/libyui-ncurses.spec.in Fri Jan 29 18:35:22 2010 @@ -0,0 +1,50 @@ +@HEADER-COMMENT@ + + +@HEADER@ +Group: System/YaST +License: GPL v2 or later +BuildRequires: doxygen dejagnu gcc-c++ yast2-devtools +BuildRequires: libxcrypt-devel blocxx-devel ncurses-devel + +Summary: YaST2 - Character Based User Interface +Provides: yast2_ui +Requires: glibc-locale +BuildRequires: yast2-libyui-devel >= 2.18.4 +Requires: yast2-libyui >= 2.18.4 +Recommends: yast2-ncurses-pkg +%description +This package contains the character based (ncurses) user interface +component for YaST2. + +@HEADER-DEVEL@ +Summary: YaST2 - Character Based User Interface +Requires: yast2-ncurses >= 2.16.15 +Requires: ncurses-devel yast2-libyui-devel + +%description devel +This package contains the character based (ncurses) user interface +component for YaST2. + +@PREP@ + +@BUILD@ + +@INSTALL@ +rm $RPM_BUILD_ROOT/@plugindir@/libpy2ncurses.la + +@CLEAN@ + +%files +%defattr (-, root, root) +%dir %{_libdir}/YaST2 +%dir @plugindir@ +@plugindir@/libpy2ncurses.so.* + +%files devel +%defattr (-, root, root) +@plugindir@/libpy2ncurses.so +%dir @includedir@ +@includedir@/ncurses/ +%doc @docdir@ + -- 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] r60629 - in /branches/tmp/bubli/qt: libyui-qt.spec.in libyui.qt.spec.in package/libyui-qt.changes package/libyui.qt.changes
by kmachalkova＠svn.opensuse.org 29 Jan '10

29 Jan '10

Author: kmachalkova Date: Fri Jan 29 18:17:15 2010 New Revision: 60629 URL: http://svn.opensuse.org/viewcvs/yast?rev=60629&view=rev Log: a poradne Added: branches/tmp/bubli/qt/libyui-qt.spec.in branches/tmp/bubli/qt/package/libyui-qt.changes Removed: branches/tmp/bubli/qt/libyui.qt.spec.in branches/tmp/bubli/qt/package/libyui.qt.changes Added: branches/tmp/bubli/qt/libyui-qt.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/qt/libyui-qt.spec.i… ============================================================================== --- branches/tmp/bubli/qt/libyui-qt.spec.in (added) +++ branches/tmp/bubli/qt/libyui-qt.spec.in Fri Jan 29 18:17:15 2010 @@ -0,0 +1,90 @@ +@HEADERCOMMENT@ + + +@HEADER@ +Group: System/YaST +License: GPL v2 or later +BuildRequires: docbook-xsl-stylesheets +BuildRequires: doxygen +BuildRequires: libdrm-devel +BuildRequires: libjpeg-devel +BuildRequires: libxcrypt-devel +BuildRequires: libxslt +BuildRequires: perl-XML-Writer +BuildRequires: libqt4-devel +BuildRequires: sgml-skel +BuildRequires: update-desktop-files +BuildRequires: cmake + +Summary: YaST2 - Graphical User Interface +BuildRequires: yast2-devtools >= 2.16.3 +#YIconLoader +BuildRequires: yast2-libyui-devel >= 2.18.8 +Requires: yast2-libyui >= 2.18.8 +Requires: yast2_theme >= 2.16.1 +Provides: yast2_ui +Provides: y2base:/usr/lib/YaST2/servers/qt +Provides: y2base:/usr/lib/YaST2/plugin/libpy2qt.so.2 +Provides: yast2-ui-qt yast2-ui-qt-devel +Obsoletes: yast2-ui-qt yast2-ui-qt-devel +Provides: y2qt +Obsoletes: y2qt +Recommends: yast2-qt-pkg + +%description +One of several user interfaces available for YaST2, based on Qt and the +X Window System. + +%package devel +Summary: Development package for graphical YaST2 user interfaces +Group: Development/Libraries/YaST +Requires: yast2-qt = %{version} +Requires: yast2-libyui-devel + +%description devel +Shared libs for the YaST2 Qt user interface. + +This is not necessary for developing YaST2 scripts (YCP) -- the YaST2 +main program (y2bignfat) will load those components on demand as +plug-ins. Those plug-ins, however, are available within the base +package (yast2-ui-qt). + +You only need this package if you really wish to develop new binaries +for YaST2 and dynamically link those against the YaST2 Qt user +interface rather than loading the respective plug-ins. + +%prep +%setup + +%build +mkdir build +cd build +export CFLAGS="$RPM_OPT_FLAGS" +export CXXFLAGS="$CFLAGS" +cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DLIB=%{_lib} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=1 \ + .. +make %{?jobs:-j %jobs} VERBOSE=1 + +%install +cd build +make install DESTDIR=$RPM_BUILD_ROOT +cd .. + +%clean +rm -rf "$RPM_BUILD_ROOT" + + +%files +%defattr (-, root, root) +%dir %_libdir/YaST2 +%_libdir/YaST2/plugin/ +%_prefix/share/YaST2/data/lang_fonts + +%files devel +%defattr (-, root, root) +%_includedir/* + +%changelog Added: branches/tmp/bubli/qt/package/libyui-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/qt/package/libyui-q… ============================================================================== --- branches/tmp/bubli/qt/package/libyui-qt.changes (added) +++ branches/tmp/bubli/qt/package/libyui-qt.changes Fri Jan 29 18:17:15 2010 @@ -0,0 +1,3491 @@ +------------------------------------------------------------------- +Tue Dec 8 17:34:42 CET 2009 - tgoettlicher(a)suse.de + +- fixed bnc #542830: mouse cursor is busy in context menu + +------------------------------------------------------------------- +Mon Sep 28 10:41:55 CEST 2009 - tgoettlicher(a)suse.de + +- fixed bnc #532518: YaST in translation +- V 2.18.10 + +------------------------------------------------------------------- +Wed Aug 26 16:57:19 CEST 2009 - aschnell(a)suse.de + +- fixed workaround for shared library reference counting problem + (bnc #530839) +- V 2.18.9 + +------------------------------------------------------------------- +Mon Aug 17 10:01:34 CEST 2009 - tgoettlicher(a)suse.de + +- Applied patch from Frank Schaefer that fixes resizing columns + in tables (bnc #392056) +- V 2.18.8 + +------------------------------------------------------------------- +Thu Jul 30 16:44:19 CEST 2009 - tgoettlicher(a)suse.de + +- Fixed translations in disk usage list (bnc #445716) + +------------------------------------------------------------------- +Thu Jul 30 15:23:36 CEST 2009 - tgoettlicher(a)suse.de + +- Fixed highlighting in search dialog (bnc #506813) + +------------------------------------------------------------------- +Wed Jul 29 12:45:08 CEST 2009 - kmachalkova(a)suse.cz + +- Use YIconLoader to search for icons (add icon search path, use + findIcon in IconButton widget) (FaTe #306356) +- V 2.18.7 + +------------------------------------------------------------------- +Wed Mar 11 15:30:46 CET 2009 - kmachalkova(a)suse.cz + +- Added tooltips to BarGraph widget (duplicate segment text in + a tooltip should the segment become too small) + +------------------------------------------------------------------- +Tue Mar 10 16:40:26 CET 2009 - tgoettlicher(a)suse.de + +- Fixed frame widget min width (bnc #409143) + +------------------------------------------------------------------- +Fri Mar 6 10:35:25 CET 2009 - tgoettlicher(a)suse.de + +- Added context menus +- V 2.18.6 + +------------------------------------------------------------------- +Fri Feb 20 16:18:37 CET 2009 - tgoettlicher(a)suse.de + +- Fixed menubar spacing in wizard (bnc #464088) + +------------------------------------------------------------------- +Thu Feb 19 17:21:48 CET 2009 - tgoettlicher(a)suse.de + +- Fixed bnc #464152: save file dialog asks twice to replace file + when the file exists + +------------------------------------------------------------------- +Sun Feb 15 12:39:06 CET 2009 - coolo(a)suse.de + +- include stdio to fix compilation with gcc 4.4 + +------------------------------------------------------------------- +Mon Feb 9 11:52:34 CET 2009 - sh(a)suse.de + +- Require latest libyui in spec file (API change) +- V 2.18.5 + +------------------------------------------------------------------- +Thu Jan 15 15:30:46 CET 2009 - sh(a)suse.de + +- Workaround for bnc #440101: Double clicks in Oxygen theme + Now no longer using itemActivated signal, but itemDoubleClicked + +------------------------------------------------------------------- +Wed Jan 14 14:38:55 CET 2009 - kmachalkova(a)suse.cz + +- Wizard widget is now derived from QSplitter, replacing former + QFrame. This makes steps/tree panel collapsible (bnc#460739, + bnc#445682) + +------------------------------------------------------------------- +Wed Jan 14 12:50:27 CET 2009 - aschnell(a)suse.de + +- added graph widget +- V 2.18.4 + +------------------------------------------------------------------- +Tue Jan 13 13:57:01 CET 2009 - tgoettlicher(a)suse.de + +- Fixed bnc #445951: Help dialog untranslated + +------------------------------------------------------------------- +Fri Jan 9 16:59:12 CET 2009 - tgoettlicher(a)suse.de + +- Fixed bnc #458975: Text cropped in treewidget +- V 2.18.3 + +------------------------------------------------------------------- +Thu Jan 8 18:58:10 CET 2009 - sh(a)suse.de + +- Fixed bnc #464430 - Root tree items always displayed as open + +------------------------------------------------------------------- +Wed Jan 7 16:44:41 CET 2009 - sh(a)suse.de + +- Fixed bnc #461617: Glyph ArrowLeft / ArrowRight in Arabic + +------------------------------------------------------------------- +Wed Dec 17 15:56:32 CET 2008 - tgoettlicher(a)suse.de + +- Added stylesheet editor +- V 2.18.2 + +------------------------------------------------------------------- +Thu Dec 11 11:26:24 CET 2008 - tgoettlicher(a)suse.de + +- Fixed bnc #438861: Wizard layout problems for Arabic and Hebrew +- V 2.17.25 + +------------------------------------------------------------------- +Wed Dec 10 11:54:03 CET 2008 - sh(a)suse.de + +- Fixed bnc #457682: Qt-UI interprets HTML-tags in wizard title +- Fixed bnc #457691: HTML tags in slide show install log +- V 2.17.24 + +------------------------------------------------------------------- +Fri Nov 28 13:38:04 CET 2008 - sh(a)suse.de + +- Last fix (bnc #449804) breaks yast2 sysconfig editor - use + QHeaderView::ResizeToContents instead of QHeaderView::Stretch +- V 2.17.23 + +------------------------------------------------------------------- +Fri Nov 28 12:12:01 CET 2008 - sh(a)suse.de + +- Fixed bnc #449804: Wizard navigation tree always cuts off items +- V 2.17.22 + +------------------------------------------------------------------- +Wed Nov 26 16:36:25 CET 2008 - coolo(a)suse.de + +- convert the image if it does not need scaling (bnc#449150) +- V 2.17.21 + +------------------------------------------------------------------- +Thu Nov 13 18:19:01 CET 2008 - sh(a)suse.de + +- Updated lang_fonts from mfabian for Hebrew (bnc #444296) +- V 2.17.20 + +------------------------------------------------------------------- +Wed Nov 12 17:59:17 CET 2008 - sh(a)suse.de + +- Infrastructure for better table column widths (bnc #441828) +- V 2.17.19 + +------------------------------------------------------------------- +Fri Nov 7 19:18:25 CET 2008 - sh(a)suse.de + +- Updated lang_fonts from mfabian for bnc #438855 (inst fonts) +- V 2.17.18 + +------------------------------------------------------------------- +Thu Oct 30 11:04:26 CET 2008 - tgoettlicher(a)suse.de + +- Fixed QPainter warnings in YQBusyIndicator +- V 2.17.17 + +------------------------------------------------------------------- +Tue Oct 28 17:14:07 CET 2008 - sh(a)suse.de + +- (coolo) Fixed bnc #427632: Steps in wizard not updated + +------------------------------------------------------------------- +Tue Oct 21 11:51:17 CEST 2008 - tgoettlicher(a)suse.de + +- Fixed default button (bnc #381187) +- V 2.17.16 + +------------------------------------------------------------------- +Tue Oct 21 09:08:21 CEST 2008 - tgoettlicher(a)suse.de + +- Fixed bnc #436716: horizontal scrollbar for TreeWidget + +------------------------------------------------------------------- +Thu Oct 16 19:57:11 CEST 2008 - sh(a)suse.de + +- Fixed bnc #433130: Poor performance in runlevel editor + (Massive performance drop when inserting items into YQTable) +- V 2.17.15 + +------------------------------------------------------------------- +Thu Oct 16 15:59:19 CEST 2008 - sh(a)suse.de + +- Prevent segfaults: Converted QY2Styler to a real singleton + +------------------------------------------------------------------- +Wed Oct 15 15:13:13 CEST 2008 - sh(a)suse.de + +- Beautified symptoms of crash while DBUS restart (bnc #428125) +- Require latest libyui (API change!) +- V 2.17.14 + +------------------------------------------------------------------- +Thu Oct 9 17:52:08 CEST 2008 - sh(a)suse.de + +- Require latest libyui +- V 2.17.13 + +------------------------------------------------------------------- +Wed Oct 1 16:12:26 CEST 2008 - tgoettlicher(a)suse.de + +- Write message to log when client is killed due to X server crash + bnc #414292 + +------------------------------------------------------------------- +Tue Sep 30 16:05:58 CEST 2008 - sh(a)suse.de + +- Move keyboard focus to default button (if there is one) when + a dialog opens + +------------------------------------------------------------------- +Fri Sep 26 15:52:16 CEST 2008 - tgoettlicher(a)suse.de + +- Fixed bnc #418443: Yast modules windows have no title +- V 2.17.12 + +------------------------------------------------------------------- +Wed Sep 24 18:32:11 CEST 2008 - sh(a)suse.de + +- Improved robustness against already-deleted widgets (bnc #421794) +- Require latest libyui +- V 2.17.11 + +------------------------------------------------------------------- +Wed Sep 17 12:37:32 CEST 2008 - sh(a)suse.de + +- Fixed bnc #399502: Layout for right-to-left languages +- Fixed bnc #396360: Last column in Table widget is too far right +- V 2.17.10 + +------------------------------------------------------------------- +Fri Sep 12 18:41:26 CEST 2008 - sh(a)suse.de + +- Reduced minimum size of YQTree to reasonable value + +------------------------------------------------------------------- +Fri Sep 12 13:52:32 CEST 2008 - sh(a)suse.de + +- More graceful "Can't open display" error handling: + Now probing display before any Qt calls to give clear error msg +- Require latest libyui +- V 2.17.9 + +------------------------------------------------------------------- +Thu Sep 11 15:46:58 CEST 2008 - sh(a)suse.de + +- Added highlighting of currently selected widget in DialogSpy +- Require latest libyui +- V 2.17.8 + +------------------------------------------------------------------- +Tue Sep 9 17:07:32 CEST 2008 - sh(a)suse.de + +- Call DialogSpy upon Ctrl-Shift-Alt-Y + for interactive introspection of the topmost dialog +- V 2.17.7 + +------------------------------------------------------------------- +Tue Sep 9 16:23:12 CEST 2008 - sh(a)suse.de + +- Fixed reentrance problems in event handling: + Moved event handling from YQUI to YQDialog + +------------------------------------------------------------------- +Fri Aug 22 18:52:11 CEST 2008 - sh(a)suse.de + +- Check environment variables for button order: + $DESKTOP_SESSION + $WINDOWMANAGER + $Y2_BUTTON_ORDER + +- Added command line options (overriding the env vars above): + --gnome-button-order + --kde-button-order + +- V 2.17.6 + +------------------------------------------------------------------- +Thu Aug 21 15:28:14 CEST 2008 - sh(a)suse.de + +- Added YQButtonBox widget (fate #303446) +- Dropped obsolete YFrameBuffer + +------------------------------------------------------------------- +Wed Aug 13 17:20:23 CEST 2008 - tgoettlicher(a)suse.de + +- Fixed YQCheckBoxFrame child widget enablement initially wrong (bnc #403126) + +------------------------------------------------------------------- +Wed Aug 13 16:02:56 CEST 2008 - tgoettlicher(a)suse.de + +- Fixed wrong icon when using several wizards (#411579) + +------------------------------------------------------------------- +Tue Aug 5 11:14:01 CEST 2008 - tgoettlicher(a)suse.de + +- V 2.17.5 + +------------------------------------------------------------------- +Tue Aug 5 10:54:04 CEST 2008 - tgoettlicher(a)suse.de + +- Fixed bnc #409612: popup menu during installation becomes + hidden because of NULL parent + +------------------------------------------------------------------- +Tue Jul 29 11:21:53 CEST 2008 - tgoettlicher(a)suse.de + +- Fixed sorting in Table (bnc #399206) + +------------------------------------------------------------------- +Tue Jul 15 19:13:57 CEST 2008 - sh(a)suse.de + +- Implemented fate #303492: Multi selection for table widget +- V 2.17.4 + +------------------------------------------------------------------- +Fri Jul 11 15:30:23 CEST 2008 - sh(a)suse.de + +- Fixed bnc #403852: MultiLineEdit doesn't take HTML as plain text + +------------------------------------------------------------------- +Tue Jul 8 18:59:47 CEST 2008 - sh(a)suse.de + +- Enable keyboard shortcuts for YQDumbTab widgets (fate #304890) +- V 2.17.3 + +------------------------------------------------------------------- +Tue Jul 8 15:42:54 CEST 2008 - sh(a)suse.de + +- Fixed massive performance drop when inserting many (3000+) + YQSelectionBox items +- V 2.17.2 + +------------------------------------------------------------------- +Tue Jun 24 11:55:26 CEST 2008 - tgoettlicher(a)suse.de + +- prevent that the user deselects all radiobutton items + +------------------------------------------------------------------- +Tue Jun 17 19:00:03 CEST 2008 - sh(a)suse.de + +- Fixed bnc #400477: yast2 runlevel takes 40s to switch view +- V 2.17.1 + +------------------------------------------------------------------- +Thu Jun 5 13:28:52 CEST 2008 - sh(a)suse.de + +- (coolo) fixed segfault in QY2Styler with secondary wizards during + installation: bnc #381755, bnc #391856, bug #391947 + (tgoettlicher fixed bnc #397083: help dialog disappears when + "Help" button is multiple pushed +- V 2.16.54 + +------------------------------------------------------------------- +Tue Jun 3 13:42:19 CEST 2008 - tgoettlicher(a)suse.de + +- limited bar width in disk usage list to 100% + +------------------------------------------------------------------- +Thu May 29 17:57:08 CEST 2008 - sh(a)suse.de + +- Fixed bnc #394525: Proxy settings don't work in installer +- Fixed bnc #379622: CheckBoxFrame( `opt(`invertAutoEnable) ) +- V 2.16.53 + +------------------------------------------------------------------- +Wed May 28 15:47:57 CEST 2008 - sh(a)suse.de + +- Fixed bnc #393040: Keyboard shortcuts in main dialogs broken +- V 2.16.52 + +------------------------------------------------------------------- +Mon May 26 18:39:31 CEST 2008 - coolo(a)suse.de + +- more font updates from Mike + +------------------------------------------------------------------- +Mon May 26 15:45:00 CEST 2008 - sh(a)suse.de + +- Fixed bnc #393848: Missing translations in YQWizard help window +- V 2.16.51 + +------------------------------------------------------------------- +Fri May 23 17:04:41 CEST 2008 - tgoettlicher(a)suse.de + +- V 2.16.50 + +------------------------------------------------------------------- +Tue May 20 11:50:53 CEST 2008 - sh(a)suse.de + +- Changed `opt(`warncolor) text color back to black (bnc #384452) + +------------------------------------------------------------------- +Sat May 17 18:19:22 CEST 2008 - coolo(a)suse.de + +- fix font handling during installation (bnc#357258) + +----------------------------------------------------------------------- +Fri May 16 17:10:03 CEST 2008 - tgoettlicher(a)suse.de + +- Adjust QY2ListView to enable scrolling in wizard (bnc #391048) + +------------------------------------------------------------------- +Fri May 16 13:58:11 CEST 2008 - tgoettlicher(a)suse.de + +- Fixed YUINoDialogException caused by popup windows +- V 2.16.48 + +------------------------------------------------------------------- +Thu May 15 14:48:30 CEST 2008 - sh(a)suse.de + +- Moved most XPM icons and YQIconPool to yast2-qt-pkg: + They are only needed for PackageSelector and related +- V 2.16.47 + +------------------------------------------------------------------- +Thu May 15 12:55:49 CEST 2008 - tgoettlicher(a)suse.de + +- Fixed focus of popups (#bnc 384905) + +------------------------------------------------------------------- +Wed May 14 16:15:19 CEST 2008 - sh(a)suse.de + +- Fixed bnc #386446: Help button still English +- V 2.16.46 + +------------------------------------------------------------------- +Wed May 14 14:51:29 CEST 2008 - tgoettlicher(a)suse.de + +- Improved help popup's usability (bnc #388592) + +------------------------------------------------------------------- +Tue May 13 15:53:53 CEST 2008 - tgoettlicher(a)suse.de + +- Fixed setText of YQComboBox (bnc #384713) + +------------------------------------------------------------------- +Thu May 8 17:33:16 CEST 2008 - tgoettlicher(a)suse.de + +- automatically scroll to selected item of YQSelectionBox (bnc #388173) + +------------------------------------------------------------------- +Thu May 8 16:23:05 CEST 2008 - tgoettlicher(a)suse.de + +- fixed strange selection behavior of YQTable (bnc #384658) + +------------------------------------------------------------------- +Thu May 8 11:59:11 CEST 2008 - sh(a)suse.de + +- Don't let Qt override YSelectionBox selection + +------------------------------------------------------------------- +Wed Apr 30 17:43:03 CEST 2008 - sh(a)suse.de + +- Fixed bnc #379904: More than one radio button checked +- V 2.16.45 + +------------------------------------------------------------------- +Tue Apr 29 17:05:40 CEST 2008 - sh(a)suse.de + +- Fixed bnc #383672 - Busy cursor in file dialogs +- V 2.16.44 + +------------------------------------------------------------------- +Mon Apr 28 14:22:24 CEST 2008 - dmacvicar(a)suse.de + +- Make transactions concept better visible: use new + set of icons from jimmac + (feature #302003) +- 2.16.43 + +------------------------------------------------------------------- +Sat Apr 26 07:11:22 CEST 2008 - coolo(a)suse.de + +- resubmit clean tar + +------------------------------------------------------------------- +Thu Apr 24 10:57:23 CEST 2008 - kmachalkova(a)suse.cz + +- Make YQWizard menus work again - Qt4 uses triggered() signal + instead of activated() (bnc#367796) +- V 2.16.42 + +------------------------------------------------------------------- +Fri Apr 18 17:21:53 CEST 2008 - sh(a)suse.de + +- Fixed bnc #374851: YQMultiProgressMeter integer overflow + +------------------------------------------------------------------- +Thu Apr 17 10:47:49 CEST 2008 - coolo(a)suse.de + +- update the steps status (bnc#379539) + +------------------------------------------------------------------- +Wed Apr 16 14:05:15 CEST 2008 - coolo(a)suse.de + +- reduce steps flickering +- V 2.16.41 + +------------------------------------------------------------------- +Tue Apr 15 13:35:22 CEST 2008 - coolo(a)suse.de + +- fix wizards in wizards +- V 2.16.40 + +------------------------------------------------------------------- +Mon Apr 14 16:44:41 CEST 2008 - sh(a)suse.de + +- Added new UI capability YQApplication::hasWizardDialogSupport() +- V 2.16.39 + +------------------------------------------------------------------- +Sun Apr 13 19:50:21 CEST 2008 - coolo(a)suse.de + +- use only working area on seconday wizards +- V 2.16.38 + +------------------------------------------------------------------- +Fri Apr 11 18:18:38 CEST 2008 - sh(a)suse.de + +- Reverted sub-wizard changes - seems to be a dead end +- V 2.16.37 + +------------------------------------------------------------------- +Thu Apr 10 19:53:05 CEST 2008 - sh(a)suse.de + +- Added basic support for docked sub-wizards + +------------------------------------------------------------------- +Fri Apr 4 11:10:11 CEST 2008 - tgoettlicher(a)suse.de + +- fixed frame style of rich text widget (bnc #369685) + +------------------------------------------------------------------- +Thu Apr 3 18:09:18 CEST 2008 - sh(a)suse.de + +- Build-Require latest libyui +- V 2.16.33 + +------------------------------------------------------------------- +Wed Apr 2 11:46:12 CEST 2008 - tgoettlicher(a)suse.de + +- fixed table widget sorting (bnc #376046) + +------------------------------------------------------------------- +Mon Mar 31 17:21:00 CEST 2008 - tgoettlicher(a)suse.de + +- fixed sort by column for table widget (bnc #374679) + +------------------------------------------------------------------- +Mon Mar 31 16:04:59 CEST 2008 - tgoettlicher(a)suse.de + +- fixed right and center for table widget (bnc #357693) + +------------------------------------------------------------------- +Tue Mar 25 12:28:53 CET 2008 - jsrain(a)suse.cz + +- changed textdomain to "qt" + +------------------------------------------------------------------- +Wed Mar 19 15:52:33 CET 2008 - coolo(a)suse.de + +- fix YTable performance (bnc #372316) + +------------------------------------------------------------------- +Wed Mar 19 15:21:01 CET 2008 - dmacvicar(a)suse.de + +- fix taking screenshots (bnc #361995) + +------------------------------------------------------------------- +Tue Mar 11 17:20:52 CET 2008 - sh(a)suse.de + +- Fixed bnc #358522: query CurrentItem for DumbTab is broken + +------------------------------------------------------------------- +Mon Mar 10 17:15:06 CET 2008 - sh(a)suse.de + +- Implemented bnc #364887: Hotkey to dump widget tree + (It's now Ctrl-Shift-Alt-T) + +------------------------------------------------------------------- +Fri Mar 7 12:14:08 CET 2008 - sh(a)suse.de + +- Fixed bnc #357607: OpenItems property of Tree widget is broken +- V 2.16.33 + +------------------------------------------------------------------- +Thu Mar 6 14:47:04 CET 2008 - sh(a)suse.de + +- Fixed bnc #357620: Setting current item broken for tree and table + +------------------------------------------------------------------- +Tue Mar 4 17:53:00 CET 2008 - sh(a)suse.de + +- Fixed segfault if SelectionBox value is set to nil (bnc #363251) +- Fixed segfault if user clicks in empty area of a SelectionBox +- V 2.16.32 + +------------------------------------------------------------------- +Wed Feb 27 14:20:40 CET 2008 - sh(a)suse.de + +- Removed obsolete Unicode fonts (now in separate pkg gnu-unifonts) +- V 2.16.31 + +------------------------------------------------------------------- +Wed Feb 27 13:07:24 CET 2008 - coolo(a)suse.de + +- fix build on %_lib == lib64 + +------------------------------------------------------------------- +Wed Feb 27 11:07:41 CET 2008 - coolo(a)suse.de + +- adding a require to the devel package + +------------------------------------------------------------------- +Tue Feb 26 18:32:14 CET 2008 - sh(a)suse.de + +- Use new cmake support from libyui +- No longer depend on yast2-core etc. for cmake +- V 2.16.30 + +------------------------------------------------------------------- +Tue Feb 26 08:51:51 CET 2008 - coolo(a)suse.de + +- fix build without ycp +- hopefully fix popups for real +- fix -auto-fonts +- V 2.16.29 + +------------------------------------------------------------------- +Mon Feb 25 17:07:12 CET 2008 - sh(a)suse.de + +- Don't just call exit(1) if there is no qt_pkg plug-in (bnc #363958) + +------------------------------------------------------------------- +Thu Feb 21 10:20:07 CET 2008 - coolo(a)suse.de + +- fix slider layout (bnc#363395) +- V 2.16.28 + +------------------------------------------------------------------- +Mon Feb 18 18:37:19 CET 2008 - sh(a)suse.de + +- Qt-UI now no longer depends on libycp or liby2 (Y2Component...) +- V 2.16.27 + +------------------------------------------------------------------- +Sat Feb 16 20:03:42 CET 2008 - coolo(a)suse.de + +- fix filelist of devel + +------------------------------------------------------------------- +Fri Feb 15 08:35:48 CET 2008 - coolo(a)suse.de + +- split out yast2-qt-pkg + +------------------------------------------------------------------- +Fri Feb 8 17:26:17 CET 2008 - tgoettlicher(a)suse.de + +- Made popup dialogs modal + +------------------------------------------------------------------- +Fri Feb 8 15:05:31 CET 2008 - tgoettlicher(a)suse.de + +- Changed time format in TimeField to yyyy-mm-dd (bnc #359630) +- V 2.16.25 + +------------------------------------------------------------------- +Fri Feb 4 16:01:22 CET 2008 - tgoettlicher(a)suse.de + +- Adapted askForSaveFilename to qt4 api (bnc #357998) +- V 2.16.24 + +------------------------------------------------------------------- +Fri Feb 4 13:48:16 CET 2008 - tgoettlicher(a)suse.de + +- Fixed Bug #340898: Selecting specific repository out of sync +- V 2.16.23 + +------------------------------------------------------------------- +Fri Feb 1 15:48:55 CET 2008 - sh(a)suse.de + +- Moved event handling from Y(Q)UI to Y(Q)Dialog +- V 2.16.22 + +------------------------------------------------------------------- +Fri Feb 1 11:38:13 CET 2008 - tgoettlicher(a)suse.de + +- Run solver on startup of PackageManager in online update mode + (bug #340898) +- V 2.16.21 + +------------------------------------------------------------------- +Fri Feb 1 08:19:07 CET 2008 - coolo(a)suse.de + +- fix file list + +------------------------------------------------------------------- +Thu Jan 31 15:27:06 CET 2008 - sh(a)suse.de + +- Simplified dialog handling +- V 2.16.20 + +------------------------------------------------------------------- +Wed Jan 30 09:28:00 CET 2008 - coolo(a)suse.de + +- recreate tar to fix build + +------------------------------------------------------------------- +Tue Jan 29 20:03:56 CET 2008 - sh(a)suse.de + +- YCP-less event handling +- V 2.16.19 + +------------------------------------------------------------------- +Wed Jan 23 18:35:29 CET 2008 - sh(a)suse.de + +- Use new YCP-less logging (part 1) +- V 2.16.18 + +------------------------------------------------------------------- +Wed Jan 16 14:32:01 CET 2008 - coolo(a)suse.de + +- disable patch again now that yast2-core is ready + +------------------------------------------------------------------- +Mon Jan 14 21:14:12 CET 2008 - coolo(a)suse.de + +- make it build without new yast2-core to get the pkg fixes + +------------------------------------------------------------------- + +Mon Jan 14 12:44:00 CET 2008 - tgoettlicher(a)suse.de + +- V 2.16.17 + +------------------------------------------------------------------- + +Fri Jan 11 16:47:00 CET 2008 - tgoettlicher(a)suse.de + +- BusyIndicator facelift +- V 2.16.16 + +------------------------------------------------------------------- + +Thu Jan 10 17:28:00 CET 2008 - tgoettlicher(a)suse.de + +- added BusyIndicator widget (fate #302559) +- V 2.16.15 + +------------------------------------------------------------------- +Thu Jan 10 14:47:56 CET 2008 - coolo(a)suse.de + +- find a brute force way to make patterns selectable +- V 2.16.14 + +------------------------------------------------------------------- +Wed Jan 9 14:59:05 CET 2008 - sh(a)suse.de + +- V 2.16.13 + +------------------------------------------------------------------- +Sat Dec 29 14:25:32 CET 2007 - coolo(a)suse.de + +- some fixes in the package selector + +------------------------------------------------------------------- +Fri Dec 21 18:38:53 CET 2007 - coolo(a)suse.de + +- support `CurrentItem in timezone widget +- fix combobox semantic +- V 2.16.12 + +------------------------------------------------------------------- +Wed Dec 19 19:21:42 CET 2007 - coolo(a)suse.de + +- give the help popup a search function +- support non-padding widgets for backgrounds +- V 2.16.11 + +------------------------------------------------------------------- +Wed Dec 19 09:13:02 CET 2007 - coolo(a)suse.de + +- fix file list + +------------------------------------------------------------------- +Tue Dec 18 17:48:29 CET 2007 - coolo(a)suse.de + +- implement timezone widget +- moved theming to theme package +- V 2.16.10 + +------------------------------------------------------------------- +Wed Dec 12 15:04:34 CET 2007 - coolo(a)suse.de + +- merged yast2-qt4 into yast2-qt +- V 2.16.9 + +------------------------------------------------------------------- +Tue Dec 11 16:34:56 CET 2007 - sh(a)suse.de + +- Fixed bug #346129: Too many wizard steps if UTF-8 chars used + +------------------------------------------------------------------- +Mon Dec 10 18:39:34 CET 2007 - sh(a)suse.de + +- Moved file and directory dialogs from YQUI to YQApplication: + - askForExistingDirectory() + - askForExistingFile() + - askForSaveFile() +- V 2.16.8 + +------------------------------------------------------------------- +Wed Dec 5 20:41:15 CET 2007 - sh(a)suse.de + +- Moved main dialog handling out of YQUI and into a new class + YQMainWinDock +- Don't proactively grab keyboard focus any longer (bug #246934) +- V 2.16.7 + +------------------------------------------------------------------- +Wed Dec 5 11:13:05 CET 2007 - tgoettlicher(a)suse.de + +- Changed conflict dialog to better fit to sat solver's output + +------------------------------------------------------------------- +Tue Dec 4 14:57:50 CET 2007 - tgoettlicher(a)suse.de + +- Fixed popup windows without decorations (#345825) + +------------------------------------------------------------------- +Fri Nov 30 17:20:49 CET 2007 - sh(a)suse.de + +- Migrated YQDialog to mod-ui +- V 2.16.6 + +------------------------------------------------------------------- +Tue Nov 27 19:08:00 CET 2007 - sh(a)suse.de + +- Moved all YCP related code out of YQWizard +- V 2.16.5 + +------------------------------------------------------------------- +Tue Nov 27 11:39:21 CET 2007 - tgoettlicher(a)suse.de + +- V 2.16.4 + +------------------------------------------------------------------- +Mon Nov 26 12:09:03 CET 2007 - tgoettlicher(a)suse.de + +- Prevent changed size of partition widget when packageselector's + window size is changed + +------------------------------------------------------------------- +Fri Nov 23 15:55:31 CET 2007 - tgoettlicher(a)suse.de + +- fixed unneeded help icon in "please wait" window (#202818) + +------------------------------------------------------------------- +Thu Nov 22 21:13:01 CET 2007 - sh(a)suse.de + +- Moved setLanguage() and font handling from YQUI to YQApplication + +------------------------------------------------------------------- +Tue Nov 20 18:03:00 CET 2007 - sh(a)suse.de + +- Prevent self-generated events in YQDumbTab +- Fixed cut-off YQInputField labels +- V 2.16.3 + +------------------------------------------------------------------- +Mon Nov 19 13:44:00 CET 2007 - tgoettlicher(a)suse.de + +- fixed ignored arch selection in package selector (#304966) +- V 2.16.2 + +------------------------------------------------------------------- +Fri Nov 16 16:36:13 CET 2007 - sh(a)suse.de + +- Merged mod-ui branch to trunk +- V 2.16.1 + +------------------------------------------------------------------- +Mon Sep 3 18:13:36 CEST 2007 - sh(a)suse.de + +- Limit pkg popups to screen size even with substandard resolutions + (bug #300632: dialogs too big on PS3) +- V 2.15.16 + +------------------------------------------------------------------- +Wed Aug 29 14:38:24 CEST 2007 - tgoettlicher(a)suse.de + +- wizard shows titlebar depending on existence of title-bar-gradient.png +- r40568 +- V 2.15.15 + +------------------------------------------------------------------- +Mon Aug 27 16:14:15 CEST 2007 - sh(a)suse.de + +- Fixed bug #297637: Repository names not shown in Package Manager +- V 2.15.14 + +------------------------------------------------------------------- +Thu Aug 23 13:25:08 CEST 2007 - kmachalkova(a)suse.cz + +- Display repository name instead of product name in package selector + (#296782) + +------------------------------------------------------------------- +Wed Aug 15 13:02:44 CEST 2007 - jsuchome(a)suse.cz + +- Messages back from proofreading +- 2.15.12 + +------------------------------------------------------------------- +Fri Aug 10 17:53:20 CEST 2007 - mvidner(a)suse.cz + +- Finished integrating Feature #120292, UI as a namespace callable + from yast2-*-bindings. +- 2.15.11 + +------------------------------------------------------------------- +Wed Aug 8 09:27:30 CEST 2007 - kmachalkova(a)suse.cz + +- Added text referring to whereabouts of the license text to + license agreement popup (FaTE #302018) +- V 2.15.10 + +------------------------------------------------------------------- +Mon Aug 6 13:55:08 CEST 2007 - mvidner(a)suse.cz + +- Adapted to changes in yast2-core needed for making UI callable from + yast2-*-bindings. +- 2.15.7.1 + +------------------------------------------------------------------- +Fri Aug 3 12:42:01 CEST 2007 - sh(a)suse.de + +- Fixed bug #295485: Text cut off in MultiSelectionBox + (in repository names in that bug) +- Fixed bug #189267: Unlocalized text in online update +- V 2.17.9 + +------------------------------------------------------------------- +Thu Aug 2 17:34:26 CEST 2007 - sh(a)suse.de + +- V 2.17.8 +- Fate #302052: Restrict patches view to show only update stack + patches if there are any + +------------------------------------------------------------------- +Tue Jul 24 10:59:06 CEST 2007 - sh(a)suse.de + +- Fixed bug #285915: Can't cancel package search +- Consistent naming scheme: inst source -> repository + +------------------------------------------------------------------- +Tue Jul 17 10:12:25 CEST 2007 - kmachalkova(a)suse.cz + +- Require new libzypp (>= 3.11.8) +- Changes from libzypp refactoring branches merges back to trunk + +------------------------------------------------------------------- +Tue Jul 10 11:55:26 CEST 2007 - sh(a)suse.de + +- Don't over-simplify whitespace (replacing newlines with blanks) + in dependency problem reports +- V 2.15.7 + +------------------------------------------------------------------- +Fri Jul 6 14:03:15 CEST 2007 - ma(a)suse.de + +- Adapt to new libzypp. Installation sources were replaced by + repositories. +- V 2.15.6 + +------------------------------------------------------------------- +Thu Jun 21 17:40:44 CEST 2007 - adrian(a)suse.de + +- fix changelog entry order + +------------------------------------------------------------------- +Mon Apr 23 15:33:26 CEST 2007 - sh(a)suse.de + +- Load qt_pkg plugin for PatternSelector widget, too +- V 2.15.5 + +------------------------------------------------------------------- +Mon Apr 16 15:44:13 CEST 2007 - sh(a)suse.de + +- Added qt_pkg plugins to file list +- V 2.15.4 + +------------------------------------------------------------------- +Fri Apr 13 17:50:18 CEST 2007 - sh(a)suse.de + +Merged mod-ui branch changes back to trunk (r37143:37466): + +- Reorganized source directory layout: + - Header files now in same directory as .cc files + - Moved package selection related sources to separate subdir src/pkg + +- Load package selection stuff upon demand as plugin + (saves 2 MB VmRSS if no PackageSelector needed) + [see also Fate #302119] + +- V 2.15.3 + +------------------------------------------------------------------- +Mon Mar 26 14:11:50 CEST 2007 - sh(a)suse.de + +- Fixed bug #251215: "Save screenshot to" not translated + +------------------------------------------------------------------- +Fri Mar 9 15:36:01 CET 2007 - sh(a)suse.de + +- PackageSelector/PatternSelector no longer use zypp::transactResKind() + to emulate what a real solver run might do, now always does a real + solver run which is no longer painfully slow with recent + solver improvements. +- Auto-solving on by default in PackageSelector +- V 2.15.2 + +------------------------------------------------------------------- +Tue Feb 20 15:02:11 CET 2007 - sh(a)suse.de + +- Fixed bug #239829 (again): Show patch version in patches list +- V 2.15.1 + +------------------------------------------------------------------- +Thu Feb 15 16:46:24 CET 2007 - sh(a)suse.de + +- Fixed bug #148469: Exclude -debuginfo and -devel pkgs on demand +- V 2.14.7 + +------------------------------------------------------------------- +Tue Feb 6 17:38:34 CET 2007 - mvidner(a)suse.cz + +- Prefixized font patch check. + +------------------------------------------------------------------- +Thu Feb 1 14:37:29 CET 2007 - sh(a)suse.de + +- Merged SLE10-SP1 branch changes back to trunk: + - Fixed bug #239829: Show patch name (ID) in patches list + +- V 2.14.6 + +------------------------------------------------------------------- +Wed Jan 31 14:22:26 CET 2007 - sh(a)suse.de + +- Merged SLE10-SP1 branch changes back to trunk: + - Fixed bug #187322: Ignore solver errors in patch mode + at first solver run + - Fixed bug #232522: Added inst src URL to pkg versions view + - Fixed bug #152997: Install progress icons + +- V 2.14.5 + +------------------------------------------------------------------- +Wed Jan 24 14:53:55 CET 2007 - sh(a)suse.de + +- Merged SLE10-SP1 branch changes back to trunk: + - Fixed bug #218669: Broken UTF8 chars in pkg to text file export + - Fixed bug #227409: Add installed packages to text file export + - Fixed bug #229368: comparison with string literal + - Added Qt-UI support for feature #301178: verify installed system + - Added CheckBoxFrame widget for feature #5673 + - Implemented feature #300729: Saving of patterns and packages + +- V 2.14.4 + +------------------------------------------------------------------- +Thu Nov 23 16:50:28 CET 2006 - sh(a)suse.de + +- Fixed bug #223416: Updated patches not visible in default view +- V 2.14.3 + +------------------------------------------------------------------- +Tue Nov 21 12:05:34 CET 2006 - sh(a)suse.de + +- V 2.14.2 +- Fixed bug #222505 (left-handed mouse) + +------------------------------------------------------------------- +Fri Nov 10 13:39:07 CET 2006 - sh(a)suse.de + +- Merged SLE-10-SP1-Branch to trunk (r31627:34245) +- V 2.14.1 + +------------------------------------------------------------------- +Tue Oct 31 17:32:00 CET 2006 - sh(a)suse.de + +- Improved bugfix for bug #183735 (display only relevant patches + by default): Also display patches that are satisfied, but + not installed yet + +- Fixed bug #189134: Show description of initial patch / pkg + +- Override patch category tooltips with "Dependencies broken" or + "Dependencies satisfied" in patch list + +- V 2.13.73 + +------------------------------------------------------------------- +Mon Oct 30 18:11:50 CET 2006 - sh(a)suse.de + +- Consistent handling of isSatisfied and isBroken for bug #173488 +- Added real "isSatisfied" icon +- V 2.13.72 + +------------------------------------------------------------------- +Fri Oct 27 13:43:42 CEST 2006 - sh(a)suse.de + +- Added missing icon to dist tarball +- V 2.13.71 + +------------------------------------------------------------------- +Thu Oct 26 18:57:05 CEST 2006 - sh(a)suse.de + +- Fixed bug #162164: pattern detection does not work +- Fixed bug #173488: Status satisfied for a patch is displayed like + uninstalled +- V 2.13.70 + +------------------------------------------------------------------- +Thu Oct 26 17:26:25 CEST 2006 - sh(a)suse.de + +- Fixed bug #183735 - YOU should display only relevant patches by + default +- V 2.13.69 + +------------------------------------------------------------------- +Wed Oct 25 17:35:07 CEST 2006 - sh(a)suse.de + +- Implemented feature #300756: Added support for resolver test + case generation (PackageSelector -> "Extras" menu) +- V 2.13.68 + +------------------------------------------------------------------- +Tue Oct 24 18:29:08 CEST 2006 - sh(a)suse.de + +- Implemented feature #120142: View installed products +- Implemented feature #301229: Fold hidden patterns into parents +- V 2.13.67 + +------------------------------------------------------------------- +Thu Oct 12 17:32:16 CEST 2006 - sh(a)suse.de + +- Implemented feature #301222: Easy access to updating all packages +- V 2.13.66 + +------------------------------------------------------------------- +Wed Oct 4 17:27:21 CEST 2006 - sh(a)suse.de + +- Fixed bug #208694: Allow deleting patches + (only the patch meta data will be deleted, packages will remain + the same!) + +- V 2.13.65 + +------------------------------------------------------------------- +Tue Oct 3 13:58:43 CEST 2006 - jsrain(a)suse.cz + +- added missing files to Makefile.am +- 2.13.64 + +------------------------------------------------------------------- +Fri Sep 29 17:53:59 CEST 2006 - sh(a)suse.de + +- V 2.13.63 +- Fixed bug #205059: CapsLock warning in password fields + +------------------------------------------------------------------- +Fri Sep 22 16:59:31 CEST 2006 - sh(a)suse.de + +- Allow pattern categories to be collapsed +- V 2.13.62 + +------------------------------------------------------------------- +Wed Sep 13 16:42:01 CEST 2006 - sh(a)suse.de + +- Applied patch from Ricardo Cruz <rpmcruz(a)clix.pt> + for new UI::Beep() built-in + +------------------------------------------------------------------- +Thu Aug 3 15:23:52 CEST 2006 - mvidner(a)suse.cz + +- Added a configure-time check for the X font directory. +- 2.13.61 + +------------------------------------------------------------------- +Tue Jun 27 15:09:34 CEST 2006 - sh(a)suse.de + +- Fixed bug #188018: Patch description: Text in angle brackets + +------------------------------------------------------------------- +Wed May 31 18:49:40 CEST 2006 - sh(a)suse.de + +- V 2.13.60 +- Fixed bug #179679: Untranslated text in file dialogs + +------------------------------------------------------------------- +Wed May 24 17:47:15 CEST 2006 - sh(a)suse.de + +- V 2.13.59 +- Added support for licenses for patches (bug #174476) + +------------------------------------------------------------------- +Thu May 18 10:51:01 CEST 2006 - kkaempf(a)suse.de + +- adapt to libzypp 1.0.0 api +- require libzypp >= 1.0.0 +- V 2.13.58 + +------------------------------------------------------------------- +Wed May 10 15:05:21 CEST 2006 - sh(a)suse.de + +- Set package to "update" or "install" if user selects a different + version in the "Versions" tab of the package selector + (workaround for bug #164487: can't downgrade using a patch) +- V 2.13.57 + +------------------------------------------------------------------- +Tue May 9 16:15:03 CEST 2006 - sh(a)suse.de + +- Fixed bug #173122: Easter egg crashes the installation +- V 2.13.56 + +------------------------------------------------------------------- +Tue May 9 14:36:44 CEST 2006 - sh(a)suse.de + +- Fixed bug #173865: No "automatic changes" dialog upon "Accept" + in Qt package selector +- V 2.13.55 + +------------------------------------------------------------------- +Thu May 4 12:32:46 CEST 2006 - sh(a)suse.de + +- V 2.13.54 +- Messages back from proofreading + +------------------------------------------------------------------- +Fri Apr 28 12:20:54 CEST 2006 - sh(a)suse.de + +- V 2.13.53 +- Disabled patches view in package selector (non-YOU-mode) + to avoid problems with kernel and ZYPP patches + (patches view is still available upon F2 keypress) + +------------------------------------------------------------------- +Tue Apr 25 14:33:53 CEST 2006 - sh(a)suse.de + +- Fixed bug #168904: Changing "all in this list" status in pkg lists + takes too long +- V 2.13.52 + +------------------------------------------------------------------- +Tue Apr 25 13:44:39 CEST 2006 - schubi(a)suse.de + +- Bug 167565 - UI: deselecting one preselected pattern deselects everything + Added transactResKind( zypp::ResTraits<zypp::Product>::kind ) in solveResolvableCollections + +------------------------------------------------------------------- +Mon Apr 24 13:22:50 CEST 2006 - sh(a)suse.de + +- V 2.13.51 +- Add installed pkg to SelMapper to fix "update problems" list + (required for pkgs that are not available and marked auto-delete) + +------------------------------------------------------------------- +Thu Apr 20 18:18:14 CEST 2006 - sh(a)suse.de + +- V 2.13.50 +- Re-implemented list of problematic packages during update + +------------------------------------------------------------------- +Thu Apr 20 17:15:49 CEST 2006 - sh(a)suse.de + +- Ask for confirmation to abandon changes if a language is changed + +------------------------------------------------------------------- +Thu Apr 20 12:47:39 CEST 2006 - mvidner(a)suse.cz + +- Catch exceptions when calling package management code (#166278). +- Adapted for libzypp in a nonstandard prefix. +- 2.13.49 + +------------------------------------------------------------------- +Tue Apr 18 17:39:43 CEST 2006 - sh(a)suse.de + +- V 2.13.48 +- Added infrastructure to fix bug #164869: Duplicate "Accept" button + in pattern selector + +------------------------------------------------------------------- +Thu Apr 13 13:47:50 CEST 2006 - schubi(a)suse.de + +- Bug 164365 - build 906: Deselecting a selection, all packages are still selected + +------------------------------------------------------------------- +Fri Apr 7 19:10:30 CEST 2006 - sh(a)suse.de + +- v 2.13.45 + +- Fixed bug #163827: Special package licenses not shown in weird cases + +- Fixed inconsistent propagation of installation status of packages + that belong to selections, patterns, languages etc. + +------------------------------------------------------------------- +Tue Apr 4 17:59:20 CEST 2006 - sh(a)suse.de + +- V 2.13.45 +- Fixed bug #161400: Switching between alternative patterns +- Migrated from Resolver::transactResObject() to + Resolver::transactResKind() for all higher-level YQPkg*Lists + +------------------------------------------------------------------- +Fri Mar 31 22:02:38 CEST 2006 - sh(a)suse.de + +- V 2.13.44 +- Fixed bug #161860: Pattern selector layout out of proportion + +------------------------------------------------------------------- +Fri Mar 31 18:34:56 CEST 2006 - sh(a)suse.de + +- Fixed bug #152700: Automatic changes dialog displays garbage + +------------------------------------------------------------------- +Wed Mar 29 21:20:47 CEST 2006 - sh(a)suse.de + +- V 2.13.43 +- Fixed bug #121872: segfault at program end if no Qt style defined + +------------------------------------------------------------------- +Wed Mar 29 12:08:01 CEST 2006 - sh(a)suse.de + +- V 2.13.42 +- Fixed broken umlaut characters in pattern categories + +------------------------------------------------------------------- +Tue Mar 28 16:15:20 CEST 2006 - sh(a)suse.de + +- V 2.13.41 +- Show language specific packages in "languages" filter + +------------------------------------------------------------------- +Mon Mar 27 15:44:05 CEST 2006 - sh(a)suse.de + +- V 2.13.40 +- Fixed bug #156590: No way to reset ignored dependency problems + +------------------------------------------------------------------- +Thu Mar 23 18:46:11 CET 2006 - sh(a)suse.de + +- V 2.13.39 +- Calculate and display patches total download size on the fly + +------------------------------------------------------------------- +Thu Mar 23 16:29:21 CET 2006 - sh(a)suse.de + +- V 2.13.38 +- Enable auto-solving for patches +- Support for multi-arch patches: Prevent duplicate entries + in pkg list + +------------------------------------------------------------------- +Thu Mar 23 13:17:39 CET 2006 - sh(a)suse.de + +- Fall back to search view if no multiple sources + +------------------------------------------------------------------- +Thu Mar 23 12:08:31 CET 2006 - sh(a)suse.de + +- V 2.13.37 +- Enable starting up package selector in inst sources mode: Use + `opt(`instSourcesMode) + +------------------------------------------------------------------- +Wed Mar 22 17:49:52 CET 2006 - sh(a)suse.de + +- V 2.13.36 +- Small fixes + +------------------------------------------------------------------- +Mon Mar 20 09:11:43 CET 2006 - visnov(a)suse.cz + +- V 2.13.35 +- adapt for latest libzypp + +------------------------------------------------------------------- +Thu Mar 16 12:54:29 CET 2006 - sh(a)suse.de + +- Fixed bug #158576: 'install -> all in this list' does not work + for patterns + +------------------------------------------------------------------- +Wed Mar 15 19:06:18 CET 2006 - sh(a)suse.de + +- V 2.13.34 +- Display patch content (packages and scripts) +- Moved solving for single current item to base class + +------------------------------------------------------------------- +Tue Mar 14 18:12:15 CET 2006 - sh(a)suse.de + +- V 2.13.33 +- Fixed yast2-qt part of bug #151834: third party licenses + (Acrobat reader, flash player, ...) + +------------------------------------------------------------------- +Tue Mar 14 15:21:16 CET 2006 - sh(a)suse.de + +- V 2.13.32 +- Ported disk usage in package selector to ZYPP + +------------------------------------------------------------------- +Fri Mar 10 20:12:21 CET 2006 - sh(a)suse.de + +- V 2.13.31 +- First version of patches view that can display patch contents + +------------------------------------------------------------------- +Fri Mar 10 15:18:57 CET 2006 - sh(a)suse.de + +- V 2.13.30 +- Fixed bug #155799: Qt package selector does not recognize newer + packages as newer +- Display patch category in patches view + + +------------------------------------------------------------------- +Thu Mar 9 18:28:55 CET 2006 - sh(a)suse.de + +- V 2.13.29 +- First (still crude) version of patches view for ZYPP +- Activate "patches" filter view in package selector upon F2 key + +------------------------------------------------------------------- +Wed Mar 8 18:33:27 CET 2006 - sh(a)suse.de + +- V 2.13.28 +- Added "file list" view to package selector +- Added "change log" view to package selector + +------------------------------------------------------------------- +Tue Mar 7 17:27:25 CET 2006 - sh(a)suse.de + +- V 2.13.27 +- Allow searching in RPM requires / provides tags + +------------------------------------------------------------------- +Mon Mar 6 18:34:50 CET 2006 - sh(a)suse.de + +- V 2.13.26 +- Ported "dependencies" details view to ZYPP +- No longer translating RPM tags "provides", ... + +------------------------------------------------------------------- +Mon Mar 6 14:31:56 CET 2006 - sh(a)suse.de + +- Ported "languages" filter view to ZYPP + (no lang-specific packages displayed yet, missing in libzypp) + +------------------------------------------------------------------- +Fri Mar 3 17:00:34 CET 2006 - sh(a)suse.de + +- V 2.13.25 +- Ported RPM groups filter view to ZYPP + +------------------------------------------------------------------- +Thu Mar 2 18:37:06 CET 2006 - sh(a)suse.de + +- V 2.13.24 +- Display product name (if available) for package versions + in "versions" details view + +------------------------------------------------------------------- +Thu Mar 2 18:12:12 CET 2006 - sh(a)suse.de + +- Yet another performance boost for "installation sources" + filter view (~120 millisec per click instead of ~1.2 sec) + +------------------------------------------------------------------- +Thu Mar 2 12:17:39 CET 2006 - sh(a)suse.de + +- Performance boost for "installation sources" filter view (factor 10) +- V 2.13.23 + +------------------------------------------------------------------- +Tue Feb 28 19:19:35 CET 2006 - sh(a)suse.de + +- Installation sources filter view migrated to ZYPP +- V 2.13.22 + +------------------------------------------------------------------- +Tue Feb 28 14:52:33 CET 2006 - sh(a)suse.de + +- YQPkgVersionsView migrated to ZYPP + +------------------------------------------------------------------- +Tue Feb 28 13:35:59 CET 2006 - sh(a)suse.de + +- Removed beta warning upon insistence of our project managers + despite the fact that the package manager GUI is still broken + beyond recognition +- V 2.13.21 + +------------------------------------------------------------------- +Mon Feb 27 16:40:29 CET 2006 - sh(a)suse.de + +- Fixed bug #153035 +- Fixed bug #153032 +- V 2.13.20 + +------------------------------------------------------------------- +Mon Feb 27 15:35:23 CET 2006 - sh(a)suse.de + +- Re-enabled TABOO and PROTECTED + +------------------------------------------------------------------- +Wed Feb 22 18:10:14 CET 2006 - sh(a)suse.de + +- V 2.13.19 +- Removing patterns and selections now works as well as adding them + +------------------------------------------------------------------- +Tue Feb 21 16:39:02 CET 2006 - sh(a)suse.de + +- V 2.13.18 +- use new way to enable/disable autodocs by mvidner + +------------------------------------------------------------------- +Tue Feb 21 12:08:32 CET 2006 - sh(a)suse.de + +- sort category-less patterns before any category +- no tree indentation for patterns +- disable closing pattern categories +- disable selecting pattern categories + +------------------------------------------------------------------- +Mon Feb 20 18:47:44 CET 2006 - sh(a)suse.de + +- V 2.13.17 +- Added pattern categories +- Patterns now use their sort order field + +------------------------------------------------------------------- +Fri Feb 17 18:56:08 CET 2006 - sh(a)suse.de + +- Added pattern icons to pattern selector + +------------------------------------------------------------------- +Fri Feb 17 16:06:21 CET 2006 - sh(a)suse.de + +- Don't install and distribute autodocs (#151370) + +------------------------------------------------------------------- +Thu Feb 16 17:57:28 CET 2006 - sh(a)suse.de + +- V 2.13.15 + +- Use patterns in PatternSelector if there are any, + but fall back to selections if there are none + (and fall back to detailed selection if there are no selections, + either) + +------------------------------------------------------------------- +Thu Feb 16 17:31:41 CET 2006 - sh(a)suse.de + +- First real pattern filter view + +------------------------------------------------------------------- +Wed Feb 15 19:08:14 CET 2006 - sh(a)suse.de + +- V 2.13.14 + +- Fixed package description formatting + +- Migrated "automatic changes" dialog in PkgSel to ZYPP + +- Workaround for incomplete selections packages handling + +- Migrated pkg description popup (for hyperlinks) in PkgSel to ZYPP + + +------------------------------------------------------------------- +Tue Feb 14 19:14:42 CET 2006 - sh(a)suse.de + +Package selector changes: + +- Display selections filter view only if there are any selections + +- Display packages that belong to a selection in selections filter + +- Propagate selection status change to corresponding packages + +- Display separate columns for installed and available package only + if there are any installed packages + +- "Technical Details" view now (almost) complete + +------------------------------------------------------------------- +Tue Feb 14 11:25:02 CET 2006 - sh(a)suse.de + +- Applied mfabian's fix for bug #132577: SuSE Serif Italic font + +------------------------------------------------------------------- +Fri Feb 10 20:26:15 CET 2006 - sh(a)suse.de + +- V 2.13.13 +- "Installation summary" filter view ported to ZYPP +- Re-enabled "Cancel" button (saveState / restoreState) in PkgSel +- Code cleanup + +------------------------------------------------------------------- +Wed Feb 8 21:46:53 CET 2006 - sh(a)suse.de + +- ZYPP resolver integrated and working +- "Search" view working in package selector +- V 2.13.12 + +------------------------------------------------------------------- +Wed Feb 8 16:19:11 CET 2006 - kkaempf(a)suse.de + +- Initial libzypp integration +- V 2.13.11 + +------------------------------------------------------------------- +Fri Feb 3 11:11:09 CET 2006 - visnov(a)suse.cz + +- Temporary fix for build +- V 2.13.10 + +------------------------------------------------------------------- +Thu Feb 2 14:02:54 CET 2006 - sh(a)suse.de + +- Fixed bug #145189 (untranslated text): Added "Textdomain" + +------------------------------------------------------------------- +Tue Jan 31 11:20:19 CET 2006 - sh(a)suse.de + +- Fixed extra qualification +- V 2.13.9 + +------------------------------------------------------------------- +Mon Jan 30 19:12:41 CET 2006 - sh(a)suse.de + +- V 2.13.8 +- Implemented YQPatternSelector (feature #129) + +------------------------------------------------------------------- +Thu Jan 12 17:08:21 CET 2006 - sh(a)suse.de + +- V 2.13.7 +- Now starting xterm in background upon Ctrl-Alt-Shift-X + +------------------------------------------------------------------- +Wed Jan 4 19:24:05 CET 2006 - sh(a)suse.de + +- V 2.13.5 +- Implemented feature #3476: Left-handed mouse during installation + + now asking the user if he wants his mouse buttons switched + if he clicks the right mouse button on a push button or in a + selection box + +------------------------------------------------------------------- +Wed Jan 4 17:33:25 CET 2006 - sh(a)suse.de + +- Open xterm upon Ctrl-Shift-Alt-X hotkey (for debugging in inst-sys) + +------------------------------------------------------------------- +Tue Dec 20 17:08:25 CET 2005 - sh(a)suse.de + +- V 2.13.4 +- Fixed bug #114193: YQComboBox doesn't send valueChanged event + +------------------------------------------------------------------- +Fri Nov 18 16:09:44 CET 2005 - sh(a)suse.de + +- V 2.13.3 +- Added new secondary filter view "summary" to inst src filter view + +------------------------------------------------------------------- +Thu Nov 17 17:57:40 CET 2005 - sh(a)suse.de + +- V 2.13.2 +- Added secondary filter views to installation sources filter view: + - All Packages + - RPM groups + - Search + + +------------------------------------------------------------------- +Wed Nov 16 14:57:56 CET 2005 - sh(a)suse.de + +- V 2.13.2 +- New filter view in package selector: installation sources + +------------------------------------------------------------------- +Tue Oct 25 11:40:55 CEST 2005 - sh(a)suse.de + +- V 2.13.1 +- Merged aj's patch to fix stricter gcc4 warnings + +------------------------------------------------------------------- +Fri Sep 9 16:43:24 CEST 2005 - sh(a)suse.de + +- Fixed bug #114072: custom package selection lost + No longer offering the user to delete his base selection in + dependency problem dialog if he set a selection to "taboo" + the base selection depends upon +- V 2.12.12 + +------------------------------------------------------------------- +Thu Aug 25 20:26:28 CEST 2005 - sh(a)suse.de + +- V 2.12.11 + +------------------------------------------------------------------- +Thu Aug 25 17:26:04 CEST 2005 - mfabian(a)suse.de + +- Bugzilla #102978: Japanese TrueType fonts are not used in first + part of installation: fix typo in lang_conf. + +------------------------------------------------------------------- +Thu Aug 18 18:09:47 CEST 2005 - sh(a)suse.de + +- V 2.12.10 +- Now using llunak's updated qxembed.{cc,h} to fix bug #46495: + Keyboard focus problems with YaST2 embedded into KControl + +------------------------------------------------------------------- +Thu Jul 21 13:54:11 CEST 2005 - sh(a)suse.de + +- Now using `opt(`hvstretch) to restore old YQWizard layout behaviour + (centering content by default) +- V 2.12.9 + +------------------------------------------------------------------- +Wed Jul 20 15:30:48 CEST 2005 - sh(a)suse.de + +- Prevent segfault if there is no steps heading in the side panel +- V 2.12.8 + +------------------------------------------------------------------- +Wed Jul 20 10:46:59 CEST 2005 - jsrain(a)suse.cz + +- added libxml2(-devel) to neededforbuild +- 2.12.7 + +------------------------------------------------------------------- +Mon Jul 18 17:12:41 CEST 2005 - sh(a)suse.de + +- Removed @plugindir@/libpy2qt.la from file list in .spec file + (and removing it after "make install") + +------------------------------------------------------------------- +Mon Jul 18 14:42:19 CEST 2005 - sh(a)suse.de + +- Enable font switching upon UI::SetLanguage() +- V 2.12.6 + +------------------------------------------------------------------- +Tue Jul 5 17:35:18 CEST 2005 - sh(a)suse.de + +- Added support for background pixmaps in YQAlignment +- V 2.12.5 + +------------------------------------------------------------------- +Tue Jul 5 11:31:55 CEST 2005 - sh(a)suse.de + +- Fixed alignment in YQDumbTab to properly promote stretchability +- V 2.12.4 + +------------------------------------------------------------------- +Wed Jun 29 16:51:15 CEST 2005 - sh(a)suse.de + +- Support for `opt(`boldFont) for some widgets: + - Label + - ColoredLabel + - CheckBox + - RadioButton + +------------------------------------------------------------------- +Tue Jun 7 17:10:13 CEST 2005 - sh(a)suse.de + +- Reverted wizard button order + (postponed until changes can be done consistently) +- V 2.12.3 + +------------------------------------------------------------------- +Wed Apr 27 19:00:19 CEST 2005 - sh(a)suse.de + +- Added support for icons in selection box widget + +------------------------------------------------------------------- +Thu Apr 21 16:50:01 CEST 2005 - sh(a)suse.de + +- Merged selection_widget_cleanups branch to trunk: + selection widgets can now replace list items + (SelectionBox, ComboBox, MultiSelectionBox, Tree) + +------------------------------------------------------------------- +Wed Apr 6 18:44:24 CEST 2005 - visnov(a)suse.cz + +- gcc4 fixes (missing include and forward declaration fix) +- V 2.12.2 + +------------------------------------------------------------------- +Tue Apr 5 14:38:04 CEST 2005 - sh(a)suse.de + +- Merged 9.3-branch 21937:22910 to to trunk +- V 2.12.1 + +------------------------------------------------------------------- +Tue Mar 22 18:54:04 CET 2005 - sh(a)suse.de + +- Reverting back to old (SL 9.2) auto font sizes for bug #66498 + (Qt inst-sys default font is reverted to 9.2 font, too) +- V 2.11.13 + +------------------------------------------------------------------- +Mon Mar 21 16:24:09 CET 2005 - sh(a)suse.de + +- One more fix for bug #72799: Help/Steps buttons not translated +- V 2.11.12 + +------------------------------------------------------------------- +Wed Mar 16 18:30:09 CET 2005 - sh(a)suse.de + +- Fixed bug #72799: Help/Steps buttons not translated + Added setTextdomain() call to YQWizard +- V 2.11.11 + +------------------------------------------------------------------- +Fri Mar 11 18:11:03 CET 2005 - sh(a)suse.de + +- V 2.11.10 +- Fixed bug #72174: Installation font too small in 800x600 and 1024x768 + +------------------------------------------------------------------- +Fri Mar 11 13:22:52 CET 2005 - sh(a)suse.de + +- Fixed bug #72158: File selection box on screen shots +- V 2.11.9 + +------------------------------------------------------------------- +Fri Mar 4 12:57:32 CET 2005 - sh(a)suse.de + +- Increased calculated font sizes in inst-sys to compensate + for new (much smaller) default font +- Fixed bug #6649: Japanese, Chinese, Korean chars clipped +- V 2.11.8 + +------------------------------------------------------------------- +Wed Feb 23 14:59:49 CET 2005 - sh(a)suse.de + +- Fallback rule for reverse layout for Arabic and Hebrew + even if no translations for predefined Qt dialogs are available + +------------------------------------------------------------------- +Wed Feb 16 16:03:13 CET 2005 - sh(a)suse.de + +- Package selector: Keep width of left pane minimal + +------------------------------------------------------------------- +Mon Feb 14 18:43:11 CET 2005 - sh(a)suse.de + +- V 2.11.7 +- Fixed bug #50468: Segfault if querying current item in empty + MultiSelectionBox while recording macro + +------------------------------------------------------------------- +Fri Feb 4 19:01:54 CET 2005 - sh(a)suse.de + +- Fixed full-size dialog size for multihead + +------------------------------------------------------------------- +Thu Feb 3 18:27:43 CET 2005 - sh(a)suse.de + +- Added empty space below wizard side panel upon explicit request +- V 2.11.6 + +------------------------------------------------------------------- +Mon Jan 31 17:09:00 CET 2005 - sh(a)suse.de + +- V 2.11.5 +- Added "Release Notes" button + functions to YQWizard + +------------------------------------------------------------------- +Mon Jan 24 16:59:35 CET 2005 - sh(a)suse.de + +- Minor usability changes in wizard layout +- Added "add -debuginfo packages" menu action in pkg manager + +------------------------------------------------------------------- +Wed Dec 8 17:04:21 CET 2004 - sh(a)suse.de + +- Added hotkey to switch to a special high-contrast color + palette for vision impaired users: Shift-F4 + +------------------------------------------------------------------- +Wed Nov 17 13:53:29 CET 2004 - sh(a)suse.de + +- Improved YQWizard debugLabel() readability +- V 2.11.3 + +------------------------------------------------------------------- +Fri Nov 5 17:41:40 CET 2004 - sh(a)suse.de + +- Changed save_y2logs key from plain F8 to Shift-F8 + +------------------------------------------------------------------- +Thu Nov 4 19:13:47 CET 2004 - sh(a)suse.de + +- Added F8 hotkey to save y2logs +- V 2.11.2 + +------------------------------------------------------------------- +Tue Nov 2 14:05:39 CET 2004 - nashif(a)suse.de + +- Added new special widgets: YDate / YTime + +------------------------------------------------------------------- +Thu Oct 28 19:38:43 CEST 2004 - sh(a)suse.de + +- Fixed bug #46805: Error handling for TextEntry and ComboBox + with restricted ValidChars + +------------------------------------------------------------------- +Thu Oct 28 15:42:46 CEST 2004 - sh(a)suse.de + +- Fixed bug #43389: Tristate checkbox doesn't send events properly + +------------------------------------------------------------------- +Thu Oct 28 13:48:21 CEST 2004 - sh(a)suse.de + +- Fixed bug #43410: Timer signals close screen shot file selector + +------------------------------------------------------------------- +Mon Oct 25 17:04:43 CEST 2004 - sh(a)suse.de + +- Bumped version to 2.11.0 for 9.3 + +------------------------------------------------------------------- +Wed Oct 6 16:47:30 CEST 2004 - sh(a)suse.de + +- Dropped support for hardcoded images "suseheader" and "yast2" + Use path names and/or the wizard instead! + +------------------------------------------------------------------- +Fri Oct 1 13:46:37 CEST 2004 - sh(a)suse.de + +- Fixed bug #46598: YOU layout broken with 800x600 default size + Now using 0.7*screen_size as default size +- V 2.10.12 + +------------------------------------------------------------------- +Wed Sep 29 17:03:54 CEST 2004 - sh(a)suse.de + +- V 2.10.11 +- Fixed bug #45111: Use arrow with clock as busy cursor + +------------------------------------------------------------------- +Mon Sep 27 16:14:49 CEST 2004 - sh(a)suse.de + +- V 2.10.10 +- (abauer) fixed bug #44926: Xinerama full screen handling +- (mfabian) fixed unicode fonts + +------------------------------------------------------------------- +Fri Sep 24 17:10:48 CEST 2004 - sh(a)suse.de + +- V 2.10.9 +- Fixed bug #45772: software manager segfaults + Now catching WM_CLOSE events only for dialogs managed by the UI + +------------------------------------------------------------------- +Fri Sep 24 15:51:50 CEST 2004 - sh(a)suse.de + +- V 2.10.8 +- Fixed bug #46047: Table columns always too wide in Qt package selection + +------------------------------------------------------------------- +Wed Sep 22 16:35:06 CEST 2004 - sh(a)suse.de + +- Changed yast2-devel-packages to yast2-core-devel-packages + in neededforbuild + +------------------------------------------------------------------- +Wed Sep 15 17:23:25 CEST 2004 - sh(a)suse.de + +- V 2.10.7 +- Added support for ProgressBar with huge numbers (long long) +- Exchanged Unicode font (mfabian) + +------------------------------------------------------------------- +Fri Sep 10 15:07:28 CEST 2004 - sh(a)suse.de + +- V 2.10.6 +- Fixes for right-to-left languages (Arabic/Hebrew) + +------------------------------------------------------------------- +Mon Sep 6 11:49:01 CEST 2004 - sh(a)suse.de + +- V 2.10.5 +- Applied patch for bug #44145: Package EULA + +------------------------------------------------------------------- +Fri Sep 3 15:10:58 CEST 2004 - sh(a)suse.de + +- V 2.10.4 +- Fixed bug #44331: Sysconfig editor unusable from kcontrol + +------------------------------------------------------------------- +Wed Sep 1 18:23:27 CEST 2004 - sh(a)suse.de + +- V 2.10.3 +- Fixed bug #44579: YMultiProgressBar integer overflow + +------------------------------------------------------------------- +Thu Aug 26 18:05:06 CEST 2004 - sh(a)suse.de + +- V 2.10.2 +- Removed obsolete /usr/include/y2qt/ directory from files list + +------------------------------------------------------------------- +Mon Aug 23 16:03:28 CEST 2004 - sh(a)suse.de + +- V 2.10.1 +- New widget: MultiProgressMeter + +------------------------------------------------------------------- +Thu Jul 8 11:29:51 CEST 2004 - sh(a)suse.de + +- Fixed bug #42846: Installing unneeded header files + +------------------------------------------------------------------- +Tue Jul 6 16:44:00 CEST 2004 - sh(a)suse.de + +- Added "Install all matching -devel packages" to pkg selection + (mmj's idea) + +------------------------------------------------------------------- +Tue Jun 29 13:22:58 CEST 2004 - sh(a)suse.de + +- Fixed bug #39227: Over-long pkg status column after pkg search + with no results + +------------------------------------------------------------------- +Mon Jun 28 18:02:48 CEST 2004 - sh(a)suse.de + +- Fixed bug #10524: Textentry label overflow + +------------------------------------------------------------------- +Mon Jun 28 17:29:44 CEST 2004 - sh(a)suse.de + +- Fixed bug #40259: package selection hides search widgets + now using a combo box instead of radio buttons + +------------------------------------------------------------------- +Wed May 26 18:30:28 CEST 2004 - sh(a)suse.de + +- Improved support for low-color (<= 8 bit) displays (bug #40228): + Only use complex wizard pixmaps in high color modes + +------------------------------------------------------------------- +Wed May 12 16:47:32 CEST 2004 - sh(a)suse.de + +- Workaround for bug #35612: Layout problems with 800x600 + Now using smaller fonts in 600x600: 12/14 instead of 14/16 + +------------------------------------------------------------------- +Thu May 6 16:44:10 CEST 2004 - sh(a)suse.de + +- Fixed bug #40071: Obsolete doc about making screen shots + +------------------------------------------------------------------- +Tue May 4 19:07:41 CEST 2004 - sh(a)suse.de + +- Fixed bug #39846: Strange button layout after RestoreBackButton() +- Fixed bug #39692: Wizard tree and menu item IDs returned in wrong encoding +- V 2.9.24 + +------------------------------------------------------------------- +Tue May 4 16:10:22 CEST 2004 - gs(a)suse.de + +- messages from proof reading merged back + +------------------------------------------------------------------- +Fri Apr 30 13:48:01 CEST 2004 - sh(a)suse.de + +- Added new DumbTab widget +- V 2.9.23 + +------------------------------------------------------------------- +Tue Apr 20 14:21:14 CEST 2004 - mvidner(a)suse.cz + +- link against libyui to make loading from Perl work (#39192) +- 2.9.22 + +------------------------------------------------------------------- +Wed Apr 7 16:00:09 CEST 2004 - sh(a)suse.de + +- V 2.9.21 +- Fixed bug #38603: Excessive wizard headings make buttons disappear + +------------------------------------------------------------------- +Tue Apr 6 16:10:39 CEST 2004 - sh(a)suse.de + +- V 2.9.20 +- Fixed bug #36908: Dynamic font sizes during installation +- Fixed bug #37001: Dynamic default window size based on resolution + +------------------------------------------------------------------- +Tue Apr 6 12:23:30 CEST 2004 - sh(a)suse.de + +- V 2.9.19 +- Fixed bug #38216: No shortcut check upon Wizard::Set???Button() + +------------------------------------------------------------------- +Mon Apr 5 18:41:36 CEST 2004 - sh(a)suse.de + +- V 2.9.18 +- Honor environment variable KCMYAST2_CALL for KControl embedding + (no wizard decorations, suppress wizard help) + +------------------------------------------------------------------- +Sun Apr 4 22:19:57 CEST 2004 - adrian(a)suse.de + +- the old (bad) qxembed solution is back .. :/ + +------------------------------------------------------------------- +Fri Apr 2 16:24:00 CEST 2004 - sh(a)suse.de + +- License change to GPL + +------------------------------------------------------------------- +Thu Apr 1 15:35:48 CEST 2004 - sh(a)suse.de + +- V 2.9.16 +- Small fixes for wizard menus + trees + patch verified by cschum + +------------------------------------------------------------------- +Wed Mar 31 16:20:37 CEST 2004 - sh(a)suse.de + +- Fixed bug #37581: Inconsistent widgets in yast2 modules: + Added wizard menus and trees + +------------------------------------------------------------------- +Wed Mar 31 14:19:50 CEST 2004 - sh(a)suse.de + +- Implemented YQWizard::currentTreeSelection() for QueryWidget() + +------------------------------------------------------------------- +Wed Mar 31 13:59:51 CEST 2004 - cschum(a)suse.de + +- Do UTF8 conversion for patch kind tooltips (#37584). + +------------------------------------------------------------------- +Tue Mar 30 20:29:21 CEST 2004 - sh(a)suse.de + +- Added tree to wizard side panel (for autoyast, sysconfig-editor) + +------------------------------------------------------------------- +Mon Mar 22 17:07:52 CET 2004 - sh(a)suse.de + +- Fixed bug #36218: Use YaST icons for YaST windows WM decorations + +------------------------------------------------------------------- +Mon Mar 22 16:46:18 CET 2004 - sh(a)suse.de + +- Fixed bug #35625: Wizard button order + Restored old button order + +------------------------------------------------------------------- +Wed Mar 17 15:07:36 CET 2004 - sh(a)suse.de + +- Fixed bug #35645: Wizard layout looks strange + added HVCenter() around ReplacePoint() + +------------------------------------------------------------------- +Wed Mar 17 00:35:10 CET 2004 - nashif(a)suse.de + +- #if 0 not working hasSmallDecorations completely + +------------------------------------------------------------------- +Tue Mar 16 18:05:46 CET 2004 - sh(a)suse.de + +- Minimal approach fix for bug #33584: Show license agreements +- V 2.9.12 + +------------------------------------------------------------------- +Fri Mar 12 23:25:48 CET 2004 - sh(a)suse.de + +- Enabled shortcut checking for wizard buttons +- Integrated wizard buttons in YQDialog default button handling +- Adapted to const ref fix in libyui for all widget constructors +- V 2.9.11 + +------------------------------------------------------------------- +Thu Mar 11 18:53:02 CET 2004 - sh(a)suse.de + +- Fixed bug #35611: &product; macro not expanded +- Fixed bug #35623: Allow status "protected" for YOU patches + +------------------------------------------------------------------- +Wed Mar 10 15:55:04 CET 2004 - lnussel(a)suse.de + +- New conflict resolution remove referers (#24306) +- V 2.9.10 + +------------------------------------------------------------------- +Wed Mar 10 01:45:27 CET 2004 - sh(a)suse.de + +- New wizard +- V 2.9.9 + +------------------------------------------------------------------- +Thu Mar 4 19:10:51 CET 2004 - sh(a)suse.de + +- Fixed bug #34909: Pkg Mgr "auto-changed pkgs" too large for screen + +------------------------------------------------------------------- +Mon Mar 1 18:39:22 CET 2004 - sh(a)suse.de + +- Save screen shot name if recording macro + +------------------------------------------------------------------- +Sat Feb 28 14:16:49 CET 2004 - sh(a)suse.de + +- V 2.9.5 +- more fixes for improved GUI + +------------------------------------------------------------------- +Tue Feb 10 20:36:34 CET 2004 - arvin(a)suse.de + +- include YQWizard.h in tar-ball + +------------------------------------------------------------------- +Tue Feb 10 18:45:36 CET 2004 - sh(a)suse.de + +- V 2.9.3 +- Merged wizard-widget-branch to HEAD with NI +- Misc small fixes + +------------------------------------------------------------------- +Wed Feb 4 17:42:03 CET 2004 - sh(a)suse.de + +- V 2.9.2 +- New embedding: No more QXEmbed, now via KPart (external program) + +------------------------------------------------------------------- +Thu Jan 29 19:49:03 CET 2004 - sh(a)suse.de + +- Fixed Y2Component handling + +------------------------------------------------------------------- +Tue Jan 27 18:05:43 CET 2004 - sh(a)suse.de + +- V 2.9.1 +- Adapted to new interpreter (visnov(a)suse.cz) +- Adapted to new libyui naming scheme +- Consistent naming scheme + +------------------------------------------------------------------- +Fri Nov 14 11:30:35 CET 2003 - mvidner(a)suse.cz + +- adapted to doxygen + +------------------------------------------------------------------- +Tue Oct 21 16:03:20 CEST 2003 - sh(a)suse.de + +- Fixed bug #32510: Excess initial SelBox SelectionChanged event + +------------------------------------------------------------------- +Fri Oct 10 12:24:00 CEST 2003 - sh(a)suse.de + +- V 2.9.0 + +- Applied cschum's fix for bug #31965: + Wrong encoding in YOU "display raw package info" dialog + +------------------------------------------------------------------- +Fri Sep 19 17:19:13 CEST 2003 - sh(a)suse.de + +- V 2.8.15 + +- Applied visnov's patch to fix bug #5547: IntField value + +- Fixed bug #31015 thanks to llunak: "Solving dependencies" + popup without WM decoreations + +------------------------------------------------------------------- +Wed Sep 17 17:59:15 CEST 2003 - sh(a)suse.de + +- V 2.8.14 + +------------------------------------------------------------------- +Wed Sep 17 15:31:22 CEST 2003 - sh(a)suse.de + +- Fixed bug #30236: Bad fullscreen geometry for some window managers + +------------------------------------------------------------------- +Wed Sep 17 14:55:35 CEST 2003 - sh(a)suse.de + +- Fixed bug #31155: Busy cursor in disk space warning dialog + +------------------------------------------------------------------- +Wed Sep 17 13:44:04 CEST 2003 - sh(a)suse.de + +- Fixed bug #30513: Some PkgMgr popup dialogs too large in 640x480 + +------------------------------------------------------------------- +Wed Sep 17 12:37:02 CEST 2003 - sh(a)suse.de + +- Fixed bug #31047: File selection dialog untranslated + +------------------------------------------------------------------- +Mon Sep 15 16:15:20 CEST 2003 - sh(a)suse.de + +- V 2.8.13 +- Better fix for bug #30500 by jw(a)suse.de + +------------------------------------------------------------------- +Fri Sep 12 16:51:37 CEST 2003 - sh(a)suse.de + +- V 2.8.12 +- Interim fix for bug #30500 + +------------------------------------------------------------------- +Mon Sep 8 15:43:54 CEST 2003 - sh(a)suse.de + +- V 2.8.11 +- Fixed bug #26494: Keyboard focus when embedded into KControl: + Reimported the latest version of QXEmbed + +------------------------------------------------------------------- +Fri Sep 5 17:01:14 CEST 2003 - sh(a)suse.de + +- V 2.8.10 +- Fixed bug #30151: Enable starting pkg mgr in search mode + by default in installed system + +------------------------------------------------------------------- +Thu Sep 4 17:14:49 CEST 2003 - sh(a)suse.de + +- V 2.8.9 +- Fixed bug #29529: Package links (again): + Discard trailing slashes in URL + +------------------------------------------------------------------- +Tue Sep 2 13:39:42 CEST 2003 - sh(a)suse.de + +- Fixed bug #23660: RichText widget eats [Return] + +------------------------------------------------------------------- +Mon Sep 1 18:15:45 CEST 2003 - sh(a)suse.de + +- Fixed bug #27336: Combo box for YOU patch selection +- Fixed bug #27437: Display YOU pre/post scripts / extra files + +------------------------------------------------------------------- +Mon Sep 1 16:34:42 CEST 2003 - sh(a)suse.de + +- V 2.8.8 +- Fixed bug #29529: Package links + +------------------------------------------------------------------- +Fri Aug 29 13:12:22 CEST 2003 - sh(a)suse.de + +- V 2.8.7 +- Fixed bug #29603 - fonts.dir should have %verify in .spec file + +------------------------------------------------------------------- +Wed Aug 27 12:20:32 CEST 2003 - sh(a)suse.de + +- V 2.8.6 +- Removed qApp->unlock() at end of YUIQt constructor: + No more QMutex warning in log + +------------------------------------------------------------------- +Tue Aug 12 15:02:25 CEST 2003 - gs(a)suse.de + +- V 2.8.5 +- merge texts from proofread + +------------------------------------------------------------------- +Tue Jul 15 17:24:50 CEST 2003 - sh(a)suse.de + +- V 2.8.4 +- Lots of internal reworking +- Completely reworked event handling +- No more self-generated events during widget creation / ChangeWidget +- Basic support for right-to-left languages like Arabic / Hebrew + (not perfect yet) + +------------------------------------------------------------------- +Tue Jun 10 15:30:13 CEST 2003 - sh(a)suse.de + +- V 2.8.3 +- Don't build obsolete standalone server component "qt" any more +- Don't install header files: they are not packaged anyway + +------------------------------------------------------------------- +Wed Jun 4 11:25:52 CEST 2003 - sh(a)suse.de + +- V 2.8.2 +- Fixed yet another ambituous overload due to changed Qt lib + +------------------------------------------------------------------- +Fri May 23 11:59:39 CEST 2003 - sh(a)suse.de + +- Fixed build problems due to new Qt lib (ambiguous overload) +- V 2.8.1 + +------------------------------------------------------------------- +Thu Apr 10 15:29:01 CEST 2003 - sh(a)suse.de + +- Fixed bug #25419: Qt PkgMgr shows correct version downgrades red + +------------------------------------------------------------------- +Tue Apr 8 13:39:02 CEST 2003 - sh(a)suse.de + +- Fixed bug #26155: Hiding YOU patches marked for update + +------------------------------------------------------------------- +Wed Mar 12 18:39:26 CET 2003 - sh(a)suse.de + +- Don't force *.sel extension for pkg lists + +------------------------------------------------------------------- +Wed Mar 12 18:16:25 CET 2003 - sh(a)suse.de + +- Enable mounting floppy for pkg list import / export + +------------------------------------------------------------------- +Mon Mar 10 18:57:03 CET 2003 - sh(a)suse.de + +- Fixed bug #25011: Force dependency check on startup in PkgMgr + +------------------------------------------------------------------- +Mon Mar 10 17:37:33 CET 2003 - sh(a)suse.de + +- Update disk usage in PkgMgr after selection dependency solving + +------------------------------------------------------------------- +Mon Mar 10 15:47:59 CET 2003 - sh(a)suse.de + +- V 2.7.15 +- Fixed bug #24981: Can't search for non-ASCII chars in Qt PkgMgr + +------------------------------------------------------------------- +Thu Mar 6 17:49:30 CET 2003 - sh(a)suse.de + +- Fixed bug #24615: "checking dependencies" popup not centered + +------------------------------------------------------------------- +Wed Mar 5 21:47:35 CET 2003 - sh(a)suse.de + +- Fixed bug #24707: QListView tooltips only on right scroll bar + +------------------------------------------------------------------- +Fri Feb 28 17:23:38 CET 2003 - sh(a)suse.de + +- V 2.7.14 + +------------------------------------------------------------------- +Fri Feb 28 16:41:20 CET 2003 - sh(a)suse.de + +- Fixed bug #22513 - language selection loses some key events + +------------------------------------------------------------------- +Fri Feb 28 15:27:58 CET 2003 - sh(a)suse.de + +- Use new 'floppyDevice' parameter for PackageSelector + +------------------------------------------------------------------- +Fri Feb 28 12:34:31 CET 2003 - sh(a)suse.de + +- Fixed bug #24388: YQFrame repaint one pixel off in both dimensions + +------------------------------------------------------------------- +Thu Feb 27 18:03:03 CET 2003 - sh(a)suse.de + +- Fixed bug #24445: Missing status update when importing pkg list + +------------------------------------------------------------------- +Thu Feb 27 17:29:29 CET 2003 - sh(a)suse.de + +- Fixed bug #23368: kcontrol embedding fails if first dialog is a popup + +------------------------------------------------------------------- +Wed Feb 26 19:26:29 CET 2003 - sh(a)suse.de + +- Fixed bug #23574: "Checking dependencies" popup + +------------------------------------------------------------------- +Wed Feb 26 14:48:55 CET 2003 - sh(a)suse.de + +- Fixed bug #24274: Wrong disk initial usage display + +------------------------------------------------------------------- +Tue Feb 25 17:32:45 CET 2003 - sh(a)suse.de + +- Workaround for bug #24088: Leftover busy cursor in root window + +------------------------------------------------------------------- +Tue Feb 25 16:28:13 CET 2003 - sh(a)suse.de + +- Fixed bug #24255: Multiple search in yast2-qt package + +------------------------------------------------------------------- +Tue Feb 25 14:50:18 CET 2003 - sh(a)suse.de + +- Fixed wrong tool tip "this version is installed in your system" + (for all versions) in package manager "versions" view + +------------------------------------------------------------------- +Tue Feb 25 14:35:11 CET 2003 - sh(a)suse.de + +- Fixed bug #23855: Asking for loading Modules does not have focus + +------------------------------------------------------------------- +Mon Feb 24 17:35:40 CET 2003 - sh(a)suse.de + +- V 2.7.13 +- Fixed bug #23923: Can't save package selection + +------------------------------------------------------------------- +Thu Feb 20 17:58:39 CET 2003 - sh(a)suse.de + +- Fixed bug #23868: Handle preformatted notify texts + +------------------------------------------------------------------- +Thu Feb 20 17:14:07 CET 2003 - sh(a)suse.de + +- "Obsolete" dependency conflicts cannot be ignored + (RPM always deletes the obsoleted package) + +------------------------------------------------------------------- +Thu Feb 20 16:38:11 CET 2003 - sh(a)suse.de + +- Fixed bug #23914: Package manager crashes when opening "package" + menu and package list is empty (e.g., empty search result) + +------------------------------------------------------------------- +Wed Feb 19 16:18:06 CET 2003 - sh(a)suse.de + +- Fixed bug #23755: Busy cursor in file selection dialogs + +------------------------------------------------------------------- +Wed Feb 19 14:58:39 CET 2003 - sh(a)suse.de + +- Fixed bug #23654: Window partially invisible + +------------------------------------------------------------------- +Wed Feb 19 11:52:39 CET 2003 - sh(a)suse.de + +- Fixed bug #23770: Always show automatically selected pkgs, even + during base installation + +------------------------------------------------------------------- +Tue Feb 18 11:47:27 CET 2003 - sh(a)suse.de + +- New "protected" icons by Ken + +------------------------------------------------------------------- +Mon Feb 17 17:45:11 CET 2003 - sh(a)suse.de + +- V 2.7.12 +- Fixed broken "protected" actions +- Fixed preliminary "protected" icons + +------------------------------------------------------------------- +Fri Feb 14 15:40:11 CET 2003 - sh(a)suse.de + +- V 2.7.11 +- Fixed bug #23577: Popups can be clicked into the background + +------------------------------------------------------------------- +Fri Feb 14 12:33:35 CET 2003 - sh(a)suse.de + +- Fixed bug #23650: Confusion about "Export List to Text File": + Moved this function from "Extras" menu to package list context + menu + +- Disabled pkg status "protected" for selections / YOU patches + +------------------------------------------------------------------- +Thu Feb 13 15:48:21 CET 2003 - sh(a)suse.de + +- Suppress "YaST2@linux" window title (bug #23584) + +------------------------------------------------------------------- +Thu Feb 13 13:18:23 CET 2003 - sh(a)suse.de + +- Improved default button behaviour +- Removed junk logging + +------------------------------------------------------------------- +Mon Feb 10 17:23:28 CET 2003 - sh(a)suse.de + +- V 2.7.10 +- New package status "protected" + +------------------------------------------------------------------- +Mon Feb 10 15:30:27 CET 2003 - sh(a)suse.de + +- V 2.7.9 +- Don't force Unicode font +- Show different icons in package manager for autoinstall etc. by + selection and autoinstall etc. by dependencies + +------------------------------------------------------------------- +Fri Jan 31 18:11:03 CET 2003 - sh(a)suse.de + +- V 2.7.8 +- Adapted to changed PkgDep::RelInfo API + +------------------------------------------------------------------- +Wed Jan 29 17:11:07 CET 2003 - sh(a)suse.de + +- V 2.7.7 +- User messages back from proofreading +- Show auto-packages on demand in package manager + +------------------------------------------------------------------- +Mon Jan 27 17:10:32 CET 2003 - sh(a)suse.de + +- V 2.7.6 +- Added "rpm-devel" to "neededforbuild" +- Support enabling/disabling for container widgets as well +- Show "auto changes" popup in package manager + +- YOU mode package manager changes: + - Show total download size + - Dropped "Packages" menu (pkgs are read-only there) + - Added "YOU Patches" menu instead + - Addes "Show raw patch info" dialog + +------------------------------------------------------------------- +Tue Jan 21 18:06:15 CET 2003 - sh(a)suse.de + +- V 2.7.5 +- Use textdomain "qt-packages" for all texts to avoid textdomain + name clashes +- New command line options --fullscreen, --noborder +- Fixed busy cursors + +------------------------------------------------------------------- +Mon Jan 20 20:00:44 CET 2003 - sh(a)suse.de + +- Package manager enhancements: + - Enhanced feedback while checking dependencies + - Changed default to "off" for auto dependency check + - Save/load ignored dependency conflicts to/from + /var/adm/YaST/ignored-conflicts +- Bumped version to 2.7.4 + +------------------------------------------------------------------- +Tue Jan 14 19:05:09 CET 2003 - sh(a)suse.de + +- Package manager enhancements: + - Added menu bar + - Added bubble help for all kinds of lists + - Rearranged pkg list columns (moved summary left) + - Re-enabled source RPM handling + - Added currently installed version to "versions" view + (non-editable) + - Status change actions for "all in current list" + - Show disk space for all available partitions + - Added "installation summary" filter view + - Dependency checking now for selections, too + - Added symbols help + - Added special keys help + - Auto check is now "off" by default +- Bumped version to 2.7.3 + +------------------------------------------------------------------- +Tue Dec 03 16:37:31 CET 2002 - arvin(a)suse.de + +- added curl-devel and openssl-devel to neededforbuild + +------------------------------------------------------------------- +Mon Nov 11 17:58:23 CET 2002 - sh(a)suse.de + +- Support for buttons with icons and text + +------------------------------------------------------------------- +Fri Nov 8 16:18:33 CET 2002 - sh(a)suse.de + +- Fixed bug #20326: [Cancel] doesn't abandon changes in package mgr + +------------------------------------------------------------------- +Thu Nov 7 20:04:33 CET 2002 - sh(a)suse.de + +- Fixed bug #16339: [Space] doesn't trigger UserInput() in YTable + +------------------------------------------------------------------- +Thu Nov 7 19:46:18 CET 2002 - sh(a)suse.de + +- Fixed bug #20539: Screen shot function causes unnecessary exits +- Fixed bug #8362: File selection box for screen shots +- Fixed possible security hole: Screen shots in /tmp by default + +------------------------------------------------------------------- +Thu Nov 7 13:31:42 CET 2002 - sh(a)suse.de + +- Fixed bug #19389: Frame widget shows keyboard shortcuts, but + can't handle any + +------------------------------------------------------------------- +Fri Sep 20 16:23:32 CEST 2002 - msvec(a)suse.cz + +- added missing textdomain +- added missing files to POTFILES +- 2.6.23 + +------------------------------------------------------------------- +Fri Sep 13 14:56:41 CEST 2002 - sh(a)suse.de + +- V 2.6.22 +- Disabled selecting source RPMs until it works further down + +------------------------------------------------------------------- +Thu Sep 12 14:24:47 CEST 2002 - sh(a)suse.de + +- V 2.6.21 +- Show DelNotify popup even if pkg not installed yet +- Fixed bug #19333: Can't get out of pkg dialog with "Accept" + +------------------------------------------------------------------- +Wed Sep 11 17:48:32 CEST 2002 - sh(a)suse.de + +- Fixed bug #19419: Y2Pkg hangs on middle mouse click + This is really a Qt bug. Introduced workaround for that. + +------------------------------------------------------------------- +Wed Sep 11 14:07:50 CEST 2002 - sh(a)suse.de + +- Fixed bug #19390: Sometimes no keyboard focus without a mouse + +------------------------------------------------------------------- +Tue Sep 10 22:21:48 CEST 2002 - sh(a)suse.de + +- V 2.6.19 + +------------------------------------------------------------------- +Tue Sep 10 21:31:55 CEST 2002 - sh(a)suse.de + +- Fixed sort by source RPM status in pkg list + +------------------------------------------------------------------- +Tue Sep 10 21:01:37 CEST 2002 - sh(a)suse.de + +- Change packager priorities: Prefer candidateObj over installedObj + so the user gets to see his native language more often in pkg + descriptions (RPM DB is English only) + +------------------------------------------------------------------- +Tue Sep 10 20:06:11 CEST 2002 - sh(a)suse.de + +- V 2.6.18 +- New details view: Dependencies +- Bugfix: No initial dependency check in YOU mode +- Show patch sizes in YOU mode + +------------------------------------------------------------------- +Tue Sep 10 18:55:25 CEST 2002 - sh(a)suse.de + +- V 2.6.17 +- Fixed 'Accept doesn't leave pkg selection' bug +- New view for selecting different versions to install + +------------------------------------------------------------------- +Mon Sep 9 20:01:22 CEST 2002 - sh(a)suse.de + +- V 2.6.16 +- Prepared disk usage display (still disabled for internal reasons) +- Lots of small fixes + +------------------------------------------------------------------- +Mon Sep 9 18:46:35 CEST 2002 - sh(a)suse.de + +- Fixed minimumSize() hints for YQPkg* - works now in 640x480 +- Special icon for delete pkg conflict (tackat) +- Brighter colors for over-long conflict lists ("999 more...") + +------------------------------------------------------------------- +Mon Sep 9 02:20:37 CEST 2002 - sh(a)suse.de + +- V 2.6.15 + +Package manager changes: + +- Really ignore conflicts when user chooses so +- Auto dependency check on startup +- "Ignore All" button in dependency conflict dialog +- Show InsNotify / DelNotify +- Search for provides / requires +- Search immediately upon [Return] +- Show pkgs without any RPM group in "zzz All" +- Ignore WM_CLOSE for package selection +- Prepared translation stuff + +------------------------------------------------------------------- +Fri Sep 6 17:13:10 CEST 2002 - sh(a)suse.de + +- V 2.6.14 +- Search view +- Update problem list view +- Misc minor stuff + +------------------------------------------------------------------- +Thu Sep 5 21:04:18 CEST 2002 - sh(a)suse.de + +- V 2.6.13 +- Dependency resolving works - including conflicts + +------------------------------------------------------------------- +Mon Sep 2 19:58:07 CEST 2002 - sh(a)suse.de + +- V 2.6.12 +- Fixed crash with inconsistent YOU data + +------------------------------------------------------------------- +Mon Sep 2 18:55:01 CEST 2002 - sh(a)suse.de + +- V 2.6.11 +- Fixed confusing selection status handling + +------------------------------------------------------------------- +Mon Sep 2 18:15:01 CEST 2002 - sh(a)suse.de + +- V 2.6.10 +- Generalized internal pkg classes +- YOU UI now usable +- colorized lists +- context menus +- lots of small stuff + +------------------------------------------------------------------- +Tue Aug 27 19:15:23 CEST 2002 - sh(a)suse.de + +- V 2.6.9 +- Pkg selection now usable (no dependency checking/solving yet) + +------------------------------------------------------------------- +Wed Aug 21 17:51:27 CEST 2002 - kkaempf(a)suse.de + +- fix "make dist" +- V 2.6.8 + +------------------------------------------------------------------- +Mon Aug 19 19:03:14 CEST 2002 - sh(a)suse.de + +- V 2.6.7 +- New package management + +------------------------------------------------------------------- +Fri Aug 9 18:51:05 CEST 2002 - sh(a)suse.de + +- V 2.6.6 +- Fixed table sorting with `opt(`keepSorting) + +------------------------------------------------------------------- +Sat Aug 03 15:17:56 CEST 2002 - arvin(a)suse.de + +- write qt warnings to y2log (bug #17161) + +------------------------------------------------------------------- +Mon Jul 15 18:21:50 CEST 2002 - arvin(a)suse.de + +- workaround for timing problem + +------------------------------------------------------------------- +Mon Jul 8 16:54:24 CEST 2002 - mvidner(a)suse.cz + +- Provides/Obsoletes also the devel subpackage + +------------------------------------------------------------------- +Wed Jul 03 12:26:33 CEST 2002 - msvec(a)suse.cz + +- devel sub-package not neeeded + +------------------------------------------------------------------- +Mon Jun 24 13:40:16 CEST 2002 - arvin(a)suse.de + +- renamed from yast2-ui-qt to yast2-qt + +------------------------------------------------------------------- +Thu Jun 06 14:55:22 CEST 2002 - arvin(a)suse.de + +- don't link -lstdc++ explicitly + +------------------------------------------------------------------- +Fri May 24 17:24:23 CEST 2002 - arvin(a)suse.de + +- fixed locking so we can use multi threaded version of qt + +------------------------------------------------------------------- +Mon Apr 08 17:19:43 CEST 2002 - arvin(a)suse.de + +- fixes for gcc 3.1 + +------------------------------------------------------------------- +Fri Mar 22 17:11:40 CET 2002 - kkaempf(a)suse.de + +- pass callback information from component stub to interpreter + (#15311). + +------------------------------------------------------------------- +Mon Feb 25 18:18:36 CET 2002 - sh(a)suse.de + +- V 2.5.16 +- Applied Michal Svec's security patch + +------------------------------------------------------------------- +Mon Feb 25 16:28:54 CET 2002 - sh(a)suse.de + +- V 2.5.15 +- Fixed wish #13876: Host name in window title bar + +------------------------------------------------------------------- +Wed Feb 20 13:47:27 CET 2002 - sh(a)suse.de + +- V 2.5.14 +- Fixed bug #13604: Change fallback title image to new design + +------------------------------------------------------------------- +Mon Feb 18 18:22:55 CET 2002 - sh(a)suse.de + +- V 2.5.13 +- Fixed bug #13131: SetFocus on a TextEntry should select its contents + +------------------------------------------------------------------- +Thu Feb 14 12:19:19 CET 2002 - sh(a)suse.de + +- V 2.5.12 +- Fixed changed Qt-3 behaviour: Correct handling for tristate + checkbox + +------------------------------------------------------------------- +Wed Feb 13 17:56:05 CET 2002 - sh(a)suse.de + +- V 2.5.11 +- Fixed ColoredLabel alignment: Left and vertically centered + +------------------------------------------------------------------- +Fri Feb 8 17:06:46 CET 2002 - sh(a)suse.de + +- V 2.5.10 +- New YQImage constructor: Load images locally from within the UI +- Support YQImage `opt(`tiled, `scaleToFit) +- Load images in background pixmap + +------------------------------------------------------------------- +Thu Feb 7 17:18:10 CET 2002 - sh(a)suse.de + +- V 2.5.9 +- Better check for YaST2 special keys (Ctrl-Shift-Alt) + +------------------------------------------------------------------- +Fri Jan 25 17:48:15 CET 2002 - sh(a)suse.de + +- V 2.5.8 +- Added MNG support for Image widget + +------------------------------------------------------------------- +Thu Jan 24 21:29:48 CET 2002 - sh(a)suse.de + +- V 2.5.6 +- New optional widget: ColoredLabel + +------------------------------------------------------------------- +Tue Jan 22 18:33:52 CET 2002 - sh(a)suse.de + +- V 2.5.6 +- Support new `opt(`keepSorting) for YTable widget + +------------------------------------------------------------------- +Tue Jan 22 17:39:10 CET 2002 - sh(a)suse.de + +- Show initial selection (first item) + +------------------------------------------------------------------- +Tue Jan 22 16:42:26 CET 2002 - sh(a)suse.de + +- Fixed bug #12833: Arbitrary table sorting with Qt3 + +------------------------------------------------------------------- +Tue Jan 8 15:58:58 CET 2002 - sh(a)suse.de + +- V 2.5.5 +- Added qt3-non-mt to neededforbuild + +------------------------------------------------------------------- +Fri Dec 14 15:12:52 CET 2001 - sh(a)suse.de + +- V 2.5.4 +- Ported to Qt 3.x + +------------------------------------------------------------------- +Tue Dec 11 14:59:32 CET 2001 - sh(a)suse.de + +- V 2.5.3 +- Added hyperlink support to RichText widget + +------------------------------------------------------------------- +Thu Nov 15 13:30:47 CET 2001 - sh(a)suse.de + +- V 2.5.2 +- added proper #include for tolower() + +------------------------------------------------------------------- +Fri Nov 9 01:41:55 CET 2001 - ro(a)suse.de + +- use qt-devel-packages in neededforbuild + +------------------------------------------------------------------- +Tue Nov 6 18:22:15 CET 2001 - sh(a)suse.de + +- V 2.5.1 +- Fixed YQPushButton for automatic shortcut check / resolving + +------------------------------------------------------------------- +Thu Sep 27 17:38:26 CEST 2001 - sh(a)suse.de + +- Fixed bug #11350: WM close button closes win, but keeps app alive + +------------------------------------------------------------------- +Mon Sep 24 17:42:42 CEST 2001 - sh(a)suse.de + +- Don't set root window cursor to busy cursor +- V 2.4.17 + +------------------------------------------------------------------- +Fri Sep 21 18:16:34 CEST 2001 - sh(a)suse.de + +- Fixed bug #11073: busy cursor unreliable + The Qt UI now makes its own busy cursors rather than Qt's. +- V 2.4.16 + +------------------------------------------------------------------- +Tue Sep 18 14:11:41 CEST 2001 - sh(a)suse.de + +- Fixed bug #8534: Spurious in SuSEconfig protocoll +- V 2.4.15 + +------------------------------------------------------------------- +Mon Sep 17 18:33:09 CEST 2001 - sh(a)suse.de + +- Fixed bug #10754: Large popup windows partially invisible +- V 2.4.14 + +------------------------------------------------------------------- +Fri Sep 14 15:28:34 CEST 2001 - sh(a)suse.de + +- Fixed bug #10614: Ikea mode triggered on Alt-W +- Consistent default button handling even in selbox +- V 2.4.13 + +------------------------------------------------------------------- +Wed Sep 12 16:42:19 CEST 2001 - sh(a)suse.de + +- Only one window for all `opt(`defaultsize) dialogs +- Fixed bug #9915: Default button keyboard focus unreliable +- V 2.4.12 + +------------------------------------------------------------------- +Thu Sep 6 18:22:38 CEST 2001 - sh(a)suse.de + +- V 2.4.11 + Implemented new UI builtin: GetDisplayInfo() + +------------------------------------------------------------------- +Wed Sep 5 11:50:12 CEST 2001 - sh(a)suse.de + +- V 2.4.10 + All headers "ydoc" compliant - fixed build problems + +------------------------------------------------------------------- +Tue Sep 4 18:29:18 CEST 2001 - sh(a)suse.de + +- V 2.4.9 + improved focus handling - (possible) fix for bug #9915 + +------------------------------------------------------------------- +Wed Jul 11 15:31:05 CEST 2001 - sh(a)suse.de + +- V 2.4.8 + added glyph support (for new UI builtin Glyph() ) + +------------------------------------------------------------------- +Sat Jul 07 16:48:47 CEST 2001 - arvin(a)suse.de + +- neededforbuild += freetype2 + +------------------------------------------------------------------- +Thu Jul 5 11:07:33 CEST 2001 - kkaempf(a)suse.de + +- drop yast2-core-translator from neededforbuild + +------------------------------------------------------------------- +Wed Jun 27 18:06:42 CEST 2001 - sh(a)suse.de + +- V 2.4.5 + New widget: MultiSelectionBox + +------------------------------------------------------------------- +Tue Jun 26 19:25:39 CEST 2001 - sh(a)suse.de + +- V 2.4.4 + New widget: MenuButton + +------------------------------------------------------------------- +Tue Jun 19 16:17:33 CEST 2001 - sh(a)suse.de + +- Implemented wish #8357: Restrict input characters + new widget property `ValidChars for TextEntry, ComboBox + +------------------------------------------------------------------- +Tue Jun 19 14:58:31 CEST 2001 - kkaempf(a)suse.de + +- implemented callback mechanism + +------------------------------------------------------------------- +Tue Jun 12 14:50:45 CEST 2001 - sh(a)suse.de + +- V 2.4.2 + Changed BarGraph variable substitution from "%d" to "%1" + to become sformat() compatible + +------------------------------------------------------------------- +Fri Jun 8 15:58:39 CEST 2001 - sh(a)suse.de + +- V 2.4.1 +- Implemented wish #7259: Automatically set `opt(`decorated) + for non-defaultsize dialogs +- Implemented wish #8363: UserInput() returns special ID + 'debugHotkey when Ctrl-Alt-Shift-D is pressed + +------------------------------------------------------------------- +Fri Jun 8 14:47:22 CEST 2001 - sh(a)suse.de + +- V 2.4.0 + Macro recorder + +------------------------------------------------------------------- +Mon May 14 17:21:21 CEST 2001 - sh(a)suse.de + +- V 2.3.14: Fixed bug #8254, 2nd part: Bad czech charset in resizer + Work around QString::sprintf() limitations (Latin1 compatible + only), use QString::arg() instead + +------------------------------------------------------------------- +Mon May 14 14:20:44 CEST 2001 - sh(a)suse.de + +- V 2.3.13: Fixed bug #8254: Bad czech charset in resizer + Added fromUTF8() call for explicit string conversion + +------------------------------------------------------------------- +Tue May 8 12:10:05 CEST 2001 - kkaempf(a)suse.de + +- provide split-alias entries for older versions + +------------------------------------------------------------------- +Mon Apr 30 16:17:05 CEST 2001 - kkaempf(a)suse.de + +- provide "YaST2-UI" + +------------------------------------------------------------------- +Mon Apr 30 15:21:03 CEST 2001 - sh(a)suse.de + +- V 2.3.10 + (partial) fix for bug #7004: + Top-left align image in YImage widgets + +------------------------------------------------------------------- +Thu Apr 19 19:14:02 CEST 2001 - sh(a)suse.de + +- V 2.3.9 + Fixed bugs in RadioBox behaviour: + - second click on the same button will no longer deactivate it + - accept only one active RadioButton on RadioBox creation + (all but the last will be deactivated) + +------------------------------------------------------------------- +Thu Apr 12 13:03:47 CEST 2001 - sh(a)suse.de + +- V 2.3.8 + Improved RadioBox keyboard navigation: + No longer rely on QButtonGroup, own implementation of RadioBox + behaviour -> no longer strange key mappings (cursor keys rather + than tab as everybody expects) + +------------------------------------------------------------------- +Thu Apr 5 19:52:11 CEST 2001 - sh(a)suse.de + +- new options zeroWidth, zeroHeight for image widget + to avoid complaints about title graphics not getting their + "nice size" of 2000 pixels wide +- V 2.3.7 + +------------------------------------------------------------------- +Thu Mar 29 14:33:53 CEST 2001 - sh(a)suse.de + +- moved shared libs from /usr/lib/YaST2/lib to /usr/lib +- V 2.3.5 + +------------------------------------------------------------------- +Thu Mar 29 09:25:54 CEST 2001 - kkaempf(a)suse.de + +- dont install lib, only plugin is needed + +------------------------------------------------------------------- +Tue Mar 27 15:56:27 CEST 2001 - kkaempf(a)suse.de + +- minimize file list for yast2-ui-qt package + +------------------------------------------------------------------- +Fri Mar 23 12:44:29 CET 2001 - arvin(a)suse.de + +- moved documentation to packages/yast2-ui-qt + +------------------------------------------------------------------- +Sun Mar 18 23:24:19 CET 2001 - ro(a)suse.de + +- fixed neededforbuild + +------------------------------------------------------------------- +Mon Mar 12 13:15:05 CET 2001 - arvin(a)suse.de + +- Strip plugin in package. + +------------------------------------------------------------------- +Thu Mar 8 18:11:07 CET 2001 - arvin(a)suse.de + +- Added unicode fonts (previously in y2base). + +------------------------------------------------------------------- +Sat Jan 27 21:19:35 CET 2001 - arvin(a)suse.de + +- package split y2qt / y2qt-devel + +------------------------------------------------------------------- +Tue Jan 23 11:12:09 CET 2001 - sh(a)suse.de + +- prevent crash upon window manager close + +------------------------------------------------------------------- +Mon Jan 22 13:31:18 CET 2001 - sh(a)suse.de + +- V2.2.10 +- New default title graphics from <wimer(a)suse.de> that are + no longer cut off at the right at 640x480 +- Renamed suseheader.xpm to yast2.xpm +- Use yast2.xpm for both `Image(`suseheader) and `Image(`yast2) +- Removed obsolete XPM images that were never used anyway + +------------------------------------------------------------------- +Tue Jan 16 11:54:04 CET 2001 - sh(a)suse.de + +- V2.2.9 +- New default image for Image(`suseheader): 2000 pixels wide + +------------------------------------------------------------------- +Fri Jan 12 21:57:42 CET 2001 - sh(a)suse.de + +- V2.2.8 +- Added module QXEmbed from Qt/KDE2 (TrollTech / LGPL) + to enable reliable KDE2 control center integration: + keyboard focus now works when running embedded in kcmshell + (fix for bug #5475) + +------------------------------------------------------------------- +Thu Jan 11 16:10:28 CET 2001 - sh(a)suse.de + +- V2.2.7 +- Hide YQTextEntry label if empty label specified + -> no empty space above TextEntry widgets without label + +------------------------------------------------------------------- +Tue Dec 19 14:58:33 CET 2000 - ma(a)suse.de + +- V2.2.6 +- pass YCPstrings to ui specific widgets + +------------------------------------------------------------------- +Mon Dec 18 19:35:30 CET 2000 - sh(a)suse.de + +- New optional widget: DownloadProgress +- V2.2.5 + +------------------------------------------------------------------- +Fri Dec 8 15:54:12 CET 2000 - sh(a)suse.de + +- More reliable nicesize() and setSize() behaviour for + SelectionBox and TextEntry + -> no more cut-off pixel lines at the bottom +- V2.2.4 + +------------------------------------------------------------------- +Tue Dec 5 16:51:05 CET 2000 - sh(a)suse.de + +- New widget: MultiLineEdit +- Dialogs can no longer exceed screen dimensions +- V2.2.3 + +------------------------------------------------------------------- +Tue Nov 28 17:23:30 CET 2000 - arvin(a)suse.de + +- Fixed ComboBox layout errors on resize. + +------------------------------------------------------------------- +Tue Nov 28 15:43:07 CET 2000 - kkaempf(a)suse.de + +- add libmng-devel to neededforbuild + +------------------------------------------------------------------- +Thu Nov 16 17:18:52 CET 2000 - kkaempf(a)suse.de + +- split library and plugin + +------------------------------------------------------------------- +Mon Nov 13 11:21:34 CET 2000 - sh(a)suse.de + +- Removed glx, glx-devel, mesa from .spec.in - Qt no longer needs it +- V2.1.8 + +------------------------------------------------------------------- +Thu Nov 9 12:46:05 CET 2000 - kkaempf(a)suse.de + +- static plugin only + +------------------------------------------------------------------- +Tue Nov 7 18:43:30 CET 2000 - sh(a)suse.de + +- re-enabled static libs + new widgets: LogView, IntField + moved completely to new logging + version 2.1.6 + +------------------------------------------------------------------- +Fri Nov 3 08:54:17 CET 2000 - kkaempf(a)suse.de + +- adapt neededforbuild for new qt + +------------------------------------------------------------------- +Thu Nov 2 11:43:34 CET 2000 - kkaempf(a)suse.de + +- fix runqt include file + +------------------------------------------------------------------- +Tue Oct 31 14:33:38 CET 2000 - sh(a)suse.de + +- Increased gcc warning level + resolved minor warnings + disabled static libs (speed up compilation) + version 2.1.4 + +------------------------------------------------------------------- +Fri Oct 27 12:47:55 CEST 2000 - kkaempf(a)suse.de + +- provide correct library + +------------------------------------------------------------------- +Wed Oct 25 18:33:58 CEST 2000 - kkaempf(a)suse.de + +- Group provided + +------------------------------------------------------------------- +Wed Oct 25 13:58:34 CEST 2000 - sh(a)suse.de + +- New widgets: BarGraph, Slider, PartitionSplitter + version 2.1.2 + +------------------------------------------------------------------- +Thu Aug 31 13:34:27 CEST 2000 - sh(a)suse.de + +- Added mesa and mesasoft to spec file + (Qt 2.2+ now requires OpenGL) + version 2.1.1 + +------------------------------------------------------------------- +Thu Jul 13 18:58:23 CEST 2000 - sh(a)suse.de + +- Resize behaviour + version 2.0.11 + +------------------------------------------------------------------- +Fri Jul 7 16:41:06 CEST 2000 - sh(a)suse.de + +- Change table widget sorting for the umpteenth time: + Maintain insertion order but allow for user sort-by-click + version 2.0.10 + +------------------------------------------------------------------- +Thu Jul 6 15:48:28 CEST 2000 - sh(a)suse.de + +- proper window close button handling (-> `cancel) + version 2.0.9 + +------------------------------------------------------------------- +Tue Jul 4 14:11:43 CEST 2000 - kkaempf(a)suse.de + +- check argument in returnNow + version 2.0.8 + +------------------------------------------------------------------- +Mon Jun 26 16:03:32 CEST 2000 - sh(a)suse.de + +- Changed default title image for SuSE 7.0 +- increased version number to 2.0.7 + +------------------------------------------------------------------- +Mon Jun 19 17:41:54 CEST 2000 - kkaempf(a)suse.de + +- use xmset from new saxtools package + version 2.0.6 + +------------------------------------------------------------------- +Mon Jun 19 16:51:27 CEST 2000 - schwab(a)suse.de + +- Add %suse_update_config. +- Lower opt level on ia64. + +------------------------------------------------------------------- +Mon Jun 19 10:24:39 CEST 2000 - kkaempf(a)suse.de + +- add xmset from SaX2 + version 2.0.5 + +------------------------------------------------------------------- +Thu Jun 8 11:22:40 CEST 2000 - sh(a)suse.de + +- Disabled X Input Method hack - this doesn't seem to work with + XFree86 4.0 + +------------------------------------------------------------------- +Mon Jun 5 18:46:25 CEST 2000 - sh(a)suse.de + +- Added correct QTDIR and dependencies to qtlib2 to spec file + +------------------------------------------------------------------- +Thu May 18 13:11:54 CEST 2000 - kkaempf(a)suse.de + +- pass includes to dist + add tools to specfile + +------------------------------------------------------------------- +Mon May 15 16:07:09 CEST 2000 - sh(a)suse.de + +- New widget: ComboBox + +------------------------------------------------------------------- +Wed Apr 26 16:25:39 CEST 2000 - kkaempf(a)suse.de + +- Initial version based on yast2 from SuSE 6.4 + -- 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] r60628 - in /branches/tmp/bubli/qt: libyui.qt.spec.in package/libyui.qt.changes package/yast2-qt.changes yast2-qt.spec.in
by kmachalkova＠svn.opensuse.org 29 Jan '10

29 Jan '10

Author: kmachalkova Date: Fri Jan 29 18:10:24 2010 New Revision: 60628 URL: http://svn.opensuse.org/viewcvs/yast?rev=60628&view=rev Log: more renames Added: branches/tmp/bubli/qt/libyui.qt.spec.in - copied unchanged from r60627, branches/tmp/bubli/qt/yast2-qt.spec.in branches/tmp/bubli/qt/package/libyui.qt.changes - copied unchanged from r60627, branches/tmp/bubli/qt/package/yast2-qt.changes Removed: branches/tmp/bubli/qt/package/yast2-qt.changes branches/tmp/bubli/qt/yast2-qt.spec.in -- 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] r60627 - /branches/tmp/bubli/ncurses/
by kmachalkova＠svn.opensuse.org 29 Jan '10

29 Jan '10

Author: kmachalkova Date: Fri Jan 29 17:30:27 2010 New Revision: 60627 URL: http://svn.opensuse.org/viewcvs/yast?rev=60627&view=rev Log: de-yastify Added: branches/tmp/bubli/ncurses/ - copied from r60626, trunk/ncurses/ -- 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] r60626 - /branches/tmp/bubli/ncurses/
by kmachalkova＠svn.opensuse.org 29 Jan '10

29 Jan '10

Author: kmachalkova Date: Fri Jan 29 17:28:12 2010 New Revision: 60626 URL: http://svn.opensuse.org/viewcvs/yast?rev=60626&view=rev Log: gone Removed: branches/tmp/bubli/ncurses/ -- 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] r60625 - in /trunk/wagon: package/yast2-wagon.changes src/clients/wagon_congratulate.ycp
by locilka＠svn.opensuse.org 29 Jan '10

29 Jan '10

Author: locilka Date: Fri Jan 29 16:50:44 2010 New Revision: 60625 URL: http://svn.opensuse.org/viewcvs/yast?rev=60625&view=rev Log: - Requesting to reboot to the new system as soon as possible at the end of the migration (BNC #575093). Modified: trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/clients/wagon_congratulate.ycp Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Fri Jan 29 16:50:44 2010 @@ -3,6 +3,8 @@ - Raising a blocker in case of removing any product (except migration ones) by solver in proposal (BNC #575117). +- Requesting to reboot to the new system as soon as possible at + the end of the migration (BNC #575093). ------------------------------------------------------------------- Thu Jan 28 11:45:12 CET 2010 - locilka(a)suse.cz Modified: trunk/wagon/src/clients/wagon_congratulate.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_congratu… ============================================================================== --- trunk/wagon/src/clients/wagon_congratulate.ycp (original) +++ trunk/wagon/src/clients/wagon_congratulate.ycp Fri Jan 29 16:50:44 2010 @@ -20,6 +20,9 @@ import "ProductControl"; import "ProductFeatures"; + import "Report"; + + textdomain "wagon"; // BNC #445974 // Don't use custom control file, only the base-product one has @@ -44,5 +47,9 @@ ProductControl::Init(); } + // BNC #575093: Report the need to reboot ASAP + Report::Message(_("Migration has just finished. +Reboot the system as soon as possible.")); + 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] r60624 - in /branches/SuSE-Code-11-SP1-Branch/wagon: package/yast2-wagon.changes src/clients/wagon_congratulate.ycp
by locilka＠svn.opensuse.org 29 Jan '10

29 Jan '10

Author: locilka Date: Fri Jan 29 16:50:27 2010 New Revision: 60624 URL: http://svn.opensuse.org/viewcvs/yast?rev=60624&view=rev Log: - Requesting to reboot to the new system as soon as possible at the end of the migration (BNC #575093). Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_congratulate.ycp Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes Fri Jan 29 16:50:27 2010 @@ -3,6 +3,8 @@ - Raising a blocker in case of removing any product (except migration ones) by solver in proposal (BNC #575117). +- Requesting to reboot to the new system as soon as possible at + the end of the migration (BNC #575093). ------------------------------------------------------------------- Thu Jan 28 11:45:12 CET 2010 - locilka(a)suse.cz Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_congratulate.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_congratulate.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_congratulate.ycp Fri Jan 29 16:50:27 2010 @@ -20,6 +20,9 @@ import "ProductControl"; import "ProductFeatures"; + import "Report"; + + textdomain "wagon"; // BNC #445974 // Don't use custom control file, only the base-product one has @@ -44,5 +47,9 @@ ProductControl::Init(); } + // BNC #575093: Report the need to reboot ASAP + Report::Message(_("Migration has just finished. +Reboot the system as soon as possible.")); + 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] r60623 - in /branches/SuSE-Code-11-Branch/wagon: package/yast2-wagon.changes src/clients/wagon_congratulate.ycp
by locilka＠svn.opensuse.org 29 Jan '10

29 Jan '10

Author: locilka Date: Fri Jan 29 16:50:14 2010 New Revision: 60623 URL: http://svn.opensuse.org/viewcvs/yast?rev=60623&view=rev Log: - Requesting to reboot to the new system as soon as possible at the end of the migration (BNC #575093). Modified: branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_congratulate.ycp Modified: branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/pac… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes Fri Jan 29 16:50:14 2010 @@ -3,6 +3,8 @@ - Raising a blocker in case of removing any product (except migration ones) by solver in proposal (BNC #575117). +- Requesting to reboot to the new system as soon as possible at + the end of the migration (BNC #575093). ------------------------------------------------------------------- Thu Jan 28 11:45:12 CET 2010 - locilka(a)suse.cz Modified: branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_congratulate.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_congratulate.ycp (original) +++ branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_congratulate.ycp Fri Jan 29 16:50:14 2010 @@ -20,6 +20,9 @@ import "ProductControl"; import "ProductFeatures"; + import "Report"; + + textdomain "wagon"; // BNC #445974 // Don't use custom control file, only the base-product one has @@ -44,5 +47,9 @@ ProductControl::Init(); } + // BNC #575093: Report the need to reboot ASAP + Report::Message(_("Migration has just finished. +Reboot the system as soon as possible.")); + 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] r60622 - in /branches/SuSE-Code-11-Branch/wagon: package/yast2-wagon.changes src/modules/Wagon.ycp
by locilka＠svn.opensuse.org 29 Jan '10

29 Jan '10

Author: locilka Date: Fri Jan 29 16:37:30 2010 New Revision: 60622 URL: http://svn.opensuse.org/viewcvs/yast?rev=60622&view=rev Log: - Raising a blocker in case of removing any product (except migration ones) by solver in proposal (BNC #575117). Modified: branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp Modified: branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/pac… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes Fri Jan 29 16:37:30 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 29 16:35:00 CET 2010 - locilka(a)suse.cz + +- Raising a blocker in case of removing any product (except + migration ones) by solver in proposal (BNC #575117). + +------------------------------------------------------------------- Thu Jan 28 11:45:12 CET 2010 - locilka(a)suse.cz - Updated RPM dependencies (BNC #573482). Modified: branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp Fri Jan 29 16:37:30 2010 @@ -308,8 +308,9 @@ return sformat (_("%1 (%2)"), display_name, name); } - string GetDistributionUpgradeSummary () { + global map <string, any> ProposalSummary () { string ret = ""; + string warning = ""; list <map <string,any> > products = sort ( map <string,any> x, map <string,any> y, Pkg::ResolvableProperties ("", `product, ""), @@ -322,6 +323,7 @@ string display_name = nil; string name = nil; + symbol transact_by = nil; // list of all products that will be installed (are selected) list <string> products_to_be_installed = []; @@ -334,6 +336,8 @@ // list of all products that will be upgraded list <string> products_to_be_upgraded = []; + integer products_removed_by_solver = 0; + // Products that are going to be removed foreach (map <string,any> product, products, { if (product["status"]:`unknown != `removed) return; @@ -341,6 +345,7 @@ product = MinimizeProductMap (product); display_name = product["display_name"]:product["short_name"]:product["name"]:_("No name defined"); name = product["name"]:_("No short name defined"); + transact_by = product["transact_by"]:`unknown; // Removing product and installing the same one (name) means -> upgrade if (contains (products_to_be_installed, name)) { @@ -358,12 +363,22 @@ GetDisplayName (display_name, name) ) + "</li>\n"; // Removing another product might be an issue + // (nevertheless selected by user or directly by YaST) + } else if (transact_by == `user || transact_by == `app_high) { + y2warning ("Product will be removed: %1 (%2)", product, transact_by); + ret = ret + "<li>" + sformat ( + _("Warning: Product %1 will be removed"), + GetDisplayName (display_name, name) + ) + "</li>\n"; + // Not selected by user + // @see BNC #575117 } else { - y2warning ("Product will be removed: %1", product); + y2warning ("Product will be removed: %1 (%2)", product, transact_by); ret = ret + "<li>" + sformat ( - _("Warning: Product %1 will be removed"), + _("Error: Product %1 will be automatically removed"), GetDisplayName (display_name, name) ) + "</li>\n"; + products_removed_by_solver = products_removed_by_solver + 1; } }); @@ -407,19 +422,30 @@ ) + "</li>\n"; }); - return "<ul>\n" + ret + "</ul>\n"; - } - - global map <string, any> ProposalSummary () { - map <string, any> ret = $[]; + ret = "<ul>\n" + ret + "</ul>\n"; - ret = $[ - "preformatted_proposal" : GetDistributionUpgradeSummary(), + map <string, any> summary = $[ + "preformatted_proposal" : ret, // help text - "help" : _("To change update settings go to Software Proposal section."), + "help" : _("To change the update settings, go to Packages Proposal section."), ]; - return ret; + // Product removal MUST be confirmed by user, otherwise migration will not continue. + if (products_removed_by_solver > 0) { + summary["warning_level"] = `blocker; + summary["warning"] = "<ul>" + ( + products_removed_by_solver > 1 ? + sformat(_("<li>%1 products are going to be removed. +Go to packages proposal and solve the issue manually. +It it also safe to abort the migration now.</li>"), products_removed_by_solver) + : + _("<li>One product is going to be removed. +Go to packages proposal and solve the issue manually. +It it also safe to abort the migration now.</li>") + ) + "</ul>"; + } + + return summary; } global list <map <string, string> > ReadProductsBeforeMigration () { -- 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] r60621 - in /branches/SuSE-Code-11-SP1-Branch/wagon: package/yast2-wagon.changes src/modules/Wagon.ycp
by locilka＠svn.opensuse.org 29 Jan '10

29 Jan '10

Author: locilka Date: Fri Jan 29 16:37:11 2010 New Revision: 60621 URL: http://svn.opensuse.org/viewcvs/yast?rev=60621&view=rev Log: - Raising a blocker in case of removing any product (except migration ones) by solver in proposal (BNC #575117). Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes Fri Jan 29 16:37:11 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 29 16:35:00 CET 2010 - locilka(a)suse.cz + +- Raising a blocker in case of removing any product (except + migration ones) by solver in proposal (BNC #575117). + +------------------------------------------------------------------- Thu Jan 28 11:45:12 CET 2010 - locilka(a)suse.cz - Updated RPM dependencies (BNC #573482). Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp Fri Jan 29 16:37:11 2010 @@ -308,8 +308,9 @@ return sformat (_("%1 (%2)"), display_name, name); } - string GetDistributionUpgradeSummary () { + global map <string, any> ProposalSummary () { string ret = ""; + string warning = ""; list <map <string,any> > products = sort ( map <string,any> x, map <string,any> y, Pkg::ResolvableProperties ("", `product, ""), @@ -322,6 +323,7 @@ string display_name = nil; string name = nil; + symbol transact_by = nil; // list of all products that will be installed (are selected) list <string> products_to_be_installed = []; @@ -334,6 +336,8 @@ // list of all products that will be upgraded list <string> products_to_be_upgraded = []; + integer products_removed_by_solver = 0; + // Products that are going to be removed foreach (map <string,any> product, products, { if (product["status"]:`unknown != `removed) return; @@ -341,6 +345,7 @@ product = MinimizeProductMap (product); display_name = product["display_name"]:product["short_name"]:product["name"]:_("No name defined"); name = product["name"]:_("No short name defined"); + transact_by = product["transact_by"]:`unknown; // Removing product and installing the same one (name) means -> upgrade if (contains (products_to_be_installed, name)) { @@ -358,12 +363,22 @@ GetDisplayName (display_name, name) ) + "</li>\n"; // Removing another product might be an issue + // (nevertheless selected by user or directly by YaST) + } else if (transact_by == `user || transact_by == `app_high) { + y2warning ("Product will be removed: %1 (%2)", product, transact_by); + ret = ret + "<li>" + sformat ( + _("Warning: Product %1 will be removed"), + GetDisplayName (display_name, name) + ) + "</li>\n"; + // Not selected by user + // @see BNC #575117 } else { - y2warning ("Product will be removed: %1", product); + y2warning ("Product will be removed: %1 (%2)", product, transact_by); ret = ret + "<li>" + sformat ( - _("Warning: Product %1 will be removed"), + _("Error: Product %1 will be automatically removed"), GetDisplayName (display_name, name) ) + "</li>\n"; + products_removed_by_solver = products_removed_by_solver + 1; } }); @@ -407,19 +422,30 @@ ) + "</li>\n"; }); - return "<ul>\n" + ret + "</ul>\n"; - } - - global map <string, any> ProposalSummary () { - map <string, any> ret = $[]; + ret = "<ul>\n" + ret + "</ul>\n"; - ret = $[ - "preformatted_proposal" : GetDistributionUpgradeSummary(), + map <string, any> summary = $[ + "preformatted_proposal" : ret, // help text - "help" : _("To change update settings go to Software Proposal section."), + "help" : _("To change the update settings, go to Packages Proposal section."), ]; - return ret; + // Product removal MUST be confirmed by user, otherwise migration will not continue. + if (products_removed_by_solver > 0) { + summary["warning_level"] = `blocker; + summary["warning"] = "<ul>" + ( + products_removed_by_solver > 1 ? + sformat(_("<li>%1 products are going to be removed. +Go to packages proposal and solve the issue manually. +It it also safe to abort the migration now.</li>"), products_removed_by_solver) + : + _("<li>One product is going to be removed. +Go to packages proposal and solve the issue manually. +It it also safe to abort the migration now.</li>") + ) + "</ul>"; + } + + return summary; } global list <map <string, string> > ReadProductsBeforeMigration () { -- 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] r60620 - in /trunk/wagon: package/yast2-wagon.changes src/modules/Wagon.ycp
by locilka＠svn.opensuse.org 29 Jan '10

29 Jan '10

Author: locilka Date: Fri Jan 29 16:36:52 2010 New Revision: 60620 URL: http://svn.opensuse.org/viewcvs/yast?rev=60620&view=rev Log: - Raising a blocker in case of removing any product (except migration ones) by solver in proposal (BNC #575117). Modified: trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/modules/Wagon.ycp Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Fri Jan 29 16:36:52 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 29 16:35:00 CET 2010 - locilka(a)suse.cz + +- Raising a blocker in case of removing any product (except + migration ones) by solver in proposal (BNC #575117). + +------------------------------------------------------------------- Thu Jan 28 11:45:12 CET 2010 - locilka(a)suse.cz - Fixed reset-packager functionality (BNC #573575). Modified: trunk/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/modules/Wagon.ycp?rev=… ============================================================================== --- trunk/wagon/src/modules/Wagon.ycp (original) +++ trunk/wagon/src/modules/Wagon.ycp Fri Jan 29 16:36:52 2010 @@ -308,8 +308,9 @@ return sformat (_("%1 (%2)"), display_name, name); } - string GetDistributionUpgradeSummary () { + global map <string, any> ProposalSummary () { string ret = ""; + string warning = ""; list <map <string,any> > products = sort ( map <string,any> x, map <string,any> y, Pkg::ResolvableProperties ("", `product, ""), @@ -322,6 +323,7 @@ string display_name = nil; string name = nil; + symbol transact_by = nil; // list of all products that will be installed (are selected) list <string> products_to_be_installed = []; @@ -334,6 +336,8 @@ // list of all products that will be upgraded list <string> products_to_be_upgraded = []; + integer products_removed_by_solver = 0; + // Products that are going to be removed foreach (map <string,any> product, products, { if (product["status"]:`unknown != `removed) return; @@ -341,6 +345,7 @@ product = MinimizeProductMap (product); display_name = product["display_name"]:product["short_name"]:product["name"]:_("No name defined"); name = product["name"]:_("No short name defined"); + transact_by = product["transact_by"]:`unknown; // Removing product and installing the same one (name) means -> upgrade if (contains (products_to_be_installed, name)) { @@ -358,12 +363,22 @@ GetDisplayName (display_name, name) ) + "</li>\n"; // Removing another product might be an issue + // (nevertheless selected by user or directly by YaST) + } else if (transact_by == `user || transact_by == `app_high) { + y2warning ("Product will be removed: %1 (%2)", product, transact_by); + ret = ret + "<li>" + sformat ( + _("Warning: Product %1 will be removed"), + GetDisplayName (display_name, name) + ) + "</li>\n"; + // Not selected by user + // @see BNC #575117 } else { - y2warning ("Product will be removed: %1", product); + y2warning ("Product will be removed: %1 (%2)", product, transact_by); ret = ret + "<li>" + sformat ( - _("Warning: Product %1 will be removed"), + _("Error: Product %1 will be automatically removed"), GetDisplayName (display_name, name) ) + "</li>\n"; + products_removed_by_solver = products_removed_by_solver + 1; } }); @@ -407,19 +422,30 @@ ) + "</li>\n"; }); - return "<ul>\n" + ret + "</ul>\n"; - } - - global map <string, any> ProposalSummary () { - map <string, any> ret = $[]; + ret = "<ul>\n" + ret + "</ul>\n"; - ret = $[ - "preformatted_proposal" : GetDistributionUpgradeSummary(), + map <string, any> summary = $[ + "preformatted_proposal" : ret, // help text - "help" : _("To change update settings go to Software Proposal section."), + "help" : _("To change the update settings, go to Packages Proposal section."), ]; - return ret; + // Product removal MUST be confirmed by user, otherwise migration will not continue. + if (products_removed_by_solver > 0) { + summary["warning_level"] = `blocker; + summary["warning"] = "<ul>" + ( + products_removed_by_solver > 1 ? + sformat(_("<li>%1 products are going to be removed. +Go to packages proposal and solve the issue manually. +It it also safe to abort the migration now.</li>"), products_removed_by_solver) + : + _("<li>One product is going to be removed. +Go to packages proposal and solve the issue manually. +It it also safe to abort the migration now.</li>") + ) + "</ul>"; + } + + return summary; } global list <map <string, string> > ReadProductsBeforeMigration () { -- 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] r60619 - in /branches/tmp/bubli/qt: CMakeLists.txt RPMNAME
by kmachalkova＠svn.opensuse.org 29 Jan '10

29 Jan '10

Author: kmachalkova Date: Fri Jan 29 15:21:40 2010 New Revision: 60619 URL: http://svn.opensuse.org/viewcvs/yast?rev=60619&view=rev Log: Rename Modified: branches/tmp/bubli/qt/CMakeLists.txt branches/tmp/bubli/qt/RPMNAME Modified: branches/tmp/bubli/qt/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/qt/CMakeLists.txt?r… ============================================================================== --- branches/tmp/bubli/qt/CMakeLists.txt (original) +++ branches/tmp/bubli/qt/CMakeLists.txt Fri Jan 29 15:21:40 2010 @@ -8,13 +8,13 @@ SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall" ) set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DQT_NO_DEBUG -DNDEBUG") -SET( RPMNAME "yast2-qt" ) +SET( RPMNAME "libyui-qt" ) FIND_PACKAGE(Qt4 REQUIRED) FIND_PACKAGE(Libyui REQUIRED) SET(CMAKE_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/share/YaST2/data/devtools/cmake/modules" ${CMAKE_MODULE_PATH}) INCLUDE(YastCommon) -SET(YAST_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include/YaST2) +SET(YAST_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include/yui) SET(Y2QT_ICONDIR ${CMAKE_INSTALL_PREFIX}/share/YaST2/theme/current) SET(Y2QT_LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/YaST2/locale) Modified: branches/tmp/bubli/qt/RPMNAME URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/qt/RPMNAME?rev=6061… ============================================================================== --- branches/tmp/bubli/qt/RPMNAME (original) +++ branches/tmp/bubli/qt/RPMNAME Fri Jan 29 15:21:40 2010 @@ -1 +1 @@ -yast2-qt +libyui-qt -- 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] r60618 - in /branches/tmp/bubli/libyui: cmake/FindLibyui.cmake configure.in libyui.spec.in
by kmachalkova＠svn.opensuse.org 29 Jan '10

29 Jan '10

Author: kmachalkova Date: Fri Jan 29 15:21:06 2010 New Revision: 60618 URL: http://svn.opensuse.org/viewcvs/yast?rev=60618&view=rev Log: new includedir, new plugindir Modified: branches/tmp/bubli/libyui/cmake/FindLibyui.cmake branches/tmp/bubli/libyui/configure.in branches/tmp/bubli/libyui/libyui.spec.in Modified: branches/tmp/bubli/libyui/cmake/FindLibyui.cmake URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/libyui/cmake/FindLi… ============================================================================== --- branches/tmp/bubli/libyui/cmake/FindLibyui.cmake (original) +++ branches/tmp/bubli/libyui/cmake/FindLibyui.cmake Fri Jan 29 15:21:06 2010 @@ -24,12 +24,12 @@ ENDIF ( DEFINED LIB ) MESSAGE(STATUS "Libraries will be installed in ${LIB_INSTALL_DIR}" ) -SET(UI_PLUGIN_DIR ${LIB_INSTALL_DIR}/YaST2/plugin) +SET(UI_PLUGIN_DIR ${LIB_INSTALL_DIR}/yui) FIND_PATH(LIBYUI_INCLUDE_DIR YWidget.h - ${CMAKE_INSTALL_PREFIX}/include/YaST2/yui - /usr/include/YaST2/yui - /usr/local/include/YaST2/yui + ${CMAKE_INSTALL_PREFIX}/include/yui + /usr/include/yui + /usr/local/include/yui ) FIND_LIBRARY(LIBYUI_LIBRARY NAMES yui Modified: branches/tmp/bubli/libyui/configure.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/libyui/configure.in… ============================================================================== --- branches/tmp/bubli/libyui/configure.in (original) +++ branches/tmp/bubli/libyui/configure.in Fri Jan 29 15:21:06 2010 @@ -19,9 +19,9 @@ CXXFLAGS="${CXXFLAGS} -std=gnu++0x -DHAVE_CXX0X -Wall -Wformat=2 -Wnon-virtual-dtor" docdir=\${prefix}/share/doc/packages/libyui -includedir=\${prefix}/include/YaST2 +includedir=\${prefix}/include/ pkgconfigdir=\${libdir}/pkgconfig -plugindir=\${libdir}/YaST2/plugin +plugindir=\${libdir}/yui/ themedir=\${prefix}/share/YaST2/theme/ AC_SUBST(VERSION) Modified: branches/tmp/bubli/libyui/libyui.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/libyui/libyui.spec.… ============================================================================== --- branches/tmp/bubli/libyui/libyui.spec.in (original) +++ branches/tmp/bubli/libyui/libyui.spec.in Fri Jan 29 15:21:06 2010 @@ -92,7 +92,7 @@ %defattr(-,root,root) %{_libdir}/lib*.so %{_libdir}/lib*.la -%{_prefix}/include/YaST2 +%{_prefix}/include/yui %{_libdir}/pkgconfig/libyui.pc %dir %{_datadir}/cmake %dir %{_datadir}/cmake/Modules -- 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] r60617 - /trunk/printer/tools/
by jsmeix＠svn.opensuse.org 29 Jan '10

29 Jan '10

Author: jsmeix Date: Fri Jan 29 14:50:42 2010 New Revision: 60617 URL: http://svn.opensuse.org/viewcvs/yast?rev=60617&view=rev Log: In none of the bash scripts for yast2-printer bash globbing is needed. Actually in all those scripts no bash globbing should happen. Therefore I added to all those scripts a "set -f" line (bnc #575056). Modified: trunk/printer/tools/autodetect_print_queues trunk/printer/tools/autodetect_printers trunk/printer/tools/create_printer_ppd_database trunk/printer/tools/cups_client_only trunk/printer/tools/determine_printer_driver_options trunk/printer/tools/modify_cupsd_conf trunk/printer/tools/test_device trunk/printer/tools/test_remote_ipp trunk/printer/tools/test_remote_lpd trunk/printer/tools/test_remote_novell trunk/printer/tools/test_remote_smb trunk/printer/tools/test_remote_socket Modified: trunk/printer/tools/autodetect_print_queues URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/autodetect_print_q… ============================================================================== --- trunk/printer/tools/autodetect_print_queues (original) +++ trunk/printer/tools/autodetect_print_queues Fri Jan 29 14:50:42 2010 @@ -1,13 +1,16 @@ #! /bin/bash # -# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009 +# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009, 2010 #set -x +# Make sure to have a clean environment: export PATH="/sbin:/usr/sbin:/usr/bin:/bin" export LC_ALL="POSIX" export LANG="POSIX" umask 022 +# Disable bash file name globbing: +set -f MY_NAME=${0##*/} Modified: trunk/printer/tools/autodetect_printers URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/autodetect_printer… ============================================================================== --- trunk/printer/tools/autodetect_printers (original) +++ trunk/printer/tools/autodetect_printers Fri Jan 29 14:50:42 2010 @@ -1,13 +1,16 @@ #! /bin/bash # -# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009 +# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009, 2010 #set -x +# Make sure to have a clean environment: export PATH="/sbin:/usr/sbin:/usr/bin:/bin" export LC_ALL="POSIX" export LANG="POSIX" umask 022 +# Disable bash file name globbing: +set -f # This file name for a progress indicator is also used in Printer.ycp: test -z "$PROGRESS" && PROGRESS="/var/lib/YaST2/autodetect_printers.progress" Modified: trunk/printer/tools/create_printer_ppd_database URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/create_printer_ppd… ============================================================================== --- trunk/printer/tools/create_printer_ppd_database (original) +++ trunk/printer/tools/create_printer_ppd_database Fri Jan 29 14:50:42 2010 @@ -1,13 +1,16 @@ #! /bin/bash # -# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009 +# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009, 2010 #set -x +# Make sure to have a clean environment: export PATH="/sbin:/usr/sbin:/usr/bin:/bin" export LC_ALL="POSIX" export LANG="POSIX" umask 022 +# Disable bash file name globbing: +set -f # This file name for a progress indicator is also used in Printer.ycp: test -z "$PROGRESS" && PROGRESS="/var/lib/YaST2/create_printer_ppd_database.progress" Modified: trunk/printer/tools/cups_client_only URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/cups_client_only?r… ============================================================================== --- trunk/printer/tools/cups_client_only (original) +++ trunk/printer/tools/cups_client_only Fri Jan 29 14:50:42 2010 @@ -1,13 +1,16 @@ #! /bin/bash # -# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009 +# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009, 2010 #set -x +# Make sure to have a clean environment: export PATH="/sbin:/usr/sbin:/usr/bin:/bin" export LC_ALL="POSIX" export LANG="POSIX" umask 022 +# Disable bash file name globbing: +set -f # When 'localhost' or its IP-address is to be set, # it is unified so that only 'localhost' or '127.0.0.1' are set Modified: trunk/printer/tools/determine_printer_driver_options URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/determine_printer_… ============================================================================== --- trunk/printer/tools/determine_printer_driver_options (original) +++ trunk/printer/tools/determine_printer_driver_options Fri Jan 29 14:50:42 2010 @@ -1,13 +1,16 @@ #! /bin/bash # -# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009 +# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009, 2010 #set -x +# Make sure to have a clean environment: export PATH="/sbin:/usr/sbin:/usr/bin:/bin" export LC_ALL="POSIX" export LANG="POSIX" umask 022 +# Disable bash file name globbing: +set -f MY_NAME=${0##*/} QUEUE="$1" Modified: trunk/printer/tools/modify_cupsd_conf URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/modify_cupsd_conf?… ============================================================================== --- trunk/printer/tools/modify_cupsd_conf (original) +++ trunk/printer/tools/modify_cupsd_conf Fri Jan 29 14:50:42 2010 @@ -1,13 +1,16 @@ #! /bin/bash # -# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009 +# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009, 2010 #set -x +# Make sure to have a clean environment: export PATH="/sbin:/usr/sbin:/usr/bin:/bin" export LC_ALL="POSIX" export LANG="POSIX" umask 022 +# Disable bash file name globbing: +set -f MY_NAME=${0##*/} CUPSDCONF="/etc/cups/cupsd.conf" Modified: trunk/printer/tools/test_device URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/test_device?rev=60… ============================================================================== --- trunk/printer/tools/test_device (original) +++ trunk/printer/tools/test_device Fri Jan 29 14:50:42 2010 @@ -6,15 +6,18 @@ # 2 problems while writing to $2 # # Jan Holesovsky <kendy(a)suse.cz>, 2000 -# Johannes Meixner <jsmeix(a)suse.de>, 2008 +# Johannes Meixner <jsmeix(a)suse.de>, 2008, 2010 # $Id: test_device 2928 2002-06-27 08:53:17Z jsrain $ #set -x +# Make sure to have a clean environment: export PATH="/sbin:/usr/sbin:/usr/bin:/bin" export LC_ALL="POSIX" export LANG="POSIX" umask 022 +# Disable bash file name globbing: +set -f EXITCODE=2 trap "EXITCODE=0" 10 Modified: trunk/printer/tools/test_remote_ipp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/test_remote_ipp?re… ============================================================================== --- trunk/printer/tools/test_remote_ipp (original) +++ trunk/printer/tools/test_remote_ipp Fri Jan 29 14:50:42 2010 @@ -13,7 +13,7 @@ # 15 lp not executable (no cups-client RPM installed?) # The program head is in the coreutils RPM and therefore assumed to exist. # -# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002, 2007, 2008, 2009 +# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002, 2007, 2008, 2009, 2010 # Jan Holesovsky <kendy(a)suse.cz>, 2000 # Jiri Srain <jsrain(a)suse.cz>, 2002 # $Id: test_remote_ipp 43943 2008-01-28 13:38:58Z mzugec $ @@ -25,6 +25,8 @@ export LC_ALL="POSIX" export LANG="POSIX" umask 022 +# Disable bash file name globbing: +set -f # Use the binaries of the operating system (no aliases, functions, /usr/local/): export PING=$( type -ap ping | head -n 1 ) Modified: trunk/printer/tools/test_remote_lpd URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/test_remote_lpd?re… ============================================================================== --- trunk/printer/tools/test_remote_lpd (original) +++ trunk/printer/tools/test_remote_lpd Fri Jan 29 14:50:42 2010 @@ -18,7 +18,7 @@ # since Suse Linux 11.0 /bin/mktemp is in the coreutils RPM which is required by YaST # The programs head, mkfifo, sleep, tr, rm are in the coreutils RPM and therefore assumed to exist. # -# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002, 2007, 2008, 2009 +# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002, 2007, 2008, 2009, 2010 # Jan Holesovsky <kendy(a)suse.cz>, 2000 # Jiri Srain <jsrain(a)suse.cz>, 2002 # $Id: test_remote_lpd 43943 2008-01-28 13:38:58Z mzugec $ @@ -30,6 +30,8 @@ export LC_ALL="POSIX" export LANG="POSIX" umask 022 +# Disable bash file name globbing: +set -f # Use the binaries of the operating system (no aliases, functions, /usr/local/): export PING=$( type -ap ping | head -n 1 ) Modified: trunk/printer/tools/test_remote_novell URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/test_remote_novell… ============================================================================== --- trunk/printer/tools/test_remote_novell (original) +++ trunk/printer/tools/test_remote_novell Fri Jan 29 14:50:42 2010 @@ -8,7 +8,7 @@ # (10=ping,11=netcat,12=fuser,13=mktemp,14=sed,15=lp,16=smbclient: see test_remote_smb) # 17 nprint not executable (no ncpfs RPM installed?) # -# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002, 2007, 2008, 2009 +# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002, 2007, 2008, 2009, 2010 # Jan Holesovsky <kendy(a)suse.cz>, 2000 # Jiri Srain <jsrain(a)suse.cz>, 2002 # $Id: test_remote_novell 43943 2008-01-28 13:38:58Z mzugec $ @@ -20,6 +20,8 @@ export LC_ALL="POSIX" export LANG="POSIX" umask 022 +# Disable bash file name globbing: +set -f # Use the binaries of the operating system (no aliases, functions, /usr/local/): export NPRINT=$( type -ap nprint | head -n 1 ) Modified: trunk/printer/tools/test_remote_smb URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/test_remote_smb?re… ============================================================================== --- trunk/printer/tools/test_remote_smb (original) +++ trunk/printer/tools/test_remote_smb Fri Jan 29 14:50:42 2010 @@ -11,7 +11,7 @@ # 16 smbclient not executable (no samba-client RPM installed?) # The programs head, mkfifo, sleep, tr, rm are in the coreutils RPM and therefore assumed to exist. # -# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002, 2007, 2008, 2009 +# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002, 2007, 2008, 2009, 2010 # Jan Holesovsky <kendy(a)suse.cz>, 2000 # Jiri Srain <jsrain(a)suse.cz>, 2002 # $Id: test_remote_smb 43943 2008-01-28 13:38:58Z mzugec $ @@ -23,6 +23,8 @@ export LC_ALL="POSIX" export LANG="POSIX" umask 022 +# Disable bash file name globbing: +set -f # Use the binaries of the operating system (no aliases, functions, /usr/local/): export PING=$( type -ap ping | head -n 1 ) Modified: trunk/printer/tools/test_remote_socket URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/test_remote_socket… ============================================================================== --- trunk/printer/tools/test_remote_socket (original) +++ trunk/printer/tools/test_remote_socket Fri Jan 29 14:50:42 2010 @@ -11,7 +11,7 @@ # 11 netcat not executable (no netcat RPM installed?) # The program head is in the coreutils RPM and therefore assumed to exist. # -# Johannes Meixner <jsmeix(a)suse.de> 2002, 2007, 2008, 2009 +# Johannes Meixner <jsmeix(a)suse.de> 2002, 2007, 2008, 2009, 2010 # Jiri Srain <jsrain(a)suse.cz>, 2002 # $Id: test_remote_socket 43943 2008-01-28 13:38:58Z mzugec $ @@ -22,6 +22,8 @@ export LC_ALL="POSIX" export LANG="POSIX" umask 022 +# Disable bash file name globbing: +set -f # Use the binaries of the operating system (no aliases, functions, /usr/local/): export PING=$( type -ap ping | head -n 1 ) -- 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] r60616 - /branches/tmp/bubli/qt/
by kmachalkova＠svn.opensuse.org 29 Jan '10

29 Jan '10

Author: kmachalkova Date: Fri Jan 29 13:33:07 2010 New Revision: 60616 URL: http://svn.opensuse.org/viewcvs/yast?rev=60616&view=rev Log: de-yastify qt Added: branches/tmp/bubli/qt/ (props changed) - copied from r60615, trunk/qt/ -- 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] r60615 - in /trunk/gtk: ChangeLog src/YGTable.cc src/YGUI.cc
by rpmcruz＠svn.opensuse.org 29 Jan '10

29 Jan '10

Author: rpmcruz Date: Fri Jan 29 13:17:42 2010 New Revision: 60615 URL: http://svn.opensuse.org/viewcvs/yast?rev=60615&view=rev Log: * src/YGTable.cc: bug fix 567505: crash when cell is unset: see firewall tool. * src/YGUI.cc: bug fix 547261: work around broken metacity icon by defaulting to the generic yast2 icon. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGTable.cc trunk/gtk/src/YGUI.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=60615&r1=60614… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Fri Jan 29 13:17:42 2010 @@ -1,3 +1,11 @@ +2010-01-29 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/YGTable.cc: bug fix 567505: crash when cell is + unset: see firewall tool. + + * src/YGUI.cc: bug fix 547261: work around broken metacity + icon by defaulting to the generic yast2 icon. + 2010-01-27 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/pkg/YGPackageSelector.cc: added --embold-installed-row Modified: trunk/gtk/src/YGTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGTable.cc?rev=60615&r1=… ============================================================================== --- trunk/gtk/src/YGTable.cc (original) +++ trunk/gtk/src/YGTable.cc Fri Jan 29 13:17:42 2010 @@ -295,16 +295,20 @@ { GtkTreeIter iter; if (getIter (cell->parent(), &iter)) - setCell (&iter, cell); + setCell (&iter, cell->column(), cell); } - void setCell (GtkTreeIter *iter, const YTableCell *cell) + void setCell (GtkTreeIter *iter, int column, const YTableCell *cell) { - int index = cell->column() * 2; - setCellIcon (iter, index, cell->iconName()); - std::string label (cell->label()); - if (label == "X") - label = YUI::app()->glyph (YUIGlyph_CheckMark); + int index = column * 2; + std::string icon, label; + if (cell) { + icon = cell->iconName(); + label = cell->label(); + if (label == "X") + label = YUI::app()->glyph (YUIGlyph_CheckMark); + } + setCellIcon (iter, index, icon); setCellLabel (iter, index+1, label); } @@ -350,7 +354,7 @@ GtkTreeIter iter; addRow (&iter, _item, true); for (int i = 0; i < columns(); i++) - setCell (&iter, item->cell (i)); + setCell (&iter, i, item->cell (i)); } else yuiError() << "Can only add YTableItems to a YTable.\n"; Modified: trunk/gtk/src/YGUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.cc?rev=60615&r1=606… ============================================================================== --- trunk/gtk/src/YGUI.cc (original) +++ trunk/gtk/src/YGUI.cc Fri Jan 29 13:17:42 2010 @@ -153,6 +153,12 @@ g_log_set_always_fatal (GLogLevelFlags (G_LOG_LEVEL_ERROR|G_LOG_LEVEL_CRITICAL| G_LOG_LEVEL_WARNING| G_LOG_LEVEL_MESSAGE|G_LOG_LEVEL_INFO|G_LOG_LEVEL_DEBUG)); #endif + + GdkPixbuf *pixbuf = YGUtils::loadPixbuf (THEMEDIR "/icons/32x32/apps/yast.png"); + if (pixbuf) { // default window icon + gtk_window_set_default_icon (pixbuf); + g_object_unref (G_OBJECT (pixbuf)); + } } static gboolean ycp_wakeup_fn (GIOChannel *source, GIOCondition condition, -- 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] r60614 - in /branches/SuSE-Code-11-SP1-Branch/gtk: VERSION package/yast2-gtk.changes
by rpmcruz＠svn.opensuse.org 29 Jan '10

29 Jan '10

Author: rpmcruz Date: Fri Jan 29 13:04:38 2010 New Revision: 60614 URL: http://svn.opensuse.org/viewcvs/yast?rev=60614&view=rev Log: Package coming! Modified: branches/SuSE-Code-11-SP1-Branch/gtk/VERSION branches/SuSE-Code-11-SP1-Branch/gtk/package/yast2-gtk.changes Modified: branches/SuSE-Code-11-SP1-Branch/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/gtk/V… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/gtk/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/gtk/VERSION Fri Jan 29 13:04:38 2010 @@ -1 +1 @@ -2.17.15 +2.17.16 Modified: branches/SuSE-Code-11-SP1-Branch/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/gtk/p… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/gtk/package/yast2-gtk.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/gtk/package/yast2-gtk.changes Fri Jan 29 13:04:38 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jan 29 13:00:00 CET 2009 - mkudlvasr(a)novell.com + +- crash on firewall tool (bnc#567505) +- Version 2.17.16 + + +------------------------------------------------------------------- Wed Nov 11 14:45:12 CET 2009 - mkudlvasr(a)novell.com - backport PackageSelector and zyppwrapper changes from 11.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] r60613 - in /branches/SuSE-Code-11-Branch/gtk: ChangeLog src/YGTable.cc
by rpmcruz＠svn.opensuse.org 29 Jan '10

29 Jan '10

Author: rpmcruz Date: Fri Jan 29 13:00:08 2010 New Revision: 60613 URL: http://svn.opensuse.org/viewcvs/yast?rev=60613&view=rev Log: * src/YGTable.cc: bug fix 567505: crash when cell is unset: see firewall tool. Modified: branches/SuSE-Code-11-Branch/gtk/ChangeLog branches/SuSE-Code-11-Branch/gtk/src/YGTable.cc Modified: branches/SuSE-Code-11-Branch/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/gtk/Chang… ============================================================================== --- branches/SuSE-Code-11-Branch/gtk/ChangeLog (original) +++ branches/SuSE-Code-11-Branch/gtk/ChangeLog Fri Jan 29 13:00:08 2010 @@ -1,3 +1,8 @@ +2010-01-29 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/YGTable.cc: bug fix 567505: crash when cell is + unset: see firewall tool. + 2009-07-18 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/yzyppwrapper.cc: bug fix 504424: don't crash on empty Modified: branches/SuSE-Code-11-Branch/gtk/src/YGTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/gtk/src/Y… ============================================================================== --- branches/SuSE-Code-11-Branch/gtk/src/YGTable.cc (original) +++ branches/SuSE-Code-11-Branch/gtk/src/YGTable.cc Fri Jan 29 13:00:08 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,11 +173,13 @@ return 80; } -protected: + // 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; @@ -175,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(); @@ -200,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 { @@ -224,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 @@ -251,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); } @@ -270,22 +295,25 @@ { GtkTreeIter iter; if (getIter (cell->parent(), &iter)) - setCell (&iter, cell); + setCell (&iter, cell->column(), cell); } - void setCell (GtkTreeIter *iter, const YTableCell *cell) + void setCell (GtkTreeIter *iter, int column, const YTableCell *cell) { - int index = cell->column() * 2; - setCellIcon (iter, index, cell->iconName()); - std::string label (cell->label()); - if (label == "X") - label = YUI::app()->glyph (YUIGlyph_CheckMark); + int index = column * 2; + std::string icon, label; + if (cell) { + icon = cell->iconName(); + label = cell->label(); + if (label == "X") + label = YUI::app()->glyph (YUIGlyph_CheckMark); + } + setCellIcon (iter, index, icon); setCellLabel (iter, index+1, label); } void setSortable (bool sortable) { - IMPL if (!sortable && !GTK_WIDGET_REALIZED (getWidget())) return; int n = 0; @@ -298,6 +326,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 @@ -314,8 +345,6 @@ virtual unsigned int getMinSize (YUIDimension dim) { return 30; } - YGWIDGET_IMPL_COMMON (YTable) - // YGSelectionModel virtual void doAddItem (YItem *_item) @@ -325,14 +354,12 @@ GtkTreeIter iter; addRow (&iter, _item, true); for (int i = 0; i < columns(); i++) - setCell (&iter, item->cell (i)); + setCell (&iter, i, item->cell (i)); } else 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: @@ -343,8 +370,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) { @@ -391,6 +422,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 @@ -417,19 +463,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" @@ -447,11 +493,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 @@ -484,7 +534,6 @@ { pThis->toggle (path, 0); } // YGSelectionModel - virtual void doSelectItem (GtkTreeIter *iter) { setCellToggle (iter, 0, true); @@ -501,18 +550,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" @@ -528,6 +573,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 -- 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] r60612 - in /branches/SuSE-Code-11-SP1-Branch/gtk: ChangeLog src/YGTable.cc
by rpmcruz＠svn.opensuse.org 29 Jan '10

29 Jan '10

Author: rpmcruz Date: Fri Jan 29 12:59:42 2010 New Revision: 60612 URL: http://svn.opensuse.org/viewcvs/yast?rev=60612&view=rev Log: * src/YGTable.cc: bug fix 567505: crash when cell is unset: see firewall tool. 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 Fri Jan 29 12:59:42 2010 @@ -1,3 +1,7 @@ +2010-01-29 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/YGTable.cc: bug fix 567505: definite fix. + 2010-01-19 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGTable.cc: bug fix 567505: simply backported SVN code. 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 Fri Jan 29 12:59:42 2010 @@ -295,16 +295,20 @@ { GtkTreeIter iter; if (getIter (cell->parent(), &iter)) - setCell (&iter, cell); + setCell (&iter, cell->column(), cell); } - void setCell (GtkTreeIter *iter, const YTableCell *cell) + void setCell (GtkTreeIter *iter, int column, const YTableCell *cell) { - int index = cell->column() * 2; - setCellIcon (iter, index, cell->iconName()); - std::string label (cell->label()); - if (label == "X") - label = YUI::app()->glyph (YUIGlyph_CheckMark); + int index = column * 2; + std::string icon, label; + if (cell) { + icon = cell->iconName(); + label = cell->label(); + if (label == "X") + label = YUI::app()->glyph (YUIGlyph_CheckMark); + } + setCellIcon (iter, index, icon); setCellLabel (iter, index+1, label); } @@ -350,7 +354,7 @@ GtkTreeIter iter; addRow (&iter, _item, true); for (int i = 0; i < columns(); i++) - setCell (&iter, item->cell (i)); + setCell (&iter, i, item->cell (i)); } else yuiError() << "Can only add YTableItems to a YTable.\n"; -- 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] r60611 - /tags/branch-Code-11-SP1-2_17_29/ldap-server/
by rhafer＠svn.opensuse.org 29 Jan '10

29 Jan '10

Author: rhafer Date: Fri Jan 29 12:24:45 2010 New Revision: 60611 URL: http://svn.opensuse.org/viewcvs/yast?rev=60611&view=rev Log: Created tag branch-Code-11-SP1-2_17_29 for ldap-server Added: tags/branch-Code-11-SP1-2_17_29/ldap-server/ (props changed) - copied from r60610, branches/SuSE-Code-11-SP1-Branch/ldap-server/ -- 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] r60610 - /trunk/storage/storage/src/include/ep-lib.ycp
by aschnell＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: aschnell Date: Thu Jan 28 18:39:23 2010 New Revision: 60610 URL: http://svn.opensuse.org/viewcvs/yast?rev=60610&view=rev Log: - shorter labels Modified: trunk/storage/storage/src/include/ep-lib.ycp Modified: trunk/storage/storage/src/include/ep-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lib.ycp Thu Jan 28 18:39:23 2010 @@ -344,7 +344,7 @@ case `CT_DMMULTIPATH: case `CT_MDPART: { - string emptyspace = _("Unpartitioned Space"); + string emptyspace = _("Unpartitioned"); // Filter out extended partitions list <map> partitions = (list <map>) filter ( map one_part, disk["partitions"]:[], { @@ -410,6 +410,8 @@ case `CT_LVM: { + string emptyspace = _("Unallocated"); + list <map> partitions = disk["partitions"]:[]; integer disk_size_k = disk["size_k"]:1; @@ -422,7 +424,7 @@ }); if (disk_free_k > 0) - AddSegment((float) disk_free_k / (float) disk_size_k, _("Unallocated Space"), disk_free_k); + AddSegment((float) disk_free_k / (float) disk_size_k, emptyspace, disk_free_k); } break; } -- 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] r60609 - /tags/stable-2_19_0/kerberos-client/
by jsuchome＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: jsuchome Date: Thu Jan 28 16:11:12 2010 New Revision: 60609 URL: http://svn.opensuse.org/viewcvs/yast?rev=60609&view=rev Log: Created tag stable-2_19_0 for kerberos-client Added: tags/stable-2_19_0/kerberos-client/ - copied from r60608, trunk/kerberos-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] r60608 - in /trunk/kerberos-client: VERSION package/yast2-kerberos-client.changes src/dialogs.ycp src/kerberos.ycp
by jsuchome＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: jsuchome Date: Thu Jan 28 16:11:03 2010 New Revision: 60608 URL: http://svn.opensuse.org/viewcvs/yast?rev=60608&view=rev Log: - leave DNS checkbox disabled when DNS info is not available (bnc#574679) - 2.19.0 Modified: trunk/kerberos-client/VERSION trunk/kerberos-client/package/yast2-kerberos-client.changes trunk/kerberos-client/src/dialogs.ycp trunk/kerberos-client/src/kerberos.ycp Modified: trunk/kerberos-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/VERSION?rev=6060… ============================================================================== --- trunk/kerberos-client/VERSION (original) +++ trunk/kerberos-client/VERSION Thu Jan 28 16:11:03 2010 @@ -1 +1 @@ -2.18.3 +2.19.0 Modified: trunk/kerberos-client/package/yast2-kerberos-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/package/yast2-ke… ============================================================================== --- trunk/kerberos-client/package/yast2-kerberos-client.changes (original) +++ trunk/kerberos-client/package/yast2-kerberos-client.changes Thu Jan 28 16:11:03 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jan 28 15:55:03 CET 2010 - jsuchome(a)suse.cz + +- leave DNS checkbox disabled when DNS info is not available + (bnc#574679) +- 2.19.0 + ------------------------------------------------------------------ Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz Modified: trunk/kerberos-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/src/dialogs.ycp?… ============================================================================== --- trunk/kerberos-client/src/dialogs.ycp (original) +++ trunk/kerberos-client/src/dialogs.ycp Thu Jan 28 16:11:03 2010 @@ -238,7 +238,7 @@ It is common practice to use the domain name in uppercase as your default realm name, but you can select freely. If the realm is not available on the server, you cannot log in. Ask your server administrator if you need more information. ") + - // help text for Use DNS to aquire the configuration data at runtime + // help text for Use DNS to acquire the configuration data at runtime _("Check Use DNS to Aquire the Configuration Data at Runtime to let your client use the Kerberos authentication data provided by DNS. This option cannot be selected if the DNS server does not provide such data.") + // help text 5/5 @@ -268,7 +268,7 @@ `HSpacing (2), `CheckBox (`id (`dns), `opt (`notify), // checkbox label - _("Use DN&S to aquire the configuration data at runtime"), + _("Use DN&S to acquire the configuration data at runtime"), dns_used) )), `VSpacing (), @@ -318,9 +318,10 @@ if (result == `pamyes || result == `pamno) { use_pam_krb = (result == `pamyes); - foreach (symbol widget, [`realm, `domain, `kdc, `advanced, `dns],``{ + foreach (symbol widget, [`realm, `domain, `kdc, `advanced],``{ UI::ChangeWidget (`id (widget), `Enabled, use_pam_krb); }); + UI::ChangeWidget (`id (`dns), `Enabled, dns_available && use_pam_krb); } if (result == `dns) { Modified: trunk/kerberos-client/src/kerberos.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/src/kerberos.ycp… ============================================================================== --- trunk/kerberos-client/src/kerberos.ycp (original) +++ trunk/kerberos-client/src/kerberos.ycp Thu Jan 28 16:11:03 2010 @@ -253,7 +253,7 @@ "help" : _("Disable the service") ], "dns" : $[ - "help" : _("Use DNS to aquire the configuration at runtime"), + "help" : _("Use DNS to acquire the configuration at runtime"), "type" : "enum", "typespec" : [ "yes", "no" ], ], -- 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] r60607 - in /trunk/autoinstallation: package/autoyast2.changes src/clients/software_auto.ycp src/modules/AutoinstSoftware.ycp src/schema/partitioning.rnc src/schema/software.rnc
by ug＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: ug Date: Thu Jan 28 13:23:39 2010 New Revision: 60607 URL: http://svn.opensuse.org/viewcvs/yast?rev=60607&view=rev Log: you can choose a different inst-source in the UI then the one of the running system Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/clients/software_auto.ycp trunk/autoinstallation/src/modules/AutoinstSoftware.ycp trunk/autoinstallation/src/schema/partitioning.rnc trunk/autoinstallation/src/schema/software.rnc Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Thu Jan 28 13:23:39 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 28 13:23:03 CET 2010 - ug(a)suse.de + +- you can choose a different inst-source in the UI then the one + of the running system + +------------------------------------------------------------------- Wed Jan 27 16:00:10 CET 2010 - ug(a)suse.de - symbol added for the use of ImsmDriver (bnc#574270) Modified: trunk/autoinstallation/src/clients/software_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/sof… ============================================================================== --- trunk/autoinstallation/src/clients/software_auto.ycp (original) +++ trunk/autoinstallation/src/clients/software_auto.ycp Thu Jan 28 13:23:39 2010 @@ -18,7 +18,8 @@ import "Label"; import "PackageAI"; import "AutoInstall"; - + import "SourceManager"; + include "autoinstall/dialogs.ycp"; any ret = nil; @@ -55,9 +56,56 @@ Pkg::CallbackAcceptFileWithoutChecksum(AutoInstall::callbackTrue_boolean_string); Pkg::CallbackAcceptUnsignedFile(AutoInstall::callbackTrue_boolean_string_integer); - Pkg::TargetInit("/", false); + string tmpdir = (string)SCR::Read(.target.tmpdir); // AutoinstSoftware::pmInit(); + //string mainRepo = "http://10.10.0.162/SLES11/DVD1/"; + //string mainRepo = "ftp://10.10.0.100/install/SLP/openSUSE-11.2/x86_64/DVD1/"; + string mainRepo = AutoinstSoftware::instsource; + term contents = `VBox( + `HBox( + `VBox( + `TextEntry(`id(`location), _("Location of the installation source"), mainRepo), + `CheckBox(`id(`localSource), `opt(`notify), _("The inst-source of this system"), mainRepo == "" ) + ) + ), + `HBox( + `PushButton(`id(`ok), "&OK"), + `PushButton(`id(`abort), "&Abort") + ) + ); + UI::OpenDialog( `opt(`decorated ), contents ); + UI::ChangeWidget(`id(`location) , `Enabled, mainRepo != "" ); + boolean okay = false; + do { + any ret = nil; + ret = UI::UserInput(); + if( ret == `ok ) { + if( (boolean)UI::QueryWidget(`id(`localSource), `Value) ) { + Pkg::TargetInit("/", false); + okay = true; + } else { + mainRepo = (string)UI::QueryWidget(`id(`location), `Value); + Pkg::TargetInit(tmpdir, false); + if( SourceManager::createSource (mainRepo) == `ok ) + okay = true; + else + Popup::Error( _("using that installation source failed") ); + } + } else if( ret == `abort ) { + UI::CloseDialog(); + return `back; + } else if( ret == `localSource ) { + boolean localSource = (boolean)UI::QueryWidget(`id(`localSource), `Value); + UI::ChangeWidget(`id(`location) , `Enabled, !localSource); + if( localSource ) + UI::ChangeWidget(`id(`location) , `Value, ""); + } + } while( ! okay ); + UI::CloseDialog(); + AutoinstSoftware::instsource = mainRepo; + + Pkg::SourceStartManager(true); Wizard::CreateDialog(); @@ -68,7 +116,7 @@ helptext, false, true); list<map<string,any> > patterns = Pkg::ResolvableProperties ("", `pattern, ""); y2milestone("available patterns %1",patterns); - Pkg::TargetInit("/tmp", false); // don't copy the list of really installed packages (#231687) +// Pkg::TargetInit("/tmp", false); // don't copy the list of really installed packages (#231687) // Construct a box with radiobuttons for each software base configuration term baseconfs_box = `VBox(); Modified: trunk/autoinstallation/src/modules/AutoinstSoftware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstSoftware.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstSoftware.ycp Thu Jan 28 13:23:39 2010 @@ -53,6 +53,8 @@ global list<string> inst = []; global list<map<string,any> > all_xpatterns = []; + global string instsource = ""; + /** * Function sets internal variable, which indicates, that any * settings were modified, to "true" @@ -81,10 +83,16 @@ { Software = settings; patterns = settings["patterns"]:[]; + instsource = settings["instsource"]:""; string notFound = ""; + + /* what is this good for? disturbs the main-repo selection */ + /* Packages::Init(true); Packages::InitializeAddOnProducts(); + */ + list<string> packagesAvailable = Pkg::GetPackages (`available, true); list<string> patternsAvailable = []; list<map<string,any> > allPatterns = Pkg::ResolvableDependencies ("", `pattern, ""); @@ -195,6 +203,7 @@ if (PackageAI::toremove != []) s["remove-packages"] = PackageAI::toremove; + s["instsource"] = instsource; return (s); } Modified: trunk/autoinstallation/src/schema/partitioning.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/schema/part… ============================================================================== --- trunk/autoinstallation/src/schema/partitioning.rnc (original) +++ trunk/autoinstallation/src/schema/partitioning.rnc Thu Jan 28 13:23:39 2010 @@ -16,6 +16,7 @@ element pesize { text }? & element type { SYMBOL }? & element use { text }? & + element imsmdriver { SYMBOL }? & partitions? } prefer_remove = Modified: trunk/autoinstallation/src/schema/software.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/schema/soft… ============================================================================== --- trunk/autoinstallation/src/schema/software.rnc (original) +++ trunk/autoinstallation/src/schema/software.rnc Thu Jan 28 13:23:39 2010 @@ -10,7 +10,8 @@ post-patterns? & remove-packages? & patterns? & - element do_online_update { BOOLEAN }? + element do_online_update { BOOLEAN }? & + element instsource {text}? } patterns = element patterns { -- 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] r60606 - /trunk/installation/control/control.SLES.xml
by kmachalkova＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: kmachalkova Date: Thu Jan 28 12:56:54 2010 New Revision: 60606 URL: http://svn.opensuse.org/viewcvs/yast?rev=60606&view=rev Log: Added missing label to trunk, too Modified: trunk/installation/control/control.SLES.xml Modified: trunk/installation/control/control.SLES.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLE… ============================================================================== --- trunk/installation/control/control.SLES.xml (original) +++ trunk/installation/control/control.SLES.xml Thu Jan 28 12:56:54 2010 @@ -646,6 +646,7 @@ </proposal> <proposal> + <label>Network Services Configuration</label> <name>service</name> <stage>continue,normal</stage> <unique_id>service_continue</unique_id> -- 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] r60605 - in /branches/SuSE-Code-11-SP1-Branch/wagon: package/yast2-wagon.changes src/include/common_func.ycp
by locilka＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: locilka Date: Thu Jan 28 12:37:14 2010 New Revision: 60605 URL: http://svn.opensuse.org/viewcvs/yast?rev=60605&view=rev Log: Fixed reset-packager functionality (BNC #573575). Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP1-Branch/wagon/src/include/common_func.ycp Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes Thu Jan 28 12:37:14 2010 @@ -2,6 +2,7 @@ Thu Jan 28 11:45:12 CET 2010 - locilka(a)suse.cz - Updated RPM dependencies (BNC #573482). +- Fixed reset-packager functionality (BNC #573575). ------------------------------------------------------------------- Wed Jan 27 11:52:01 CET 2010 - locilka(a)suse.cz Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/include/common_func.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/include/common_func.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/include/common_func.ycp Thu Jan 28 12:37:14 2010 @@ -112,7 +112,7 @@ string name = nil; y2milestone ("Neutralizing all resolvables"); - foreach (symbol resolvable, [`pattern, `patch, `package, `product, `scrpackage], { + foreach (symbol resolvable, [`pattern, `patch, `package, `product, `srcpackage], { Pkg::ResolvableNeutral ("" /* all */, resolvable, true /* force */); }); -- 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] r60604 - in /branches/SuSE-Code-11-Branch/wagon: package/yast2-wagon.changes src/include/common_func.ycp
by locilka＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: locilka Date: Thu Jan 28 12:36:59 2010 New Revision: 60604 URL: http://svn.opensuse.org/viewcvs/yast?rev=60604&view=rev Log: Fixed reset-packager functionality (BNC #573575). Modified: branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-Branch/wagon/src/include/common_func.ycp Modified: branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/pac… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes Thu Jan 28 12:36:59 2010 @@ -2,6 +2,7 @@ Thu Jan 28 11:45:12 CET 2010 - locilka(a)suse.cz - Updated RPM dependencies (BNC #573482). +- Fixed reset-packager functionality (BNC #573575). ------------------------------------------------------------------- Wed Jan 27 11:52:01 CET 2010 - locilka(a)suse.cz Modified: branches/SuSE-Code-11-Branch/wagon/src/include/common_func.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/include/common_func.ycp (original) +++ branches/SuSE-Code-11-Branch/wagon/src/include/common_func.ycp Thu Jan 28 12:36:59 2010 @@ -112,7 +112,7 @@ string name = nil; y2milestone ("Neutralizing all resolvables"); - foreach (symbol resolvable, [`pattern, `patch, `package, `product, `scrpackage], { + foreach (symbol resolvable, [`pattern, `patch, `package, `product, `srcpackage], { Pkg::ResolvableNeutral ("" /* all */, resolvable, true /* force */); }); -- 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] r60603 - in /trunk/wagon: package/yast2-wagon.changes src/include/common_func.ycp
by locilka＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: locilka Date: Thu Jan 28 12:36:37 2010 New Revision: 60603 URL: http://svn.opensuse.org/viewcvs/yast?rev=60603&view=rev Log: Fixed reset-packager functionality (BNC #573575). Modified: trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/include/common_func.ycp Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Thu Jan 28 12:36:37 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jan 28 11:45:12 CET 2010 - locilka(a)suse.cz + +- Fixed reset-packager functionality (BNC #573575). + +------------------------------------------------------------------- Wed Jan 27 11:52:01 CET 2010 - locilka(a)suse.cz - Disabling repositories that provide some old version of product Modified: trunk/wagon/src/include/common_func.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/include/common_func.yc… ============================================================================== --- trunk/wagon/src/include/common_func.ycp (original) +++ trunk/wagon/src/include/common_func.ycp Thu Jan 28 12:36:37 2010 @@ -112,7 +112,7 @@ string name = nil; y2milestone ("Neutralizing all resolvables"); - foreach (symbol resolvable, [`pattern, `patch, `package, `product, `scrpackage], { + foreach (symbol resolvable, [`pattern, `patch, `package, `product, `srcpackage], { Pkg::ResolvableNeutral ("" /* all */, resolvable, true /* force */); }); -- 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] r60602 - /branches/SuSE-Code-11-SP1-Branch/installation/control/control.SLES.xml
by kmachalkova＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: kmachalkova Date: Thu Jan 28 12:32:29 2010 New Revision: 60602 URL: http://svn.opensuse.org/viewcvs/yast?rev=60602&view=rev Log: Added missing label to network services proposal (bnc#572654) Modified: branches/SuSE-Code-11-SP1-Branch/installation/control/control.SLES.xml Modified: branches/SuSE-Code-11-SP1-Branch/installation/control/control.SLES.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/control/control.SLES.xml (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/control/control.SLES.xml Thu Jan 28 12:32:29 2010 @@ -638,6 +638,7 @@ </proposal> <proposal> + <label>Network Services Configuration</label> <name>service</name> <stage>continue,normal</stage> <proposal_modules config:type="list"> -- 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] r60601 - /tags/branch-Code-11-SP1-2_17_19/update/
by locilka＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: locilka Date: Thu Jan 28 12:05:47 2010 New Revision: 60601 URL: http://svn.opensuse.org/viewcvs/yast?rev=60601&view=rev Log: Created tag branch-Code-11-SP1-2_17_19 for update Added: tags/branch-Code-11-SP1-2_17_19/update/ (props changed) - copied from r60600, branches/SuSE-Code-11-SP1-Branch/update/ -- 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] r60600 - /tags/branch-Code-11-2_17_18_1/update/
by locilka＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: locilka Date: Thu Jan 28 12:01:07 2010 New Revision: 60600 URL: http://svn.opensuse.org/viewcvs/yast?rev=60600&view=rev Log: Created tag branch-Code-11-2_17_18_1 for update Added: tags/branch-Code-11-2_17_18_1/update/ - copied from r60599, branches/SuSE-Code-11-Branch/update/ -- 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] r60599 - /tags/branch-Code-11-2_17_18_1/
by locilka＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: locilka Date: Thu Jan 28 12:01:05 2010 New Revision: 60599 URL: http://svn.opensuse.org/viewcvs/yast?rev=60599&view=rev Log: Created tag branch-Code-11-2_17_18_1 Added: tags/branch-Code-11-2_17_18_1/ -- 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] r60598 - /trunk/wagon/src/config/online_migration.xml
by locilka＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: locilka Date: Thu Jan 28 11:53:03 2010 New Revision: 60598 URL: http://svn.opensuse.org/viewcvs/yast?rev=60598&view=rev Log: Added yast-update to packages selected for (self) upgrade Modified: trunk/wagon/src/config/online_migration.xml Modified: trunk/wagon/src/config/online_migration.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/config/online_migratio… ============================================================================== --- trunk/wagon/src/config/online_migration.xml (original) +++ trunk/wagon/src/config/online_migration.xml Thu Jan 28 11:53:03 2010 @@ -162,6 +162,7 @@ <package>yast2-wagon</package> <package>yast2-online-update</package> <package>yast2-pkg-bindings</package> + <package>yast2-update</package> <package>libzypp</package> </packages_affecting_pkg_manager> </software> -- 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] r60597 - in /branches/SuSE-Code-11-Branch/wagon: package/yast2-wagon.changes src/config/online_migration.xml yast2-wagon.spec.in
by locilka＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: locilka Date: Thu Jan 28 11:52:23 2010 New Revision: 60597 URL: http://svn.opensuse.org/viewcvs/yast?rev=60597&view=rev Log: Updated RPM dependencies (BNC #573482) Modified: branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-Branch/wagon/src/config/online_migration.xml branches/SuSE-Code-11-Branch/wagon/yast2-wagon.spec.in Modified: branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/pac… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes Thu Jan 28 11:52:23 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jan 28 11:45:12 CET 2010 - locilka(a)suse.cz + +- Updated RPM dependencies (BNC #573482). + +------------------------------------------------------------------- Wed Jan 27 11:52:01 CET 2010 - locilka(a)suse.cz - Disabling repositories that provide some old version of product Modified: branches/SuSE-Code-11-Branch/wagon/src/config/online_migration.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/config/online_migration.xml (original) +++ branches/SuSE-Code-11-Branch/wagon/src/config/online_migration.xml Thu Jan 28 11:52:23 2010 @@ -162,6 +162,7 @@ <package>yast2-wagon</package> <package>yast2-online-update</package> <package>yast2-pkg-bindings</package> + <package>yast2-update</package> <package>libzypp</package> </packages_affecting_pkg_manager> </software> Modified: branches/SuSE-Code-11-Branch/wagon/yast2-wagon.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/yas… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/yast2-wagon.spec.in (original) +++ branches/SuSE-Code-11-Branch/wagon/yast2-wagon.spec.in Thu Jan 28 11:52:23 2010 @@ -8,7 +8,10 @@ Requires: yast2-pkg-bindings >= 2.17.39.2 # Called in proposal and in code -Requires: yast2-packager yast2-update yast2-add-on +Requires: yast2-packager yast2-add-on + +# Counting packages directly in packages proposal (BNC #573482) +Requires: yast2-update >= 2.17.18.1 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-update -- 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] r60596 - in /branches/SuSE-Code-11-SP1-Branch/wagon: package/yast2-wagon.changes src/config/online_migration.xml yast2-wagon.spec.in
by locilka＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: locilka Date: Thu Jan 28 11:51:49 2010 New Revision: 60596 URL: http://svn.opensuse.org/viewcvs/yast?rev=60596&view=rev Log: Updated RPM dependencies (BNC #573482) Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes Thu Jan 28 11:51:49 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jan 28 11:45:12 CET 2010 - locilka(a)suse.cz + +- Updated RPM dependencies (BNC #573482). + +------------------------------------------------------------------- Wed Jan 27 11:52:01 CET 2010 - locilka(a)suse.cz - Disabling repositories that provide some old version of product Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml Thu Jan 28 11:51:49 2010 @@ -162,6 +162,7 @@ <package>yast2-wagon</package> <package>yast2-online-update</package> <package>yast2-pkg-bindings</package> + <package>yast2-update</package> <package>libzypp</package> </packages_affecting_pkg_manager> </software> Modified: branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in Thu Jan 28 11:51:49 2010 @@ -8,7 +8,10 @@ Requires: yast2-pkg-bindings >= 2.17.44 # Called in proposal and in code -Requires: yast2-packager yast2-update yast2-add-on +Requires: yast2-packager yast2-add-on + +# Counting packages directly in packages proposal (BNC #573482) +Requires: yast2-update >= 2.17.19 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-update -- 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] r60595 - in /branches/SuSE-Code-11-Branch/update: VERSION package/yast2-update.changes src/clients/packages_proposal.ycp src/clients/update_proposal.ycp
by locilka＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: locilka Date: Thu Jan 28 11:13:46 2010 New Revision: 60595 URL: http://svn.opensuse.org/viewcvs/yast?rev=60595&view=rev Log: - Counting packages directly in packages proposal (BNC #573482). - 2.17.18.1 Modified: branches/SuSE-Code-11-Branch/update/VERSION branches/SuSE-Code-11-Branch/update/package/yast2-update.changes branches/SuSE-Code-11-Branch/update/src/clients/packages_proposal.ycp branches/SuSE-Code-11-Branch/update/src/clients/update_proposal.ycp Modified: branches/SuSE-Code-11-Branch/update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/update/VE… ============================================================================== --- branches/SuSE-Code-11-Branch/update/VERSION (original) +++ branches/SuSE-Code-11-Branch/update/VERSION Thu Jan 28 11:13:46 2010 @@ -1 +1 @@ -2.17.18 +2.17.18.1 Modified: branches/SuSE-Code-11-Branch/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/update/pa… ============================================================================== --- branches/SuSE-Code-11-Branch/update/package/yast2-update.changes (original) +++ branches/SuSE-Code-11-Branch/update/package/yast2-update.changes Thu Jan 28 11:13:46 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 28 11:07:00 CET 2010 - locilka(a)suse.cz + +- Counting packages directly in packages proposal (BNC #573482). +- 2.17.18.1 + +------------------------------------------------------------------- Mon Jan 19 16:17:31 CET 2009 - locilka(a)suse.cz - Added possibility to manually choose a /var partition if YaST Modified: branches/SuSE-Code-11-Branch/update/src/clients/packages_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/update/sr… ============================================================================== --- branches/SuSE-Code-11-Branch/update/src/clients/packages_proposal.ycp (original) +++ branches/SuSE-Code-11-Branch/update/src/clients/packages_proposal.ycp Thu Jan 28 11:13:46 2010 @@ -59,6 +59,46 @@ // SpaceCalculation::ShowPartitionWarning (); list<string> warning = SpaceCalculation::GetPartitionWarning (); + // Count statistics --> + // Pkg::GetPackages() + // `installed all installed packages + // `selected returns all selected but not yet installed packages + // `available returns all available packages (from the installation source) + // `removed all packages selected for removal + + // recreate the update summary + list<string> installed = Pkg::GetPackages (`installed, true); + list<string> selected = Pkg::GetPackages (`selected, true); + list<string> removed = Pkg::GetPackages (`removed, true); + integer cnt_installed = size (installed); + integer cnt_selected = size (selected); + integer cnt_removed = size (removed); + y2milestone ("Selected: %1, Installed: %2, Removed: %3", cnt_selected, cnt_installed, cnt_removed); + y2milestone("Removed: %1", removed); + + map<string,boolean> installed_m = listmap (string p, installed, { + return $[ p : true ]; + }); + map<string,boolean> selected_m = listmap (string p, selected, { + return $[ p : true ]; + }); + + // packages that are both 'installed' && 'selected' + Update::packages_to_update = size (filter (string p, selected, { + return haskey (installed_m, p); + })); + // packages that are 'selected' but not 'installed' + Update::packages_to_install = cnt_selected - Update::packages_to_update; + + // packages that are 'removed' but not 'selected again' + Update::packages_to_remove = size (filter (string p, removed, { + return ! haskey (selected_m, p); + })); + + y2milestone("Update statistics: Updated: %1, Installed: %2, Removed: %3", + Update::packages_to_update, Update::packages_to_install, Update::packages_to_remove); + // <-- Count statistics + list<string> tmp = []; // proposal for packages during update, %1 is count of packages Modified: branches/SuSE-Code-11-Branch/update/src/clients/update_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/update/sr… ============================================================================== --- branches/SuSE-Code-11-Branch/update/src/clients/update_proposal.ycp (original) +++ branches/SuSE-Code-11-Branch/update/src/clients/update_proposal.ycp Thu Jan 28 11:13:46 2010 @@ -304,43 +304,6 @@ Update::products_incompatible = true; } } - // Pkg::GetPackages() - // `installed all installed packages - // `selected returns all selected but not yet installed packages - // `available returns all available packages (from the installation source) - // `removed all packages selected for removal - - // recreate the update summary - list<string> installed = Pkg::GetPackages (`installed, true); - list<string> selected = Pkg::GetPackages (`selected, true); - list<string> removed = Pkg::GetPackages (`removed, true); - integer cnt_installed = size (installed); - integer cnt_selected = size (selected); - integer cnt_removed = size (removed); - y2milestone ("Selected: %1, Installed: %2, Removed: %3", cnt_selected, cnt_installed, cnt_removed); - y2milestone("Removed: %1", removed); - - map<string,boolean> installed_m = listmap (string p, installed, { - return $[ p : true ]; - }); - map<string,boolean> selected_m = listmap (string p, selected, { - return $[ p : true ]; - }); - - // packages that are both 'installed' && 'selected' - Update::packages_to_update = size (filter (string p, selected, { - return haskey (installed_m, p); - })); - // packages that are 'selected' but not 'installed' - Update::packages_to_install = cnt_selected - Update::packages_to_update; - - // packages that are 'removed' but not 'selected again' - Update::packages_to_remove = size (filter (string p, removed, { - return ! haskey (selected_m, p); - })); - - y2milestone("Update statistics: Updated: %1, Installed: %2, Removed: %3", - Update::packages_to_update, Update::packages_to_install, Update::packages_to_remove); } -- 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] r60594 - in /branches/SuSE-Code-11-SP1-Branch/update: VERSION package/yast2-update.changes src/clients/packages_proposal.ycp src/clients/update_proposal.ycp
by locilka＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: locilka Date: Thu Jan 28 11:13:19 2010 New Revision: 60594 URL: http://svn.opensuse.org/viewcvs/yast?rev=60594&view=rev Log: - Counting packages directly in packages proposal (BNC #573482). - 2.17.19 Modified: branches/SuSE-Code-11-SP1-Branch/update/VERSION branches/SuSE-Code-11-SP1-Branch/update/package/yast2-update.changes branches/SuSE-Code-11-SP1-Branch/update/src/clients/packages_proposal.ycp branches/SuSE-Code-11-SP1-Branch/update/src/clients/update_proposal.ycp Modified: branches/SuSE-Code-11-SP1-Branch/update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/updat… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/update/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/update/VERSION Thu Jan 28 11:13:19 2010 @@ -1 +1 @@ -2.17.18 +2.17.19 Modified: branches/SuSE-Code-11-SP1-Branch/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/updat… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/update/package/yast2-update.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/update/package/yast2-update.changes Thu Jan 28 11:13:19 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 28 11:07:00 CET 2010 - locilka(a)suse.cz + +- Counting packages directly in packages proposal (BNC #573482). +- 2.17.19 + +------------------------------------------------------------------- Tue May 12 13:06:56 CEST 2009 - locilka(a)suse.cz - Removed copying inst-sys users to installed system during Modified: branches/SuSE-Code-11-SP1-Branch/update/src/clients/packages_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/updat… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/update/src/clients/packages_proposal.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/update/src/clients/packages_proposal.ycp Thu Jan 28 11:13:19 2010 @@ -59,6 +59,46 @@ // SpaceCalculation::ShowPartitionWarning (); list<string> warning = SpaceCalculation::GetPartitionWarning (); + // Count statistics --> + // Pkg::GetPackages() + // `installed all installed packages + // `selected returns all selected but not yet installed packages + // `available returns all available packages (from the installation source) + // `removed all packages selected for removal + + // recreate the update summary + list<string> installed = Pkg::GetPackages (`installed, true); + list<string> selected = Pkg::GetPackages (`selected, true); + list<string> removed = Pkg::GetPackages (`removed, true); + integer cnt_installed = size (installed); + integer cnt_selected = size (selected); + integer cnt_removed = size (removed); + y2milestone ("Selected: %1, Installed: %2, Removed: %3", cnt_selected, cnt_installed, cnt_removed); + y2milestone("Removed: %1", removed); + + map<string,boolean> installed_m = listmap (string p, installed, { + return $[ p : true ]; + }); + map<string,boolean> selected_m = listmap (string p, selected, { + return $[ p : true ]; + }); + + // packages that are both 'installed' && 'selected' + Update::packages_to_update = size (filter (string p, selected, { + return haskey (installed_m, p); + })); + // packages that are 'selected' but not 'installed' + Update::packages_to_install = cnt_selected - Update::packages_to_update; + + // packages that are 'removed' but not 'selected again' + Update::packages_to_remove = size (filter (string p, removed, { + return ! haskey (selected_m, p); + })); + + y2milestone("Update statistics: Updated: %1, Installed: %2, Removed: %3", + Update::packages_to_update, Update::packages_to_install, Update::packages_to_remove); + // <-- Count statistics + list<string> tmp = []; // proposal for packages during update, %1 is count of packages Modified: branches/SuSE-Code-11-SP1-Branch/update/src/clients/update_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/updat… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/update/src/clients/update_proposal.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/update/src/clients/update_proposal.ycp Thu Jan 28 11:13:19 2010 @@ -304,43 +304,6 @@ Update::products_incompatible = true; } } - // Pkg::GetPackages() - // `installed all installed packages - // `selected returns all selected but not yet installed packages - // `available returns all available packages (from the installation source) - // `removed all packages selected for removal - - // recreate the update summary - list<string> installed = Pkg::GetPackages (`installed, true); - list<string> selected = Pkg::GetPackages (`selected, true); - list<string> removed = Pkg::GetPackages (`removed, true); - integer cnt_installed = size (installed); - integer cnt_selected = size (selected); - integer cnt_removed = size (removed); - y2milestone ("Selected: %1, Installed: %2, Removed: %3", cnt_selected, cnt_installed, cnt_removed); - y2milestone("Removed: %1", removed); - - map<string,boolean> installed_m = listmap (string p, installed, { - return $[ p : true ]; - }); - map<string,boolean> selected_m = listmap (string p, selected, { - return $[ p : true ]; - }); - - // packages that are both 'installed' && 'selected' - Update::packages_to_update = size (filter (string p, selected, { - return haskey (installed_m, p); - })); - // packages that are 'selected' but not 'installed' - Update::packages_to_install = cnt_selected - Update::packages_to_update; - - // packages that are 'removed' but not 'selected again' - Update::packages_to_remove = size (filter (string p, removed, { - return ! haskey (selected_m, p); - })); - - y2milestone("Update statistics: Updated: %1, Installed: %2, Removed: %3", - Update::packages_to_update, Update::packages_to_install, Update::packages_to_remove); } -- 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] r60593 - in /trunk/update: package/yast2-update.changes src/clients/packages_proposal.ycp src/clients/update_proposal.ycp
by locilka＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: locilka Date: Thu Jan 28 11:12:45 2010 New Revision: 60593 URL: http://svn.opensuse.org/viewcvs/yast?rev=60593&view=rev Log: - Counting packages directly in packages proposal (BNC #573482). Modified: trunk/update/package/yast2-update.changes trunk/update/src/clients/packages_proposal.ycp trunk/update/src/clients/update_proposal.ycp Modified: trunk/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/package/yast2-update.chan… ============================================================================== --- trunk/update/package/yast2-update.changes (original) +++ trunk/update/package/yast2-update.changes Thu Jan 28 11:12:45 2010 @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 28 11:07:00 CET 2010 - locilka(a)suse.cz + +- Counting packages directly in packages proposal (BNC #573482). + ------------------------------------------------------------------ Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz Modified: trunk/update/src/clients/packages_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/packages_prop… ============================================================================== --- trunk/update/src/clients/packages_proposal.ycp (original) +++ trunk/update/src/clients/packages_proposal.ycp Thu Jan 28 11:12:45 2010 @@ -59,6 +59,46 @@ // SpaceCalculation::ShowPartitionWarning (); list<string> warning = SpaceCalculation::GetPartitionWarning (); + // Count statistics --> + // Pkg::GetPackages() + // `installed all installed packages + // `selected returns all selected but not yet installed packages + // `available returns all available packages (from the installation source) + // `removed all packages selected for removal + + // recreate the update summary + list<string> installed = Pkg::GetPackages (`installed, true); + list<string> selected = Pkg::GetPackages (`selected, true); + list<string> removed = Pkg::GetPackages (`removed, true); + integer cnt_installed = size (installed); + integer cnt_selected = size (selected); + integer cnt_removed = size (removed); + y2milestone ("Selected: %1, Installed: %2, Removed: %3", cnt_selected, cnt_installed, cnt_removed); + y2milestone("Removed: %1", removed); + + map<string,boolean> installed_m = listmap (string p, installed, { + return $[ p : true ]; + }); + map<string,boolean> selected_m = listmap (string p, selected, { + return $[ p : true ]; + }); + + // packages that are both 'installed' && 'selected' + Update::packages_to_update = size (filter (string p, selected, { + return haskey (installed_m, p); + })); + // packages that are 'selected' but not 'installed' + Update::packages_to_install = cnt_selected - Update::packages_to_update; + + // packages that are 'removed' but not 'selected again' + Update::packages_to_remove = size (filter (string p, removed, { + return ! haskey (selected_m, p); + })); + + y2milestone("Update statistics: Updated: %1, Installed: %2, Removed: %3", + Update::packages_to_update, Update::packages_to_install, Update::packages_to_remove); + // <-- Count statistics + list<string> tmp = []; // proposal for packages during update, %1 is count of packages Modified: trunk/update/src/clients/update_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/update_propos… ============================================================================== --- trunk/update/src/clients/update_proposal.ycp (original) +++ trunk/update/src/clients/update_proposal.ycp Thu Jan 28 11:12:45 2010 @@ -304,43 +304,6 @@ Update::products_incompatible = true; } } - // Pkg::GetPackages() - // `installed all installed packages - // `selected returns all selected but not yet installed packages - // `available returns all available packages (from the installation source) - // `removed all packages selected for removal - - // recreate the update summary - list<string> installed = Pkg::GetPackages (`installed, true); - list<string> selected = Pkg::GetPackages (`selected, true); - list<string> removed = Pkg::GetPackages (`removed, true); - integer cnt_installed = size (installed); - integer cnt_selected = size (selected); - integer cnt_removed = size (removed); - y2milestone ("Selected: %1, Installed: %2, Removed: %3", cnt_selected, cnt_installed, cnt_removed); - y2milestone("Removed: %1", removed); - - map<string,boolean> installed_m = listmap (string p, installed, { - return $[ p : true ]; - }); - map<string,boolean> selected_m = listmap (string p, selected, { - return $[ p : true ]; - }); - - // packages that are both 'installed' && 'selected' - Update::packages_to_update = size (filter (string p, selected, { - return haskey (installed_m, p); - })); - // packages that are 'selected' but not 'installed' - Update::packages_to_install = cnt_selected - Update::packages_to_update; - - // packages that are 'removed' but not 'selected again' - Update::packages_to_remove = size (filter (string p, removed, { - return ! haskey (selected_m, p); - })); - - y2milestone("Update statistics: Updated: %1, Installed: %2, Removed: %3", - Update::packages_to_update, Update::packages_to_install, Update::packages_to_remove); } -- 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] r60592 - /branches/SuSE-Code-11-SP1-Branch/autofs/package/yast2-autofs.changes
by varkoly＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: varkoly Date: Thu Jan 28 11:00:05 2010 New Revision: 60592 URL: http://svn.opensuse.org/viewcvs/yast?rev=60592&view=rev Log: Fix the changes Modified: branches/SuSE-Code-11-SP1-Branch/autofs/package/yast2-autofs.changes Modified: branches/SuSE-Code-11-SP1-Branch/autofs/package/yast2-autofs.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autof… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autofs/package/yast2-autofs.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/autofs/package/yast2-autofs.changes Thu Jan 28 11:00:05 2010 @@ -2,6 +2,10 @@ Thu Jan 28 10:39:39 CET 2010 - varkoly(a)novell.com - bnc#572823 - Error message in autofs configuration is incorrect + +------------------------------------------------------------------- +Thu Jan 8 13:38:14 CET 2009 - varkoly(a)suse.de + - bnc#464358 - error on console: Use of uninitialized value ------------------------------------------------------------------- -- 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] r60591 - /tags/branch-Code-11-SP1-2_17_1/autofs/
by varkoly＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: varkoly Date: Thu Jan 28 10:53:33 2010 New Revision: 60591 URL: http://svn.opensuse.org/viewcvs/yast?rev=60591&view=rev Log: Created tag branch-Code-11-SP1-2_17_1 for autofs Added: tags/branch-Code-11-SP1-2_17_1/autofs/ (props changed) - copied from r60590, branches/SuSE-Code-11-SP1-Branch/autofs/ -- 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] r60590 - /branches/SuSE-Code-11-SP1-Branch/autofs/VERSION
by varkoly＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: varkoly Date: Thu Jan 28 10:53:26 2010 New Revision: 60590 URL: http://svn.opensuse.org/viewcvs/yast?rev=60590&view=rev Log: SLES-SP1 VERSION Modified: branches/SuSE-Code-11-SP1-Branch/autofs/VERSION Modified: branches/SuSE-Code-11-SP1-Branch/autofs/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autof… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autofs/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/autofs/VERSION Thu Jan 28 10:53:26 2010 @@ -1 +1 @@ -2.15.4 +2.17.1 -- 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] r60589 - in /branches/SuSE-Code-11-SP1-Branch/autofs: package/yast2-autofs.changes src/Autofs.pm
by varkoly＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: varkoly Date: Thu Jan 28 10:52:15 2010 New Revision: 60589 URL: http://svn.opensuse.org/viewcvs/yast?rev=60589&view=rev Log: bnc#464358 - error on console: Use of uninitialized value Modified: branches/SuSE-Code-11-SP1-Branch/autofs/package/yast2-autofs.changes branches/SuSE-Code-11-SP1-Branch/autofs/src/Autofs.pm Modified: branches/SuSE-Code-11-SP1-Branch/autofs/package/yast2-autofs.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autof… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autofs/package/yast2-autofs.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/autofs/package/yast2-autofs.changes Thu Jan 28 10:52:15 2010 @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Thu Jan 28 10:39:39 CET 2010 - varkoly(a)novell.com -- bnc#2823 - Error message in autofs configuration is incorrect +- bnc#572823 - Error message in autofs configuration is incorrect +- bnc#464358 - error on console: Use of uninitialized value ------------------------------------------------------------------- Thu Sep 11 07:56:54 CEST 2008 - jsrain(a)suse.cz Modified: branches/SuSE-Code-11-SP1-Branch/autofs/src/Autofs.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autof… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autofs/src/Autofs.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/autofs/src/Autofs.pm Thu Jan 28 10:52:15 2010 @@ -210,7 +210,7 @@ y2milestone("------LDAP_CLIENT_NOT_CONFIGURED------"); return YaPI->SetError( summary => __("You must configure LDAP to use the autofs module."). "\n". - __("You can do it by using the YaST2 ldap module."), + __("You can do it by using the YaST ldap module."), code => "LDAP_CLIENT_NOT_CONFIGURED" ); } $LDAPServer = $ldapMap->{ldap_server}; @@ -467,7 +467,7 @@ $Entry->{'key'} = $all->{$dn}->{'cn'}->[0]; $Entry->{'dn'} = $dn; $Maps->{$map}->{dns}->{$dn} = 0; - my ($options,$location) = split /\s+/,$all->{$dn}->{'nismapentry'}->[0],2; + my ($options,$location) = split /\s+/,$all->{$dn}->{'nisMapEntry'}->[0],2; $Entry->{'options'} = $options; $Entry->{'location'} = $location; $Entry->{'modified'} = "0"; -- 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] r60588 - in /branches/SuSE-Code-11-SP1-Branch/autofs: autodocs-cc-base.ami missing
by varkoly＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: varkoly Date: Thu Jan 28 10:41:25 2010 New Revision: 60588 URL: http://svn.opensuse.org/viewcvs/yast?rev=60588&view=rev Log: bnc#2823 Modified: branches/SuSE-Code-11-SP1-Branch/autofs/autodocs-cc-base.ami branches/SuSE-Code-11-SP1-Branch/autofs/missing Modified: branches/SuSE-Code-11-SP1-Branch/autofs/autodocs-cc-base.ami URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autof… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autofs/autodocs-cc-base.ami (original) +++ branches/SuSE-Code-11-SP1-Branch/autofs/autodocs-cc-base.ami Thu Jan 28 10:41:25 2010 @@ -15,7 +15,7 @@ AUTODOCS_CC ?= $(srcdir)/../../src AUTODOCS_DEPS ?= $(AUTODOCS_CC)/*.h -html_data = index.html $(wildcard *.html *.png) doxygen.css @RPMNAME@.tag +html_data = index.html $(filter-out index.html, $(wildcard *.html *.png)) doxygen.css @RPMNAME@.tag CLEANFILES = $(html_data) doxygen.log doxygen.conf installdox doxygen.css @RPMNAME@.tag: index.html Modified: branches/SuSE-Code-11-SP1-Branch/autofs/missing URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autof… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autofs/missing (original) +++ branches/SuSE-Code-11-SP1-Branch/autofs/missing Thu Jan 28 10:41:25 2010 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: -- 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] r60587 - in /branches/SuSE-Code-11-SP1-Branch/autofs: package/yast2-autofs.changes src/Autofs.pm
by varkoly＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: varkoly Date: Thu Jan 28 10:40:26 2010 New Revision: 60587 URL: http://svn.opensuse.org/viewcvs/yast?rev=60587&view=rev Log: bnc#2823 - Error message in autofs configuration is incorrect Modified: branches/SuSE-Code-11-SP1-Branch/autofs/package/yast2-autofs.changes branches/SuSE-Code-11-SP1-Branch/autofs/src/Autofs.pm Modified: branches/SuSE-Code-11-SP1-Branch/autofs/package/yast2-autofs.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autof… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autofs/package/yast2-autofs.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/autofs/package/yast2-autofs.changes Thu Jan 28 10:40:26 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jan 28 10:39:39 CET 2010 - varkoly(a)novell.com + +- bnc#2823 - Error message in autofs configuration is incorrect + +------------------------------------------------------------------- Thu Sep 11 07:56:54 CEST 2008 - jsrain(a)suse.cz - merged texts from proofread Modified: branches/SuSE-Code-11-SP1-Branch/autofs/src/Autofs.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autof… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autofs/src/Autofs.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/autofs/src/Autofs.pm Thu Jan 28 10:40:26 2010 @@ -208,9 +208,9 @@ if( ! $ldapMap->{base_config_dn} ) { y2milestone("------LDAP_CLIENT_NOT_CONFIGURED------"); - return YaPI->SetError( summary => __("You must configure LDAP to use the autofs modul."). + return YaPI->SetError( summary => __("You must configure LDAP to use the autofs module."). "\n". - __("You can do it by using the YaST2 ldap modul."), + __("You can do it by using the YaST2 ldap module."), code => "LDAP_CLIENT_NOT_CONFIGURED" ); } $LDAPServer = $ldapMap->{ldap_server}; -- 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] r60586 - in /trunk/gtk: ChangeLog src/YGPackageSelectorPluginStub.cc src/pkg/YGPackageSelector.cc src/pkg/ygtkpackageview.cc
by rpmcruz＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: rpmcruz Date: Wed Jan 27 20:42:38 2010 New Revision: 60586 URL: http://svn.opensuse.org/viewcvs/yast?rev=60586&view=rev Log: * src/pkg/YGPackageSelector.cc: added --embold-installed-row and --save-delete-buttons flags. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGPackageSelectorPluginStub.cc trunk/gtk/src/pkg/YGPackageSelector.cc trunk/gtk/src/pkg/ygtkpackageview.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=60586&r1=60585… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Wed Jan 27 20:42:38 2010 @@ -1,3 +1,8 @@ +2010-01-27 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/pkg/YGPackageSelector.cc: added --embold-installed-row + and --save-delete-buttons flags. + 2010-01-26 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/pkg/yzyppwrapper.h/cc: changed PkgList property 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 Wed Jan 27 20:42:38 2010 @@ -23,8 +23,9 @@ undo_old_style = false, undo_log_all = false, undo_log_changed = false, undo_box = true, status_col = false, action_col = true, - action_col_as_button = false, action_col_as_check = false, action_col_label = true, + action_col_as_button = false, save_delete_buttons = false, action_col_as_check = false, action_col_label = true, version_col = true, single_line_rows = false, colorful_rows = false, + embold_installed_row = false, italicize_changed_row = false, golden_changed_row = true, details_start_hide = false, toolbar_top = false, toolbar_yast = false, arrange_by = false; @@ -63,11 +64,13 @@ { "status-col", &status_col }, { "action-col", &action_col }, { "action-col-as-button", &action_col_as_button }, + { "save-delete-buttons", &save_delete_buttons }, { "action-col-as-check", &action_col_as_check }, { "action-col-label", &action_col_label }, { "version-col", &version_col }, { "single-line-rows", &single_line_rows }, { "colorful-rows", &colorful_rows }, + { "embold-installed-row", &embold_installed_row }, { "italicize-changed-row", &italicize_changed_row }, { "golden-changed-row", &golden_changed_row }, { "details-start-hide", &details_start_hide }, 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 Wed Jan 27 20:42:38 2010 @@ -2165,7 +2165,7 @@ gtk_entry_set_icon_from_stock (GTK_ENTRY (m_entry), GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_FIND); - gtk_entry_set_icon_activatable (GTK_ENTRY (editable), GTK_ENTRY_ICON_PRIMARY, TRUE); + gtk_entry_set_icon_activatable (GTK_ENTRY (m_entry), GTK_ENTRY_ICON_PRIMARY, TRUE); m_clearIcon = false; g_signal_connect (G_OBJECT (m_entry), "changed", @@ -2364,8 +2364,8 @@ void appendRow (GtkTreeIter *iter) { - gtk_list_store_append (m_store, &iter); - gtk_list_store_set (m_store, &iter, 0, "", 1, TRUE, 2, 0, 3, NULL, 4, TRUE, -1); + gtk_list_store_append (m_store, iter); + gtk_list_store_set (m_store, iter, 0, "", 1, TRUE, 2, 0, 3, NULL, 4, TRUE, -1); } }; @@ -2545,7 +2545,7 @@ else gtk_list_store_set (m_store, &iter, 0, repo->name.c_str(), -1); } - gtk_list_store_set (m_store, &iter, 1, TRUE, 2, repo, , + gtk_list_store_set (m_store, &iter, 1, TRUE, 2, repo, ENABLED_COLUMN, repo->enabled, -1); const gchar *icon = getRepositoryStockIcon (repo->url); @@ -3734,7 +3734,12 @@ } else { m_all_view = ygtk_package_view_new (TRUE); - m_all_view->appendCheckColumn (INSTALLED_CHECK_PROP); + if (action_col) { + if (action_col_as_button) + m_all_view->appendButtonColumn (NULL, INSTALLED_CHECK_PROP); + else // action_col_as_check + m_all_view->appendCheckColumn (INSTALLED_CHECK_PROP); + } m_all_view->appendTextColumn (_("Name"), NAME_SUMMARY_PROP, true, -1); m_all_view->appendTextColumn (_("Version"), VERSION_PROP, true, 120); m_all_view->appendTextColumn (_("Size"), SIZE_PROP, true, 80); 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 Wed Jan 27 20:42:38 2010 @@ -21,7 +21,8 @@ #include <string.h> extern bool status_col, action_col, action_col_as_button, action_col_as_check, - action_col_label, version_col, colorful_rows, italicize_changed_row, + save_delete_buttons, + action_col_label, version_col, colorful_rows, embold_installed_row, italicize_changed_row, golden_changed_row, single_line_rows; //** Icons resources @@ -591,8 +592,14 @@ break; } case WEIGHT_PROP: { +#if 0 bool highlight = segment->list.highlight (package); int weight = highlight ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL; +#endif + int weight = PANGO_WEIGHT_NORMAL; + if (embold_installed_row) + if (package->isInstalled()) + weight = PANGO_WEIGHT_BOLD; g_value_set_int (value, weight); break; } @@ -617,9 +624,9 @@ if (package->toModify()) stock = GTK_STOCK_UNDO; else if (package->isInstalled()) - stock = GTK_STOCK_REMOVE; + stock = save_delete_buttons ? GTK_STOCK_DELETE : GTK_STOCK_REMOVE; else - stock = GTK_STOCK_ADD; + stock = save_delete_buttons ? GTK_STOCK_SAVE : GTK_STOCK_ADD; g_value_set_string (value, g_strdup (stock)); break; } -- 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] r60585 - in /trunk/gtk/src/pkg: ygtkcellrenderersidebutton.c ygtkcellrenderersidebutton.h
by rpmcruz＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: rpmcruz Date: Wed Jan 27 17:34:00 2010 New Revision: 60585 URL: http://svn.opensuse.org/viewcvs/yast?rev=60585&view=rev Log: Ups, forgot about these two. Added: trunk/gtk/src/pkg/ygtkcellrenderersidebutton.c trunk/gtk/src/pkg/ygtkcellrenderersidebutton.h Added: trunk/gtk/src/pkg/ygtkcellrenderersidebutton.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkcellrendererside… ============================================================================== --- trunk/gtk/src/pkg/ygtkcellrenderersidebutton.c (added) +++ trunk/gtk/src/pkg/ygtkcellrenderersidebutton.c Wed Jan 27 17:34:00 2010 @@ -0,0 +1,203 @@ +/******************************************************************** + * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * + ********************************************************************/ + +/* YGtkCellRendererSideButton widget */ +// check the header file for information about this widget + +#include "ygtkcellrenderersidebutton.h" +#include <gtk/gtk.h> + +enum { + PROP_0, + PROP_ACTIVE, + PROP_STOCK_ID, + PROP_BUTTON_VISIBLE, +}; + +static guint toggle_cell_signal = 0; + +G_DEFINE_TYPE (YGtkCellRendererSideButton, ygtk_cell_renderer_side_button, GTK_TYPE_CELL_RENDERER_TEXT) + +static void ygtk_cell_renderer_side_button_init (YGtkCellRendererSideButton *bcell) +{ +} + +static void free_pixbuf (YGtkCellRendererSideButton *cell) +{ + if (cell->stock_id) { + g_free (cell->stock_id); + cell->stock_id = NULL; + } + if (cell->pixbuf) { + g_object_unref (cell->pixbuf); + cell->pixbuf = NULL; + } +} + +static void ensure_pixbuf (YGtkCellRendererSideButton *cell, GtkWidget *widget) +{ + if (!cell->pixbuf && cell->stock_id) + cell->pixbuf = gtk_widget_render_icon (widget, cell->stock_id, GTK_ICON_SIZE_BUTTON, NULL); +} + +static void ygtk_cell_renderer_side_button_finalize (GObject *object) +{ + YGtkCellRendererSideButton *bcell = YGTK_CELL_RENDERER_SIDE_BUTTON (object); + free_pixbuf (bcell); + G_OBJECT_CLASS (ygtk_cell_renderer_side_button_parent_class)->finalize (object); +} + +static void ygtk_cell_renderer_side_button_get_property ( + GObject *object, guint param_id, GValue *value, GParamSpec *pspec) +{ + if (pspec->owner_type == YGTK_TYPE_CELL_RENDERER_SIDE_BUTTON) { + YGtkCellRendererSideButton *bcell = YGTK_CELL_RENDERER_SIDE_BUTTON (object); + switch (param_id) { + case PROP_ACTIVE: + g_value_set_boolean (value, bcell->active); + break; + case PROP_STOCK_ID: + g_value_set_string (value, bcell->stock_id); + break; + case PROP_BUTTON_VISIBLE: + g_value_set_boolean (value, bcell->button_visible); + break; + } + } + else + G_OBJECT_CLASS (ygtk_cell_renderer_side_button_parent_class)->get_property ( + object, param_id, value, pspec); +} + +static void ygtk_cell_renderer_side_button_set_property (GObject *object, + guint param_id, const GValue *value, GParamSpec *pspec) +{ + if (pspec->owner_type == YGTK_TYPE_CELL_RENDERER_SIDE_BUTTON) { + YGtkCellRendererSideButton *bcell = YGTK_CELL_RENDERER_SIDE_BUTTON (object); + switch (param_id) { + case PROP_ACTIVE: + bcell->active = g_value_get_boolean (value); + break; + case PROP_STOCK_ID: + free_pixbuf (bcell); + bcell->stock_id = g_value_dup_string (value); + break; + case PROP_BUTTON_VISIBLE: + bcell->button_visible = g_value_get_boolean (value); + break; + } + } + else + G_OBJECT_CLASS (ygtk_cell_renderer_side_button_parent_class)->set_property ( + object, param_id, value, pspec); +} + +static void ygtk_cell_renderer_side_button_get_size ( + GtkCellRenderer *cell, GtkWidget *widget, GdkRectangle *cell_area, + gint *x_offset, gint *y_offset, gint *width, gint *height) +{ + GTK_CELL_RENDERER_CLASS (ygtk_cell_renderer_side_button_parent_class)->get_size ( + cell, widget, cell_area, x_offset, y_offset, width, height); + YGtkCellRendererSideButton *bcell = YGTK_CELL_RENDERER_SIDE_BUTTON (cell); + if (bcell->button_visible) { + gint icon_width, icon_height; + gtk_icon_size_lookup (GTK_ICON_SIZE_BUTTON, &icon_width, &icon_height); + *width += icon_width + 8 + 4; + } +} + +static void ygtk_cell_renderer_side_button_render ( + GtkCellRenderer *cell, GdkDrawable *window, GtkWidget *widget, + GdkRectangle *background_area, GdkRectangle *cell_area, + GdkRectangle *expose_area, GtkCellRendererState flags) +{ + YGtkCellRendererSideButton *bcell = YGTK_CELL_RENDERER_SIDE_BUTTON (cell); + GdkRectangle text_area = *cell_area; + gint icon_width, icon_height; + if (bcell->button_visible) { + gtk_icon_size_lookup (GTK_ICON_SIZE_BUTTON, &icon_width, &icon_height); + text_area.width -= icon_width + 8 + 4; + } + GTK_CELL_RENDERER_CLASS (ygtk_cell_renderer_side_button_parent_class)->render ( + cell, window, widget, background_area, &text_area, expose_area, flags); + + if (bcell->button_visible) { + GtkStateType state = GTK_STATE_NORMAL; + GtkShadowType shadow = GTK_SHADOW_OUT; + if (!cell->sensitive || GTK_WIDGET_STATE (widget) == GTK_STATE_INSENSITIVE) + state = GTK_STATE_INSENSITIVE; + /* else if ((flags & GTK_CELL_RENDERER_PRELIT)) + state = GTK_STATE_PRELIGHT;*/ + if (bcell->active) { + shadow = GTK_SHADOW_IN; + state = GTK_STATE_ACTIVE; + } + + GdkRectangle button_area = *cell_area; + button_area.x = cell_area->x + cell_area->width - icon_width - 8; + button_area.width = icon_width + 4; + button_area.height = icon_height + 4; + button_area.y = cell_area->y + ((cell_area->height - button_area.height) / 2); + + gtk_paint_box (widget->style, window, state, shadow, expose_area, widget, + "button", button_area.x, button_area.y, button_area.width, button_area.height); + + GdkRectangle icon_area = button_area; + icon_area.x += 2; + icon_area.y += 2; + if (bcell->active) { + cell_area->x += 2; + cell_area->y += 2; + } + + ensure_pixbuf (bcell, widget); + cairo_t *cr = gdk_cairo_create (window); + gdk_cairo_set_source_pixbuf (cr, bcell->pixbuf, icon_area.x, icon_area.y); + cairo_rectangle (cr, icon_area.x, icon_area.y, icon_width, icon_height); + cairo_fill (cr); + cairo_destroy (cr); + } +} + +static gboolean ygtk_cell_renderer_side_button_activate ( + GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, const gchar *path, + GdkRectangle *background_area, GdkRectangle *cell_area, GtkCellRendererState flags) +{ + g_signal_emit (cell, toggle_cell_signal, 0, path); + return TRUE; +} + +GtkCellRenderer *ygtk_cell_renderer_side_button_new (void) +{ return g_object_new (YGTK_TYPE_CELL_RENDERER_SIDE_BUTTON, NULL); } + +gboolean ygtk_cell_renderer_side_button_get_active (YGtkCellRendererSideButton *cell) +{ return cell->active; } + +static void ygtk_cell_renderer_side_button_class_init (YGtkCellRendererSideButtonClass *class) +{ + GObjectClass *object_class = G_OBJECT_CLASS (class); + object_class->get_property = ygtk_cell_renderer_side_button_get_property; + object_class->set_property = ygtk_cell_renderer_side_button_set_property; + object_class->finalize = ygtk_cell_renderer_side_button_finalize; + + GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (class); + cell_class->get_size = ygtk_cell_renderer_side_button_get_size; + cell_class->render = ygtk_cell_renderer_side_button_render; + cell_class->activate = ygtk_cell_renderer_side_button_activate; + + GParamFlags readwrite_flag = + G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB; + g_object_class_install_property (object_class, PROP_ACTIVE, + g_param_spec_boolean ("active", "Toggle state", "The toggle state of the button", + FALSE, readwrite_flag)); + g_object_class_install_property (object_class, PROP_STOCK_ID, + g_param_spec_string ("stock-id", "Stock ID", "Stock icon to render", NULL, readwrite_flag)); + g_object_class_install_property (object_class, PROP_BUTTON_VISIBLE, + g_param_spec_boolean ("button-visible", "Is Button Visible", "Whether to show side button", TRUE, readwrite_flag)); + + toggle_cell_signal = g_signal_new ("toggled", G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (YGtkCellRendererSideButtonClass, toggled), + NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); +} + Added: trunk/gtk/src/pkg/ygtkcellrenderersidebutton.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkcellrendererside… ============================================================================== --- trunk/gtk/src/pkg/ygtkcellrenderersidebutton.h (added) +++ trunk/gtk/src/pkg/ygtkcellrenderersidebutton.h Wed Jan 27 17:34:00 2010 @@ -0,0 +1,50 @@ +/******************************************************************** + * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * + ********************************************************************/ + +/* A icon GtkButton next to a GtkLabel. +*/ + +#ifndef YGTK_CELL_RENDERER_SIDE_BUTTON_H +#define YGTK_CELL_RENDERER_SIDE_BUTTON_H + +#include <gtk/gtkcellrenderertext.h> +G_BEGIN_DECLS + +#define YGTK_TYPE_CELL_RENDERER_SIDE_BUTTON (ygtk_cell_renderer_side_button_get_type()) +#define YGTK_CELL_RENDERER_SIDE_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ + YGTK_TYPE_CELL_RENDERER_SIDE_BUTTON, YGtkCellRendererSideButton)) +#define YGTK_CELL_RENDERER_SIDE_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \ + YGTK_TYPE_CELL_RENDERER_SIDE_BUTTON, YGtkCellRendererSideButtonClass)) +#define YGTK_IS_CELL_RENDERER_SIDE_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ + YGTK_TYPE_CELL_RENDERER_SIDE_BUTTON)) +#define YGTK_IS_CELL_RENDERER_SIDE_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \ + YGTK_TYPE_CELL_RENDERER_SIDE_BUTTON)) +#define YGTK_CELL_RENDERER_SIDE_BUTTON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), \ + YGTK_TYPE_CELL_SIDE_RENDERER_BUTTON, YGtkCellRendererSideButtonClass)) + +typedef struct YGtkCellRendererSideButton +{ + GtkCellRendererText parent; + + // private: + guint active : 2, button_visible : 2; + gchar *stock_id; + GdkPixbuf *pixbuf; +} YGtkCellRendererSideButton; + +typedef struct YGtkCellRendererSideButtonClass +{ + GtkCellRendererTextClass parent_class; + + void (* toggled) (YGtkCellRendererSideButton *renderer, const gchar *path); +} YGtkCellRendererSideButtonClass; + +GtkCellRenderer *ygtk_cell_renderer_side_button_new (void); +GType ygtk_cell_renderer_side_button_get_type (void) G_GNUC_CONST; + +gboolean ygtk_cell_renderer_side_button_get_active (YGtkCellRendererSideButton *cell); + +G_END_DECLS +#endif + -- 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] r60584 - in /branches/SuSE-Code-11-SP1-Branch/ldap-server: VERSION package/yast2-ldap-server.changes
by rhafer＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: rhafer Date: Wed Jan 27 17:07:48 2010 New Revision: 60584 URL: http://svn.opensuse.org/viewcvs/yast?rev=60584&view=rev Log: preparing 2.17.29 Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/VERSION branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/VERSION Wed Jan 27 17:07:48 2010 @@ -1 +1 @@ -2.17.28 +2.17.29 Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes Wed Jan 27 17:07:48 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Jan 27 16:04:15 UTC 2010 - rhafer(a)novell.com + +- Version 2.17.29 +- merged proofreading results (bnc#574234, bnc#574305, bnc#574364) +- When changing ACL, ensure that syncrepl ACL is always the first + ACL (bnc#574346) + +------------------------------------------------------------------- Mon Jan 11 13:21:12 UTC 2010 - rhafer(a)novell.com - Version 2.17.28 -- 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] r60583 - /branches/SuSE-Code-11-SP1-Branch/ldap-server/src/helps.ycp
by rhafer＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: rhafer Date: Wed Jan 27 17:03:39 2010 New Revision: 60583 URL: http://svn.opensuse.org/viewcvs/yast?rev=60583&view=rev Log: more proofreading fixes (bnc#574364) Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/helps.ycp Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/helps.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/helps.ycp Wed Jan 27 17:03:39 2010 @@ -149,7 +149,7 @@ _("<h4>Session log</h4>") + _("Configures an in-memory session log for recording information about write operations made on the database. Specify how many write operation should be recorded in the session log. -Configuring a session log does only make sense when \"refreshOnly\" replication is used. In +Configuring a session log is only useful for \"refreshOnly\" replication. In such a case it can speed up replication and reduce the load on the master server."), "synccons_edit" : -- 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] r60582 - /branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm
by rhafer＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: rhafer Date: Wed Jan 27 17:03:37 2010 New Revision: 60582 URL: http://svn.opensuse.org/viewcvs/yast?rev=60582&view=rev Log: Assure that syncrepl ACL is always the first ACL (bnc#574346) Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm Wed Jan 27 17:03:37 2010 @@ -1947,6 +1947,54 @@ { my ($self, $dbIndex, $acllist ) = @_; y2debug("ChangeDatabaseAcl: ".Data::Dumper->Dump([$acllist]) ); + + # Check whether this is a slave database, if yes locate the + # syncrepl related ACL and move it to the top. This is to ensure + # that syncrepl clients have read access to everything + my $syncrepl = $self->ReadSyncRepl( $dbIndex ); + if ( $syncrepl && scalar(keys %{$syncrepl}) && $syncrepl->{'binddn'} ne "" ) + { + my $acllist_sorted=[]; + my $syncacl={}; + my $found=0; + + foreach my $rule ( @{$acllist} ) + { + if ( !$found && (keys %{$rule->{'target'}} == 0) ) + { + # this rule matches all db entries, check if it gives + # read access to the syncrepl id + foreach my $access ( @{$rule->{'access'}} ) + { + if ( $access->{'type'} eq "dn.base" && + lc($access->{'value'}) eq lc($syncrepl->{'binddn'} ) && + ($access->{'level'} eq "read" || $access->{'level'} eq "write") + ) + { + y2milestone("Found syncrepl ACL, moving to first position"); + $syncacl=$rule; + $found=1; + last; + } + } + if( $found ) + { + next; + } + } + push @{$acllist_sorted}, $rule; + } + if ( $found ) + { + # push syncrepl acl on top + push @{$acllist_sorted}, $syncacl; + $acllist = [ $syncacl ]; + push @{$acllist}, @{$acllist_sorted}; + } + } + + + my $rc = SCR->Write(".ldapserver.database.{".$dbIndex."}.acl", $acllist ); if ( ! $rc ) { -- 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] r60581 - in /branches/SuSE-Code-11-SP1-Branch/ldap-server/src: LdapDatabase.ycp dialogs.ycp
by rhafer＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: rhafer Date: Wed Jan 27 17:03:33 2010 New Revision: 60581 URL: http://svn.opensuse.org/viewcvs/yast?rev=60581&view=rev Log: merged Proofreading results Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapDatabase.ycp branches/SuSE-Code-11-SP1-Branch/ldap-server/src/dialogs.ycp Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapDatabase.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapDatabase.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapDatabase.ycp Wed Jan 27 17:03:33 2010 @@ -1694,7 +1694,7 @@ + "\n\n\"" + (string)err["summary"]:"" + "\"\n\"" + (string)err["description"]:"" + "\"\n\n" + - _("Do you want to still want to continue?")); + _("Do you still want to continue?")); } if(!(boolean)SCR::Execute( .ldapserver.remoteLdapSyncCheck, testparm ) ) { @@ -1706,7 +1706,7 @@ + "\n\"" + (string)err["summary"]:""+ "\"\n\"" + (string)err["description"]:"" + "\"\n\n" + - _("Do you want to still want to continue?")); + _("Do you still want to continue?")); } } return true; Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/dialogs.ycp Wed Jan 27 17:03:33 2010 @@ -913,7 +913,7 @@ } if ( ! setupok ) { - Popup::Error( _("The Replication Configuration on the master server indicates that\nis already acting as a Repliation Consumer.\n") + + Popup::Error( _("The Replication Configuration on the master server indicates that\nit is already acting as a Replication Consumer.\n") + _("Setting up cascaded replication of the cn=config is not supported currently.") ); ret = `cancel; break; @@ -1034,7 +1034,7 @@ `HSquash( `VSquash( `VBox( - `Heading( _("Repliation Master setup") ), + `Heading( _("Replication Master setup") ), `VSpacing( 0.5 ), `Label( _("In order to act as a Master Server for Replication, the Configuration database needs\nto be remotely accessible. Please set a password for the Configuration database." ) + _("\n(Remote access to the Configuration database will be restricted to encrypted\nLDAP Connections)") -- 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] r60580 - /tags/branch-Code-11-SP1-2_17_69/packager/
by lslezak＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: lslezak Date: Wed Jan 27 16:46:29 2010 New Revision: 60580 URL: http://svn.opensuse.org/viewcvs/yast?rev=60580&view=rev Log: Created tag branch-Code-11-SP1-2_17_69 for packager Added: tags/branch-Code-11-SP1-2_17_69/packager/ (props changed) - copied from r60579, branches/SuSE-Code-11-SP1-Branch/packager/ -- 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] r60579 - /tags/branch-Code-11-SP1-2_17_69/
by lslezak＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: lslezak Date: Wed Jan 27 16:46:26 2010 New Revision: 60579 URL: http://svn.opensuse.org/viewcvs/yast?rev=60579&view=rev Log: Created tag branch-Code-11-SP1-2_17_69 Added: tags/branch-Code-11-SP1-2_17_69/ -- 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] r60578 - in /branches/SuSE-Code-11-SP1-Branch/packager: VERSION package/yast2-packager.changes src/modules/SourceDialogs.ycp
by lslezak＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: lslezak Date: Wed Jan 27 16:46:13 2010 New Revision: 60578 URL: http://svn.opensuse.org/viewcvs/yast?rev=60578&view=rev Log: - repositories - added NFSv4 support (fate#306451), don't loose the current URL when switching between full and parsed view - 2.17.69 Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SourceDialogs.ycp Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/VERSION Wed Jan 27 16:46:13 2010 @@ -1 +1 @@ -2.17.68 +2.17.69 Modified: branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes Wed Jan 27 16:46:13 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jan 27 15:41:46 UTC 2010 - lslezak(a)suse.cz + +- repositories - added NFSv4 support (fate#306451), don't loose + the current URL when switching between full and parsed view +- 2.17.69 + +------------------------------------------------------------------- Thu Jan 14 13:40:25 UTC 2010 - lslezak(a)suse.cz - install also xorg-x11-fonts package when remote X or VNC Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SourceDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SourceDialogs.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SourceDialogs.ycp Wed Jan 27 16:46:13 2010 @@ -424,7 +424,9 @@ ) ), // checkbox label - `Left (`CheckBox ( `id (`ch_iso), _("&ISO Image"))) + `Left (`CheckBox ( `id (`ch_iso), _("&ISO Image"))), + // checkbox label + `Left (`CheckBox ( `id (`ch_nfs4), _("N&FS v4 Protocol"))) ); term nfs_complete_content = `InputField(`id(`complete_url), `opt(`hstretch), _("URL of the Repository")); @@ -454,6 +456,13 @@ UI::ChangeWidget (`id (`dir), `Value, parsed["path"]:""); UI::ChangeWidget (`id (`ch_iso), `Value, iso); UI::SetFocus (`server); + + boolean nfs4 = tolower(parsed["scheme"]:"nfs") == "nfs4" || + URL::MakeMapFromParams(parsed["query"]:"")["type"]:"" == "nfs4"; + + y2milestone("NFSv4: %1", nfs4); + + UI::ChangeWidget (`id (`ch_nfs4), `Value, nfs4); } else { @@ -461,6 +470,48 @@ } } +void NFSStoreParts() +{ + map parsed = $[ + "scheme" : "nfs", + "host" : NormalizeHost ( + (string)UI::QueryWidget (`id (`server), `Value)), + "path" : (string)UI::QueryWidget (`id (`dir), `Value), + ]; + + boolean nfs4 = (boolean)UI::QueryWidget (`id (`ch_nfs4), `Value); + if (nfs4) + { + // keep nfs4:// if it is used in the original URL + if (tolower(URL::Parse(_url)["scheme"]:"") == "nfs4") + { + parsed["scheme"] = "nfs4"; + } + else + { + parsed["query"] = "type=nfs4"; + } + } + + _url = URL::Build (parsed); + boolean iso = (boolean)UI::QueryWidget (`id (`ch_iso), `Value); + + // workaround: URL::Build does not accept numbers in scheme, + // for nfs4 scheme it returns URL with no scheme (like "://foo/bar") + if(!regexpmatch(_url, "^nfs")) + { + _url = "nfs4" + _url; + } + + if (iso) + _url = PosprocessISOURL (_url); +} + +void NFSStoreComplete() +{ + _url = (string)UI::QueryWidget(`id(`complete_url), `Value); +} + /** * Store function of a widget * @param key string widget key @@ -472,20 +523,11 @@ if (current_type == `edit_url_parts) { - map parsed = $[ - "scheme" : "nfs", - "host" : NormalizeHost ( - (string)UI::QueryWidget (`id (`server), `Value)), - "path" : (string)UI::QueryWidget (`id (`dir), `Value), - ]; - _url = URL::Build (parsed); - boolean iso = (boolean)UI::QueryWidget (`id (`ch_iso), `Value); - if (iso) - _url = PosprocessISOURL (_url); + NFSStoreParts(); } else { - _url = (string)UI::QueryWidget(`id(`complete_url), `Value); + NFSStoreComplete(); } } @@ -523,7 +565,17 @@ } else if ((event["ID"]:nil == `edit_url_parts || event["ID"]:nil == `edit_complete_url) && event["EventReason"]:"" == "ValueChanged") { - y2milestone("Changing dialog type"); + y2milestone("Changing dialog type: %1", event["ID"]:nil); + + // store the current settings + if (event["ID"]:nil == `edit_url_parts) + { + NFSStoreComplete(); + } + else + { + NFSStoreParts(); + } // reinitialize the dialog (set the current values) NFSInit(nil); @@ -1196,6 +1248,7 @@ `ReplacePoint (`id (`server_rp), `Empty ()) ); +// input field label term complete_content = `InputField(`id(`complete_url), `opt(`hstretch), _("URL of the Repository")); void ServerStoreParts() @@ -1896,6 +1949,7 @@ else if ( _url == "https://" ) current = `https; else if ( _url == "smb://" ) current = `samba; else if ( _url == "nfs://" ) current = `nfs; + else if ( _url == "nfs4://" ) current = `nfs; else if ( _url == "cd:///" ) current = `cd; else if ( _url == "dvd:///" ) current = `dvd; else if ( _url == "hd://" ) current = `hd; -- 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] r60577 - /trunk/autoinstallation/doc/CreateProfileDetails.xml
by ug＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: ug Date: Wed Jan 27 16:31:18 2010 New Revision: 60577 URL: http://svn.opensuse.org/viewcvs/yast?rev=60577&view=rev Log: little docu fix Modified: trunk/autoinstallation/doc/CreateProfileDetails.xml Modified: trunk/autoinstallation/doc/CreateProfileDetails.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/CreateProfi… ============================================================================== --- trunk/autoinstallation/doc/CreateProfileDetails.xml (original) +++ trunk/autoinstallation/doc/CreateProfileDetails.xml Wed Jan 27 16:31:18 2010 @@ -879,10 +879,10 @@ </row> <row> <entry>imsmdriver</entry> - <entry>you can choose between `IMSM_DMRAID and `IMSM_MDADM -<para><screen><imsmdriver config:type="symbol">`IMSM_MDADM</imsmdriver></screen></para> + <entry>you can choose between IMSM_DMRAID and IMSM_MDADM. This option is available since openSUSE 11.3 and SLES11 SP1 +<para><screen><imsmdriver config:type="symbol">IMSM_MDADM</imsmdriver></screen></para> </entry> - <entry>optional. Default is `IMSM_DMRAID</entry> + <entry>optional. Default is IMSM_DMRAID</entry> </row> </tbody> </tgroup> -- 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] r60576 - /trunk/mail/package/yast2-mail.changes
by varkoly＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: varkoly Date: Wed Jan 27 16:23:59 2010 New Revision: 60576 URL: http://svn.opensuse.org/viewcvs/yast?rev=60576&view=rev Log: Merge changes Modified: trunk/mail/package/yast2-mail.changes Modified: trunk/mail/package/yast2-mail.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/package/yast2-mail.changes?… ============================================================================== --- trunk/mail/package/yast2-mail.changes (original) +++ trunk/mail/package/yast2-mail.changes Wed Jan 27 16:23:59 2010 @@ -1,7 +1,11 @@ ------------------------------------------------------------------- -Wed Jan 27 16:10:50 CET 2010 - jsuchome(a)suse.cz +Wed Jan 27 16:10:50 CET 2010 - varkoly(a)suse.de - fixed syntax errors +- Apply jsuchomes changes from bnc#559145 + Export and Import smtp_use_TLS: no yes may + Export and Import smtp_use_TLS +- Reorganize ldap tables ------------------------------------------------------------------ Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz -- 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] r60575 - in /trunk/autoinstallation: doc/CreateProfileDetails.xml package/autoyast2.changes src/clients/inst_autosetup.ycp src/modules/AutoinstStorage.ycp
by ug＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: ug Date: Wed Jan 27 16:23:42 2010 New Revision: 60575 URL: http://svn.opensuse.org/viewcvs/yast?rev=60575&view=rev Log: symbol added for the use of ImsmDriver (bnc#574270 Modified: trunk/autoinstallation/doc/CreateProfileDetails.xml trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/clients/inst_autosetup.ycp trunk/autoinstallation/src/modules/AutoinstStorage.ycp Modified: trunk/autoinstallation/doc/CreateProfileDetails.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/CreateProfi… ============================================================================== --- trunk/autoinstallation/doc/CreateProfileDetails.xml (original) +++ trunk/autoinstallation/doc/CreateProfileDetails.xml Wed Jan 27 16:23:42 2010 @@ -877,6 +877,13 @@ </entry> <entry>optional. Default is CT_DISK for a normal physical harddisk.</entry> </row> + <row> + <entry>imsmdriver</entry> + <entry>you can choose between `IMSM_DMRAID and `IMSM_MDADM +<para><screen><imsmdriver config:type="symbol">`IMSM_MDADM</imsmdriver></screen></para> +</entry> + <entry>optional. Default is `IMSM_DMRAID</entry> + </row> </tbody> </tgroup> </table> Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Wed Jan 27 16:23:42 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jan 27 16:00:10 CET 2010 - ug(a)suse.de + +- symbol added for the use of ImsmDriver (bnc#574270) + +------------------------------------------------------------------- Fri Jan 22 11:47:22 CET 2010 - ug(a)suse.de - the regex match for rules only worked for substrings, not Modified: trunk/autoinstallation/src/clients/inst_autosetup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/ins… ============================================================================== --- trunk/autoinstallation/src/clients/inst_autosetup.ycp (original) +++ trunk/autoinstallation/src/clients/inst_autosetup.ycp Wed Jan 27 16:23:42 2010 @@ -219,6 +219,13 @@ // recognize this now Storage::ReReadTargetMap(); + Storage::SetImsmDriver( `IMSM_DMRAID ); + foreach( map drive, Profile::current["partitioning"]:[], ``{ + if( haskey( drive, "imsmdriver" ) ) { + Storage::SetImsmDriver( drive["imsmdriver"]:`IMSM_DMRAID ); // bnc#574270 + } + }); + // No partitioning in the profile means yast2-storage proposal (hmmmm.....) if( size(Profile::current["partitioning"]:[]) > 0 ) { Modified: trunk/autoinstallation/src/modules/AutoinstStorage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstStorage.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstStorage.ycp Wed Jan 27 16:23:42 2010 @@ -91,6 +91,7 @@ if( after == "" ) { foreach (string device, map disk, initial_target_map, ``{ if (disk["type"]:`jo == `CT_DMRAID || + disk["type"]:`jo == `CT_MDPART || disk["type"]:`jo == `CT_DMMULTIPATH) { mbr_disk = device; -- 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] r60574 - /branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/clients/inst_autosetup.ycp
by ug＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: ug Date: Wed Jan 27 16:21:55 2010 New Revision: 60574 URL: http://svn.opensuse.org/viewcvs/yast?rev=60574&view=rev Log: fix for imsmdriver Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/clients/inst_autosetup.ycp Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/clients/inst_autosetup.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/clients/inst_autosetup.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/clients/inst_autosetup.ycp Wed Jan 27 16:21:55 2010 @@ -222,7 +222,12 @@ // recognize this now Storage::ReReadTargetMap(); - Storage::SetImsmDriver( Profile::current["partitioning","imsmdriver"]:`IMSM_DMRAID ); // bnc#574270 + Storage::SetImsmDriver( `IMSM_DMRAID ); + foreach( map drive, Profile::current["partitioning"]:[], ``{ + if( haskey( drive, "imsmdriver" ) ) { + Storage::SetImsmDriver( drive["imsmdriver"]:`IMSM_DMRAID ); // bnc#574270 + } + }); // No partitioning in the profile means yast2-storage proposal (hmmmm.....) if( size(Profile::current["partitioning"]:[]) > 0 ) { -- 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] r60573 - /tags/branch-Code-11-SP1-2_17_5/mail/
by varkoly＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: varkoly Date: Wed Jan 27 16:16:59 2010 New Revision: 60573 URL: http://svn.opensuse.org/viewcvs/yast?rev=60573&view=rev Log: Created tag branch-Code-11-SP1-2_17_5 for mail Added: tags/branch-Code-11-SP1-2_17_5/mail/ (props changed) - copied from r60572, branches/SuSE-Code-11-SP1-Branch/mail/ -- 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] r60572 - /branches/SuSE-Code-11-SP1-Branch/mail/VERSION
by varkoly＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: varkoly Date: Wed Jan 27 16:16:12 2010 New Revision: 60572 URL: http://svn.opensuse.org/viewcvs/yast?rev=60572&view=rev Log: new build version Modified: branches/SuSE-Code-11-SP1-Branch/mail/VERSION Modified: branches/SuSE-Code-11-SP1-Branch/mail/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/mail/… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/mail/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/mail/VERSION Wed Jan 27 16:16:12 2010 @@ -1 +1 @@ -2.17.4 +2.17.5 -- 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] r60571 - in /branches/SuSE-Code-11-SP1-Branch/mail: package/yast2-mail.changes src/ui.ycp
by jsuchome＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: jsuchome Date: Wed Jan 27 16:10:56 2010 New Revision: 60571 URL: http://svn.opensuse.org/viewcvs/yast?rev=60571&view=rev Log: - fixed syntax errors Modified: branches/SuSE-Code-11-SP1-Branch/mail/package/yast2-mail.changes branches/SuSE-Code-11-SP1-Branch/mail/src/ui.ycp Modified: branches/SuSE-Code-11-SP1-Branch/mail/package/yast2-mail.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/mail/… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/mail/package/yast2-mail.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/mail/package/yast2-mail.changes Wed Jan 27 16:10:56 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jan 27 16:11:08 CET 2010 - jsuchome(a)suse.cz + +- fixed syntax errors + +------------------------------------------------------------------- Wed Jan 27 15:28:16 CET 2010 - varkoly(a)suse.de - Apply jsuchomes changes from bnc#559145 Modified: branches/SuSE-Code-11-SP1-Branch/mail/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/mail/… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/mail/src/ui.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/mail/src/ui.ycp Wed Jan 27 16:10:56 2010 @@ -361,7 +361,8 @@ `VBox ( WJ_MakeWidget (`outgoing_mail_server), // TLS - `RadioButtonGroup(`id(`TLS), _("The server use &TLS") + `Label (_("The server use &TLS")), + `RadioButtonGroup(`id(`TLS), `HBox( `Left(`RadioButton(`id("no"), _("No"), TLSnone)), `Left(`RadioButton(`id("yes"), _("Use"), TLSuse)), @@ -422,7 +423,7 @@ if (ret == `next || contains (buttons, ret)) { - Mail::smtp_use_TLS = (boolean)UI::QueryWidget (`id (`tls), `Value); + Mail::smtp_use_TLS = (string)UI::QueryWidget (`id (`TLS), `Value); WJ_Set (widgets); } Wizard::RestoreScreenShotName (); -- 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] r60570 - in /trunk/mail: package/yast2-mail.changes src/ui.ycp
by jsuchome＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: jsuchome Date: Wed Jan 27 16:10:44 2010 New Revision: 60570 URL: http://svn.opensuse.org/viewcvs/yast?rev=60570&view=rev Log: - fixed syntax errors Modified: trunk/mail/package/yast2-mail.changes trunk/mail/src/ui.ycp Modified: trunk/mail/package/yast2-mail.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/package/yast2-mail.changes?… ============================================================================== --- trunk/mail/package/yast2-mail.changes (original) +++ trunk/mail/package/yast2-mail.changes Wed Jan 27 16:10:44 2010 @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 27 16:10:50 CET 2010 - jsuchome(a)suse.cz + +- fixed syntax errors + ------------------------------------------------------------------ Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz Modified: trunk/mail/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/ui.ycp?rev=60570&r1=605… ============================================================================== --- trunk/mail/src/ui.ycp (original) +++ trunk/mail/src/ui.ycp Wed Jan 27 16:10:44 2010 @@ -361,7 +361,8 @@ `VBox ( WJ_MakeWidget (`outgoing_mail_server), // TLS - `RadioButtonGroup(`id(`TLS), _("The server use &TLS") + `Label (_("The server use &TLS")), + `RadioButtonGroup(`id(`TLS), `HBox( `Left(`RadioButton(`id("no"), _("No"), TLSnone)), `Left(`RadioButton(`id("yes"), _("Use"), TLSuse)), @@ -422,7 +423,7 @@ if (ret == `next || contains (buttons, ret)) { - Mail::smtp_use_TLS = (boolean)UI::QueryWidget (`id (`tls), `Value); + Mail::smtp_use_TLS = (string)UI::QueryWidget (`id (`TLS), `Value); WJ_Set (widgets); } Wizard::RestoreScreenShotName (); -- 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] r60569 - /branches/SuSE-Code-11-SP1-Branch/mail/VERSION
by varkoly＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: varkoly Date: Wed Jan 27 15:54:21 2010 New Revision: 60569 URL: http://svn.opensuse.org/viewcvs/yast?rev=60569&view=rev Log: new version Modified: branches/SuSE-Code-11-SP1-Branch/mail/VERSION Modified: branches/SuSE-Code-11-SP1-Branch/mail/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/mail/… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/mail/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/mail/VERSION Wed Jan 27 15:54:21 2010 @@ -1 +1 @@ -2.17.3 +2.17.4 -- 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] r60568 - /tags/branch-Code-11-SP1-2_17_4/mail/
by varkoly＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: varkoly Date: Wed Jan 27 15:53:53 2010 New Revision: 60568 URL: http://svn.opensuse.org/viewcvs/yast?rev=60568&view=rev Log: Created tag branch-Code-11-SP1-2_17_4 for mail Added: tags/branch-Code-11-SP1-2_17_4/mail/ (props changed) - copied from r60567, branches/SuSE-Code-11-SP1-Branch/mail/ -- 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] r60567 - in /branches/SuSE-Code-11-SP1-Branch/mail: package/yast2-mail.changes src/mail.desktop
by varkoly＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: varkoly Date: Wed Jan 27 15:53:23 2010 New Revision: 60567 URL: http://svn.opensuse.org/viewcvs/yast?rev=60567&view=rev Log: Fix desktop file Modified: branches/SuSE-Code-11-SP1-Branch/mail/package/yast2-mail.changes branches/SuSE-Code-11-SP1-Branch/mail/src/mail.desktop Modified: branches/SuSE-Code-11-SP1-Branch/mail/package/yast2-mail.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/mail/… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/mail/package/yast2-mail.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/mail/package/yast2-mail.changes Wed Jan 27 15:53:23 2010 @@ -4,11 +4,6 @@ - Apply jsuchomes changes from bnc#559145 Export and Import smtp_use_TLS: no yes may Export and Import smtp_use_TLS -- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su - where root privileges are needed, removed X-KDE-SubstituteUID key - (bnc#540627) -- bnc#555814 â VUL-0: SMTPD_LISTEN_REMOTE="yes" by default -- bnc#532518 â YaST in translation (use 'YaST' instead of 'YaST2') - Reorganize ldap tables - remove redefinition of read_attribute - bnc#491113 - fetchmail demon is started though disabled in runlevel @@ -17,12 +12,38 @@ - alias map ldap search must be sub - bnc#490688 â rename mail server module from "Mail Transfer Agent" to "Mail Server" - If starting the virus scanner freshclam have to be started also + +------------------------------------------------------------------- +Sat Nov 21 18:12:51 CET 2009 - varkoly(a)suse.de + +- bnc#532518 - JJ: YaST in translation (use 'YaST' instead of 'YaST2') +- bnc#555814 â VUL-0: SMTPD_LISTEN_REMOTE="yes" by default + +------------------------------------------------------------------- +Mon Mar 9 22:15:36 CET 2009 - varkoly(a)suse.de + - bnc#483639 - yast2 mail server's master.cf parser do not writes some lines + +------------------------------------------------------------------- +Sun Jan 25 19:20:19 CET 2009 - varkoly(a)suse.de + - saslauthd and cyrus must be started and enabled by YaPI - Serial of SOA Record must not be greater then 4294967295 + +------------------------------------------------------------------- +Thu Jan 22 10:12:09 CET 2009 - varkoly(a)suse.de + - bnc#467589 - Cyrus don't create Directory for new LDAP User at first run. - bnc#467562 - Yast mail doesn't install needed Spamassassin Package for SPAM learning extension for Mailserver + +------------------------------------------------------------------- +Mon Jan 19 16:49:10 CET 2009 - varkoly(a)suse.de + - bnc#466748 - yast2-mail-plugins broken + +------------------------------------------------------------------- +Thu Jan 8 13:17:02 CET 2009 - varkoly(a)suse.de + - avoid undefined variables in the MasterCFParser - make progress bar by WriteDialog visable - bnc#463589 - YaST2 Mail Server & amavisd Modified: branches/SuSE-Code-11-SP1-Branch/mail/src/mail.desktop URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/mail/… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/mail/src/mail.desktop (original) +++ branches/SuSE-Code-11-SP1-Branch/mail/src/mail.desktop Wed Jan 27 15:53:23 2010 @@ -20,7 +20,7 @@ Icon=yast-mail Exec=/sbin/yast2 mail -Name=Mail Transfer Agent +Name=Mail Server GenericName=Configure mail X-KDE-SubstituteUID=true StartupNotify=true -- 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] r60566 - /tags/branch-Code-11-SP1-2_17_34/autoinstallation/
by ug＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: ug Date: Wed Jan 27 15:53:08 2010 New Revision: 60566 URL: http://svn.opensuse.org/viewcvs/yast?rev=60566&view=rev Log: Created tag branch-Code-11-SP1-2_17_34 for autoinstallation Added: tags/branch-Code-11-SP1-2_17_34/autoinstallation/ (props changed) - copied from r60565, branches/SuSE-Code-11-SP1-Branch/autoinstallation/ -- 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] r60565 - /tags/branch-Code-11-SP1-2_17_34/
by ug＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: ug Date: Wed Jan 27 15:53:07 2010 New Revision: 60565 URL: http://svn.opensuse.org/viewcvs/yast?rev=60565&view=rev Log: Created tag branch-Code-11-SP1-2_17_34 Added: tags/branch-Code-11-SP1-2_17_34/ -- 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] r60564 - /branches/SuSE-Code-11-SP1-Branch/autoinstallation/VERSION
by ug＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: ug Date: Wed Jan 27 15:49:41 2010 New Revision: 60564 URL: http://svn.opensuse.org/viewcvs/yast?rev=60564&view=rev Log: laggard Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/VERSION Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/VERSION Wed Jan 27 15:49:41 2010 @@ -1 +1 @@ -2.17.33 +2.17.34 -- 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 #730
by Hudson Integration Service 27 Jan '10

27 Jan '10

See <http://yast.suse.de:3334/job/webyast-service-11.1-i586/730/changes> Changes: [Ladislav Slezak] Added initial repository model [Ladislav Slezak] added repositories controller, added tests [Ladislav Slezak] added a comment [Ladislav Slezak] added org.opensuse.yast.system.repositories.policy [Ladislav Slezak] repository - use @id instead of @repository_alias .spec - grant PackageKit rights [Ladislav Slezak] convert data to match the DBus signature [Ladislav Slezak] update repo properties in update call save also the new name and URL [Ladislav Slezak] Merge branch 'master' into repo_mgmt [Ladislav Slezak] read missing attributes directly from *.repo file PackageKit doesn't return all needed repository properties, read them directly from a file [Ladislav Slezak] resolvable.rb - make the custom signal handler argument optional [Ladislav Slezak] repository.rb - removed dummy Resolvable.execute signal arguments fixed *.repo file parsing regexps [Ladislav Slezak] don't fail when adding a new repository [Ladislav Slezak] Merge branch 'master' into repo_mgmt [Ladislav Slezak] repositories - fixed reading keeppackages and autorefresh values fixed syntax error in repository update [Ladislav Slezak] Merge branch 'repo_mgmt' [Ladislav Slezak] bump version to 0.1.1 ------------------------------------------ [...truncated 3246 lines...] + '[' 0 == 0 ']' + echo 'exit code: 0 ... good, lets continue' exit code: 0 ... good, lets continue + return + /usr/bin/rpmbuild -bb --define 'run_testsuite 1' webyast-time-ws.spec Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.34631 + umask 022 + cd /tmp/rpmbuild + cd /tmp/rpmbuild + rm -rf www + tar -xf - + /usr/bin/bzip2 -dc /src/rest-service/plugins/time/package/www.tar.bz2 + 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.34631 + umask 022 + cd /tmp/rpmbuild + /bin/rm -rf /var/tmp/webyast-time-ws-0.0.11-build ++ dirname /var/tmp/webyast-time-ws-0.0.11-build + /bin/mkdir -p /var/tmp + /bin/mkdir /var/tmp/webyast-time-ws-0.0.11-build + cd www + exit 0 Executing(%install): /bin/sh -e /var/tmp/rpm-tmp.34631 + umask 022 + cd /tmp/rpmbuild + cd www + mkdir -p /var/tmp/webyast-time-ws-0.0.11-build/srv/www/yastws/vendor/plugins/time + cp -a COPYING README Rakefile app config doc init.rb install.rb tasks uninstall.rb /var/tmp/webyast-time-ws-0.0.11-build/srv/www/yastws/vendor/plugins/time + rm -f /var/tmp/webyast-time-ws-0.0.11-build/srv/www/yastws/vendor/plugins/time/COPYING + mkdir -p /var/tmp/webyast-time-ws-0.0.11-build/usr/share/PolicyKit/policy + RPM_BUILD_ROOT=/var/tmp/webyast-time-ws-0.0.11-build + export RPM_BUILD_ROOT + test -x /usr/sbin/Check -a 0 = 0 -o -x /usr/sbin/Check -a '!' -z /var/tmp/webyast-time-ws-0.0.11-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: webyast-time-ws-0.0.11-0 Executing(%doc): /bin/sh -e /var/tmp/rpm-tmp.92820 + umask 022 + cd /tmp/rpmbuild + cd www + DOCDIR=/var/tmp/webyast-time-ws-0.0.11-build/usr/share/doc/packages/webyast-time-ws + export DOCDIR + rm -rf /var/tmp/webyast-time-ws-0.0.11-build/usr/share/doc/packages/webyast-time-ws + /bin/mkdir -p /var/tmp/webyast-time-ws-0.0.11-build/usr/share/doc/packages/webyast-time-ws + cp -pr COPYING /var/tmp/webyast-time-ws-0.0.11-build/usr/share/doc/packages/webyast-time-ws + exit 0 Finding Provides: /usr/lib/rpm/find-provides webyast-time-ws Finding Requires: /usr/lib/rpm/find-requires webyast-time-ws Finding Supplements: /usr/lib/rpm/find-supplements webyast-time-ws Provides: yast2-webservice-time = 0.0.11 Requires(interp): /bin/sh Requires(rpmlib): rpmlib(VersionedDependencies) <= 3.0.3-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 rpmlib(CompressedFileNames) <= 3.0.4-1 Requires(post): /bin/sh Obsoletes: yast2-webservice-time < 0.0.11 Checking for unpackaged file(s): /usr/lib/rpm/check-files /var/tmp/webyast-time-ws-0.0.11-build Checking for unpackaged file(s): /usr/lib/rpm/check-files /var/tmp/webyast-time-ws-0.0.11-build Wrote: /artifacts/webyast/rest-service/rpms/noarch/webyast-time-ws-0.0.11-0.noarch.rpm Executing(%clean): /bin/sh -e /var/tmp/rpm-tmp.85403 + umask 022 + cd /tmp/rpmbuild + cd www + rm -rf /var/tmp/webyast-time-ws-0.0.11-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/patches/package + pkgdir=./plugins/patches ++ basename ./plugins/patches + pkgname=patches + destination=/artifacts/webyast/rest-service/package/yast2-webservice-patches + mkdir -p /artifacts/webyast/rest-service/package/yast2-webservice-patches + rm -rf '/artifacts/webyast/rest-service/package/yast2-webservice-patches/*' + rm -rf ./plugins/patches/package/www + cp -r ./plugins/patches/package/org.opensuse.yast.system.packages.policy ./plugins/patches/package/org.opensuse.yast.system.patches.policy ./plugins/patches/package/org.opensuse.yast.system.repositories.policy ./plugins/patches/package/webyast-software-ws.changes ./plugins/patches/package/webyast-software-ws.spec ./plugins/patches/package/www.tar.bz2 /artifacts/webyast/rest-service/package/yast2-webservice-patches + pushd ./plugins/patches/package /src/rest-service/plugins/patches/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' webyast-software-ws.spec Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.19007 + umask 022 + cd /tmp/rpmbuild + cd /tmp/rpmbuild + rm -rf www + /usr/bin/bzip2 -dc /src/rest-service/plugins/patches/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.19007 + umask 022 + cd /tmp/rpmbuild + /bin/rm -rf /var/tmp/webyast-software-ws-0.1.1-build ++ dirname /var/tmp/webyast-software-ws-0.1.1-build + /bin/mkdir -p /var/tmp + /bin/mkdir /var/tmp/webyast-software-ws-0.1.1-build + cd www + rm -rf doc + exit 0 Executing(%install): /bin/sh -e /var/tmp/rpm-tmp.19007 + umask 022 + cd /tmp/rpmbuild + cd www + mkdir -p /var/tmp/webyast-software-ws-0.1.1-build/srv/www/yastws/vendor/plugins/patches + cp -a COPYING README Rakefile app config init.rb install.rb scripts tasks uninstall.rb /var/tmp/webyast-software-ws-0.1.1-build/srv/www/yastws/vendor/plugins/patches + rm -f /var/tmp/webyast-software-ws-0.1.1-build/srv/www/yastws/vendor/plugins/patches/COPYING + mkdir -p /var/tmp/webyast-software-ws-0.1.1-build/usr/share/PolicyKit/policy + install -m 0644 /src/rest-service/plugins/patches/package/org.opensuse.yast.system.patches.policy /var/tmp/webyast-software-ws-0.1.1-build/usr/share/PolicyKit/policy/ + install -m 0644 /src/rest-service/plugins/patches/package/org.opensuse.yast.system.packages.policy /var/tmp/webyast-software-ws-0.1.1-build/usr/share/PolicyKit/policy/ + install -m 0644 /src/rest-service/plugins/patches/package/org.opensuse.yast.system.repositories.policy /var/tmp/webyast-software-ws-0.1.1-build/usr/share/PolicyKit/policy/ + RPM_BUILD_ROOT=/var/tmp/webyast-software-ws-0.1.1-build + export RPM_BUILD_ROOT + test -x /usr/sbin/Check -a 0 = 0 -o -x /usr/sbin/Check -a '!' -z /var/tmp/webyast-software-ws-0.1.1-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: webyast-software-ws-0.1.1-0 Executing(%doc): /bin/sh -e /var/tmp/rpm-tmp.56104 + umask 022 + cd /tmp/rpmbuild + cd www + DOCDIR=/var/tmp/webyast-software-ws-0.1.1-build/usr/share/doc/packages/webyast-software-ws + export DOCDIR + rm -rf /var/tmp/webyast-software-ws-0.1.1-build/usr/share/doc/packages/webyast-software-ws + /bin/mkdir -p /var/tmp/webyast-software-ws-0.1.1-build/usr/share/doc/packages/webyast-software-ws + cp -pr COPYING /var/tmp/webyast-software-ws-0.1.1-build/usr/share/doc/packages/webyast-software-ws + exit 0 Finding Provides: /usr/lib/rpm/find-provides webyast-software-ws Finding Requires: /usr/lib/rpm/find-requires webyast-software-ws Finding Supplements: /usr/lib/rpm/find-supplements webyast-software-ws Provides: yast2-webservice-patches = 0.1.1 Requires(interp): /bin/sh Requires(rpmlib): rpmlib(VersionedDependencies) <= 3.0.3-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 rpmlib(CompressedFileNames) <= 3.0.4-1 Requires(post): /bin/sh Obsoletes: yast2-webservice-patches < 0.1.1 Checking for unpackaged file(s): /usr/lib/rpm/check-files /var/tmp/webyast-software-ws-0.1.1-build error: Installed (but unpackaged) file(s) found: /usr/share/PolicyKit/policy/org.opensuse.yast.system.repositories.policy RPM build errors: Installed (but unpackaged) file(s) found: /usr/share/PolicyKit/policy/org.opensuse.yast.system.repositories.policy + 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 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 1

[yast-commit] r60563 - in /branches/SuSE-Code-11-SP1-Branch/autoinstallation: doc/CreateProfileDetails.xml package/autoyast2.changes src/clients/inst_autosetup.ycp src/modules/AutoinstStorage.ycp
by ug＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: ug Date: Wed Jan 27 15:47:08 2010 New Revision: 60563 URL: http://svn.opensuse.org/viewcvs/yast?rev=60563&view=rev Log: symbol added for the use of ImsmDriver (bnc#574270) Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/doc/CreateProfileDetails.xml branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/clients/inst_autosetup.ycp branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/AutoinstStorage.ycp Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/doc/CreateProfileDetails.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/doc/CreateProfileDetails.xml (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/doc/CreateProfileDetails.xml Wed Jan 27 15:47:08 2010 @@ -432,6 +432,13 @@ </entry> <entry>optional. Default is CT_DISK for a normal physical harddisk.</entry> </row> + <row> + <entry>imsmdriver</entry> + <entry>you can choose between `IMSM_DMRAID and `IMSM_MDADM +<para><screen><imsmdriver config:type="symbol"></imsmdriver></screen></para> +</entry> + <entry>optional. Default is `IMSM_DMRAID</entry> + </row> </tbody> </tgroup> </table> Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes Wed Jan 27 15:47:08 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 27 15:28:04 CET 2010 - ug(a)suse.de + +- symbol added for the use of ImsmDriver (bnc#574270) +- 2.17.34 + +------------------------------------------------------------------- Mon Jan 25 12:41:40 CET 2010 - ug(a)suse.de - 2.17.33 Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/clients/inst_autosetup.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/clients/inst_autosetup.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/clients/inst_autosetup.ycp Wed Jan 27 15:47:08 2010 @@ -222,6 +222,7 @@ // recognize this now Storage::ReReadTargetMap(); + Storage::SetImsmDriver( Profile::current["partitioning","imsmdriver"]:`IMSM_DMRAID ); // bnc#574270 // No partitioning in the profile means yast2-storage proposal (hmmmm.....) if( size(Profile::current["partitioning"]:[]) > 0 ) { Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/AutoinstStorage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/AutoinstStorage.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/AutoinstStorage.ycp Wed Jan 27 15:47:08 2010 @@ -77,6 +77,7 @@ if( after == "" ) { foreach (string device, map disk, initial_target_map, ``{ if (disk["type"]:`jo == `CT_DMRAID || + disk["type"]:`jo == `CT_MDPART || disk["type"]:`jo == `CT_DMMULTIPATH) { mbr_disk = device; -- 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-head-i586 #683
by Hudson Integration Service 27 Jan '10

27 Jan '10

See <http://yast.suse.de:3334/job/webyast-service-head-i586/683/changes> Changes: [Ladislav Slezak] Added initial repository model [Ladislav Slezak] added repositories controller, added tests [Ladislav Slezak] added a comment [Ladislav Slezak] added org.opensuse.yast.system.repositories.policy [Ladislav Slezak] repository - use @id instead of @repository_alias .spec - grant PackageKit rights [Ladislav Slezak] convert data to match the DBus signature [Ladislav Slezak] update repo properties in update call save also the new name and URL [Ladislav Slezak] Merge branch 'master' into repo_mgmt [Ladislav Slezak] read missing attributes directly from *.repo file PackageKit doesn't return all needed repository properties, read them directly from a file [Ladislav Slezak] resolvable.rb - make the custom signal handler argument optional [Ladislav Slezak] repository.rb - removed dummy Resolvable.execute signal arguments fixed *.repo file parsing regexps [Ladislav Slezak] don't fail when adding a new repository [Ladislav Slezak] Merge branch 'master' into repo_mgmt [Ladislav Slezak] repositories - fixed reading keeppackages and autorefresh values fixed syntax error in repository update [Ladislav Slezak] Merge branch 'repo_mgmt' [Ladislav Slezak] bump version to 0.1.1 ------------------------------------------ [...truncated 3329 lines...] + 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' webyast-time-ws.spec Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.sFUt0o + umask 022 + cd /tmp/rpmbuild + cd /tmp/rpmbuild + rm -rf www + /usr/bin/bzip2 -dc /src/rest-service/plugins/time/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.2pkNOF + umask 022 + cd /tmp/rpmbuild + /bin/rm -rf /usr/src/packages/BUILDROOT/webyast-time-ws-0.0.11-0.i386 ++ dirname /usr/src/packages/BUILDROOT/webyast-time-ws-0.0.11-0.i386 + /bin/mkdir -p /usr/src/packages/BUILDROOT + /bin/mkdir /usr/src/packages/BUILDROOT/webyast-time-ws-0.0.11-0.i386 + cd www + exit 0 Executing(%install): /bin/sh -e /var/tmp/rpm-tmp.YDNVQZ + umask 022 + cd /tmp/rpmbuild + cd www + mkdir -p /usr/src/packages/BUILDROOT/webyast-time-ws-0.0.11-0.i386/srv/www/yastws/vendor/plugins/time + cp -a COPYING README Rakefile app config doc init.rb install.rb tasks uninstall.rb /usr/src/packages/BUILDROOT/webyast-time-ws-0.0.11-0.i386/srv/www/yastws/vendor/plugins/time + rm -f /usr/src/packages/BUILDROOT/webyast-time-ws-0.0.11-0.i386/srv/www/yastws/vendor/plugins/time/COPYING + mkdir -p /usr/src/packages/BUILDROOT/webyast-time-ws-0.0.11-0.i386/usr/share/PolicyKit/policy + RPM_BUILD_ROOT=/usr/src/packages/BUILDROOT/webyast-time-ws-0.0.11-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/webyast-time-ws-0.0.11-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: webyast-time-ws-0.0.11-0.noarch Executing(%doc): /bin/sh -e /var/tmp/rpm-tmp.TvUV1Y + umask 022 + cd /tmp/rpmbuild + cd www + DOCDIR=/usr/src/packages/BUILDROOT/webyast-time-ws-0.0.11-0.i386/usr/share/doc/packages/webyast-time-ws + export DOCDIR + rm -rf /usr/src/packages/BUILDROOT/webyast-time-ws-0.0.11-0.i386/usr/share/doc/packages/webyast-time-ws + /bin/mkdir -p /usr/src/packages/BUILDROOT/webyast-time-ws-0.0.11-0.i386/usr/share/doc/packages/webyast-time-ws + cp -pr COPYING /usr/src/packages/BUILDROOT/webyast-time-ws-0.0.11-0.i386/usr/share/doc/packages/webyast-time-ws + exit 0 Finding Provides: /usr/lib/rpm/find-provides webyast-time-ws Finding Requires: /usr/lib/rpm/find-requires webyast-time-ws Finding Supplements: /usr/lib/rpm/find-supplements webyast-time-ws Provides: yast2-webservice-time = 0.0.11 Requires(interp): /bin/sh Requires(rpmlib): rpmlib(VersionedDependencies) <= 3.0.3-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 rpmlib(CompressedFileNames) <= 3.0.4-1 Requires(pre): yast2-webservice Requires(post): /bin/sh Requires(preun): yast2-webservice Obsoletes: yast2-webservice-time < 0.0.11 Checking for unpackaged file(s): /usr/lib/rpm/check-files /usr/src/packages/BUILDROOT/webyast-time-ws-0.0.11-0.i386 Wrote: /artifacts/webyast/rest-service/rpms/noarch/webyast-time-ws-0.0.11-0.noarch.rpm Executing(%clean): /bin/sh -e /var/tmp/rpm-tmp.t2qB7e + umask 022 + cd /tmp/rpmbuild + cd www + rm -rf /usr/src/packages/BUILDROOT/webyast-time-ws-0.0.11-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/patches/package + pkgdir=./plugins/patches ++ basename ./plugins/patches + pkgname=patches + destination=/artifacts/webyast/rest-service/package/yast2-webservice-patches + mkdir -p /artifacts/webyast/rest-service/package/yast2-webservice-patches + rm -rf '/artifacts/webyast/rest-service/package/yast2-webservice-patches/*' + rm -rf ./plugins/patches/package/www + cp -r ./plugins/patches/package/org.opensuse.yast.system.packages.policy ./plugins/patches/package/org.opensuse.yast.system.patches.policy ./plugins/patches/package/org.opensuse.yast.system.repositories.policy ./plugins/patches/package/webyast-software-ws.changes ./plugins/patches/package/webyast-software-ws.spec ./plugins/patches/package/www.tar.bz2 /artifacts/webyast/rest-service/package/yast2-webservice-patches + pushd ./plugins/patches/package /src/rest-service/plugins/patches/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' webyast-software-ws.spec Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.JVs96p + umask 022 + cd /tmp/rpmbuild + cd /tmp/rpmbuild + rm -rf www + /bin/tar -xf - + /usr/bin/bzip2 -dc /src/rest-service/plugins/patches/package/www.tar.bz2 + 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.I2xj8E + umask 022 + cd /tmp/rpmbuild + /bin/rm -rf /usr/src/packages/BUILDROOT/webyast-software-ws-0.1.1-0.i386 ++ dirname /usr/src/packages/BUILDROOT/webyast-software-ws-0.1.1-0.i386 + /bin/mkdir -p /usr/src/packages/BUILDROOT + /bin/mkdir /usr/src/packages/BUILDROOT/webyast-software-ws-0.1.1-0.i386 + cd www + rm -rf doc + exit 0 Executing(%install): /bin/sh -e /var/tmp/rpm-tmp.PHG9LX + umask 022 + cd /tmp/rpmbuild + cd www + mkdir -p /usr/src/packages/BUILDROOT/webyast-software-ws-0.1.1-0.i386/srv/www/yastws/vendor/plugins/patches + cp -a COPYING README Rakefile app config init.rb install.rb scripts tasks uninstall.rb /usr/src/packages/BUILDROOT/webyast-software-ws-0.1.1-0.i386/srv/www/yastws/vendor/plugins/patches + rm -f /usr/src/packages/BUILDROOT/webyast-software-ws-0.1.1-0.i386/srv/www/yastws/vendor/plugins/patches/COPYING + mkdir -p /usr/src/packages/BUILDROOT/webyast-software-ws-0.1.1-0.i386/usr/share/PolicyKit/policy + install -m 0644 /src/rest-service/plugins/patches/package/org.opensuse.yast.system.patches.policy /usr/src/packages/BUILDROOT/webyast-software-ws-0.1.1-0.i386/usr/share/PolicyKit/policy/ + install -m 0644 /src/rest-service/plugins/patches/package/org.opensuse.yast.system.packages.policy /usr/src/packages/BUILDROOT/webyast-software-ws-0.1.1-0.i386/usr/share/PolicyKit/policy/ + install -m 0644 /src/rest-service/plugins/patches/package/org.opensuse.yast.system.repositories.policy /usr/src/packages/BUILDROOT/webyast-software-ws-0.1.1-0.i386/usr/share/PolicyKit/policy/ + RPM_BUILD_ROOT=/usr/src/packages/BUILDROOT/webyast-software-ws-0.1.1-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/webyast-software-ws-0.1.1-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: webyast-software-ws-0.1.1-0.noarch Executing(%doc): /bin/sh -e /var/tmp/rpm-tmp.7t6tFE + umask 022 + cd /tmp/rpmbuild + cd www + DOCDIR=/usr/src/packages/BUILDROOT/webyast-software-ws-0.1.1-0.i386/usr/share/doc/packages/webyast-software-ws + export DOCDIR + rm -rf /usr/src/packages/BUILDROOT/webyast-software-ws-0.1.1-0.i386/usr/share/doc/packages/webyast-software-ws + /bin/mkdir -p /usr/src/packages/BUILDROOT/webyast-software-ws-0.1.1-0.i386/usr/share/doc/packages/webyast-software-ws + cp -pr COPYING /usr/src/packages/BUILDROOT/webyast-software-ws-0.1.1-0.i386/usr/share/doc/packages/webyast-software-ws + exit 0 Finding Provides: /usr/lib/rpm/find-provides webyast-software-ws Finding Requires: /usr/lib/rpm/find-requires webyast-software-ws Finding Supplements: /usr/lib/rpm/find-supplements webyast-software-ws Provides: yast2-webservice-patches = 0.1.1 Requires(interp): /bin/sh Requires(rpmlib): rpmlib(VersionedDependencies) <= 3.0.3-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 rpmlib(CompressedFileNames) <= 3.0.4-1 Requires(pre): yast2-webservice Requires(post): /bin/sh Requires(preun): yast2-webservice Obsoletes: yast2-webservice-patches < 0.1.1 Checking for unpackaged file(s): /usr/lib/rpm/check-files /usr/src/packages/BUILDROOT/webyast-software-ws-0.1.1-0.i386 error: Installed (but unpackaged) file(s) found: /usr/share/PolicyKit/policy/org.opensuse.yast.system.repositories.policy RPM build errors: Installed (but unpackaged) file(s) found: /usr/share/PolicyKit/policy/org.opensuse.yast.system.repositories.policy + 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 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 1

[yast-commit] r60562 - /tags/stable-2_19_9/network/
by kmachalkova＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: kmachalkova Date: Wed Jan 27 15:43:50 2010 New Revision: 60562 URL: http://svn.opensuse.org/viewcvs/yast?rev=60562&view=rev Log: Created tag stable-2_19_9 for network Added: tags/stable-2_19_9/network/ - copied from r60561, trunk/network/ -- 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] r60561 - in /trunk/network: VERSION package/yast2-network.changes
by kmachalkova＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: kmachalkova Date: Wed Jan 27 15:43:43 2010 New Revision: 60561 URL: http://svn.opensuse.org/viewcvs/yast?rev=60561&view=rev Log: changes + bump Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=60561&r1=605… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Wed Jan 27 15:43:43 2010 @@ -1 +1 @@ -2.19.8 +2.19.9 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Wed Jan 27 15:43:43 2010 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Wed Jan 27 15:21:42 CET 2010 - kmachalkova(a)suse.cz + +- Evaluate modified flag of all net components (not only LanItems), + so that change in any of them triggers Write (bnc#439235) +- Write DNS data along with other network settings in lan_proposal, + not separately in inst_hostname (related to bnc#556613) +- Renamed "Write hostname to /etc/hosts" and updated related help + text (bnc#510228, bnc#469752) +- 2.19.9 + +------------------------------------------------------------------- Mon Jan 18 09:56:24 CET 2010 - mzugec(a)suse.cz - fixed remote.desktop file (Categories) -- 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] r60560 - in /trunk/storage: package/yast2-storage.changes storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: aschnell Date: Wed Jan 27 15:42:12 2010 New Revision: 60560 URL: http://svn.opensuse.org/viewcvs/yast?rev=60560&view=rev Log: - allow to set driver for IMSM without callback (bnc #574270) Modified: trunk/storage/package/yast2-storage.changes 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 Wed Jan 27 15:42:12 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jan 27 15:09:27 CET 2010 - aschnell(a)suse.de + +- allow to set driver for IMSM without callback (bnc #574270) + +------------------------------------------------------------------- Thu Jan 21 17:28:48 CET 2010 - aschnell(a)suse.de - implemented moving of newly created partitions (see bnc #541034) 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 Wed Jan 27 15:42:12 2010 @@ -176,6 +176,11 @@ "right_asymmetric" : LibStorage::RIGHT_ASYMMETRIC(), "right_symmetric" : LibStorage::RIGHT_SYMMETRIC() ]; +map<symbol, integer> conv_imsm_driver = + $[ `IMSM_UNDECIDED : LibStorage::IMSM_UNDECIDED(), + `IMSM_DMRAID : LibStorage::IMSM_DMRAID(), + `IMSM_MDADM : LibStorage::IMSM_MDADM() ]; + map DiskMapVersion = $[]; map DiskMap = $[]; map type_order = $[ `CT_DISK : 0, `CT_MD : 1, `CT_MDPART : 2, `CT_DMRAID : 3, @@ -284,6 +289,14 @@ } +symbol imsm_driver = `IMSM_UNDECIDED; + +global void SetImsmDriver(symbol val) +{ + imsm_driver = val; +} + + list<map> getContainers(); global boolean InitLibstorage(boolean readonly) @@ -309,6 +322,8 @@ LibStorage::StorageInterface::setEfiBoot(sint, Partitions::EfiBoot()); + LibStorage::StorageInterface::setImsmDriver(sint, conv_imsm_driver[imsm_driver]:LibStorage::IMSM_UNDECIDED()); + conts = getContainers(); y2milestone("InitLibstorage conts:%1", conts); FileSystems::InitSlib(sint); -- 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] r60559 - /tags/branch-Code-11-SP1-2_17_3/mail/
by varkoly＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: varkoly Date: Wed Jan 27 15:41:14 2010 New Revision: 60559 URL: http://svn.opensuse.org/viewcvs/yast?rev=60559&view=rev Log: Created tag branch-Code-11-SP1-2_17_3 for mail Added: tags/branch-Code-11-SP1-2_17_3/mail/ (props changed) - copied from r60558, branches/SuSE-Code-11-SP1-Branch/mail/ -- 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] r60558 - in /branches/SuSE-Code-11-SP1-Branch/mail: ./ agents/ package/ src/ src/YaPI/ users-plugin/
by varkoly＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: varkoly Date: Wed Jan 27 15:40:56 2010 New Revision: 60558 URL: http://svn.opensuse.org/viewcvs/yast?rev=60558&view=rev Log: Merging with trunk Modified: branches/SuSE-Code-11-SP1-Branch/mail/agents/MasterCFParser.pm branches/SuSE-Code-11-SP1-Branch/mail/agents/sysconfig.mail branches/SuSE-Code-11-SP1-Branch/mail/package/yast2-mail.changes branches/SuSE-Code-11-SP1-Branch/mail/src/Mail.ycp branches/SuSE-Code-11-SP1-Branch/mail/src/MailServer.ycp branches/SuSE-Code-11-SP1-Branch/mail/src/MailServerLDAP.pm branches/SuSE-Code-11-SP1-Branch/mail/src/YaPI/MailServer.pm branches/SuSE-Code-11-SP1-Branch/mail/src/mail-server_complex.ycp branches/SuSE-Code-11-SP1-Branch/mail/src/mail-server_dialogs.ycp branches/SuSE-Code-11-SP1-Branch/mail/src/mail-server_helps.ycp branches/SuSE-Code-11-SP1-Branch/mail/src/suse-mailserver.schema branches/SuSE-Code-11-SP1-Branch/mail/src/ui.ycp branches/SuSE-Code-11-SP1-Branch/mail/src/widgets.ycp branches/SuSE-Code-11-SP1-Branch/mail/users-plugin/users_plugin_mail_groups.ycp branches/SuSE-Code-11-SP1-Branch/mail/yast2-mail.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/mail/agents/MasterCFParser.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/mail/… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/mail/agents/MasterCFParser.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/mail/agents/MasterCFParser.pm Wed Jan 27 15:40:56 2010 @@ -71,7 +71,6 @@ package MasterCFParser; use strict; -use Data::Dumper; no warnings 'redefine'; ###################################################################################### @@ -140,8 +139,10 @@ while( defined $CFA[$c+1] && $CFA[$c+1] =~ /^\s+/ ) { $line .= $CFA[++$c]; } - - push @$cfa, line2service($line); + if( $line =~ /\w+/ ) + { #avoid emty lines + push @$cfa, line2service($line); + } } $this->{MCF} = $cfa; return 0; @@ -247,7 +248,10 @@ next if defined $s->{comment}; $foundmatches = 0; foreach my $fs ( keys %$fsrv ) { - $foundmatches++ if $fsrv->{$fs} eq $s->{$fs}; + if( defined $fsrv->{$fs} && defined $s->{$fs} ) + { + $foundmatches++ if $fsrv->{$fs} eq $s->{$fs}; + } } push @$retsrv, $s if $foundmatches == $nrkeys; } @@ -420,7 +424,11 @@ my $line = ''; if( defined $srv->{comment} ) { $line = $srv->{comment}; - } else { + } + elsif( defined $srv->{service} && defined $srv->{type} && defined $srv->{private} && + defined $srv->{unpriv} && defined $srv->{chroot} && defined $srv->{wakeup} && + defined $srv->{maxproc} && defined $srv->{command} ) + { $line = sprintf("%-8s %-5s %-6s %-7s %-7s %-8s %-7s %s", $srv->{service}, Modified: branches/SuSE-Code-11-SP1-Branch/mail/agents/sysconfig.mail URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/mail/… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/mail/agents/sysconfig.mail (original) +++ branches/SuSE-Code-11-SP1-Branch/mail/agents/sysconfig.mail Wed Jan 27 15:40:56 2010 @@ -30,13 +30,13 @@ # If set to "no" or empty then only mail from localhost # will be accepted. # -SMTPD_LISTEN_REMOTE="yes" +SMTPD_LISTEN_REMOTE="no" ## Type: yesno ## Default: no # # Set this to "yes" if the yast2 mail module must not -# start with the with the vizard for asking the +# start with the wizard for asking the # configuration type of the mail server. # SKIP_ASK="no" Modified: branches/SuSE-Code-11-SP1-Branch/mail/package/yast2-mail.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/mail/… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/mail/package/yast2-mail.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/mail/package/yast2-mail.changes Wed Jan 27 15:40:56 2010 @@ -1,4 +1,35 @@ ------------------------------------------------------------------- +Wed Jan 27 15:28:16 CET 2010 - varkoly(a)suse.de + +- Apply jsuchomes changes from bnc#559145 + Export and Import smtp_use_TLS: no yes may + Export and Import smtp_use_TLS +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) +- bnc#555814 â VUL-0: SMTPD_LISTEN_REMOTE="yes" by default +- bnc#532518 â YaST in translation (use 'YaST' instead of 'YaST2') +- Reorganize ldap tables +- remove redefinition of read_attribute +- bnc#491113 - fetchmail demon is started though disabled in runlevel + editor when configuring email via network services +- bnc#488677 - yast2-mail "Advanced config" overwrites mailman settings +- alias map ldap search must be sub +- bnc#490688 â rename mail server module from "Mail Transfer Agent" to "Mail Server" +- If starting the virus scanner freshclam have to be started also +- bnc#483639 - yast2 mail server's master.cf parser do not writes some lines +- saslauthd and cyrus must be started and enabled by YaPI +- Serial of SOA Record must not be greater then 4294967295 +- bnc#467589 - Cyrus don't create Directory for new LDAP User at first run. +- bnc#467562 - Yast mail doesn't install needed Spamassassin Package for SPAM learning extension for Mailserver +- bnc#466748 - yast2-mail-plugins broken +- avoid undefined variables in the MasterCFParser +- make progress bar by WriteDialog visable +- bnc#463589 - YaST2 Mail Server & amavisd +- the myhostname in /etc/amavisd.conf must be set to FQHN +- bnc#463430 - Mail to a shared folder can couse infinit loop + +------------------------------------------------------------------- Fri Dec 12 06:37:41 CET 2008 - varkoly(a)suse.de - bnc#458553 - YaSt2 Mail module do not install cyrus-sasl-saslauthd Modified: branches/SuSE-Code-11-SP1-Branch/mail/src/Mail.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/mail/… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/mail/src/Mail.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/mail/src/Mail.ycp Wed Jan 27 15:40:56 2010 @@ -103,7 +103,7 @@ /** * Do the MTA use TLS for sending the email. */ - global boolean smtp_use_TLS = true; + global string smtp_use_TLS = "yes"; /** * Mail will appear to come from this domain. Applies also for the @@ -133,16 +133,10 @@ /** * When should fetchmail run: * <dl> - * <dt> `manual <dd> - * <dt> `ppp <dd> for a ppp conection, /etc/ppp/ip-{up,down}.d - * <dt> `network <dd> for any network connection, - * /etc/sysconfig/network/if-{up,down}.d - * </dl> - * #22903 - * Unused yet! - * #37139, just enable rcfetchmail. + * <dt> "manual" <dd> + * <dt> "daemon" <dd> */ - global symbol fetchmail_mode = `manual; + global string fetchmail_mode = "manual"; /** *List of maps: @@ -333,7 +327,7 @@ * @return Whether rcfetchmail should run */ define boolean RunFetchmailGlobally () ``{ - return size (fetchmail) > 0; + return ( fetchmail_mode == "daemon" && size (fetchmail) > 0 ); } /** @@ -453,7 +447,7 @@ } else if (mta == `postfix) { - smtp_use_TLS = ( (string) SCR::Read (.sysconfig.postfix.POSTFIX_SMTP_TLS_CLIENT) == "yes" ); + smtp_use_TLS = (string) SCR::Read (.sysconfig.postfix.POSTFIX_SMTP_TLS_CLIENT); outgoing_mail_server = (string) SCR::Read (.sysconfig.postfix.POSTFIX_RELAYHOST); } @@ -544,9 +538,10 @@ { return false; } - // read 4 - // TODO - fetchmail_mode = `manual; + if( Service::Enabled ("fetchmail") ) + { + fetchmail_mode = "daemon"; + } // if we are testing as non-root, it will fail, that's OK map out = (map) SCR::Execute (.target.bash_output, "/usr/bin/id --user"); @@ -559,7 +554,7 @@ // %1 is a file name, // %2 is a long file name - leave it on a separate line Report::Error (sformat(_("Error reading file %1. The file must have -a fixed format to be readable by YaST2. For details, see +a fixed format to be readable by YaST. For details, see %2"), "/etc/fetchmailrc", "/usr/share/doc/packages/yast2-mail/fetchmailrc.txt")); @@ -635,6 +630,14 @@ } /** + * Wrapper for global Read function, without the callback argument + */ + global boolean ReadWithoutCallback () { + block<boolean> abort_block = ``{ return false; }; + return Read (abort_block); + } + + /** * Make up data for screnshots */ global define void Fake () ``{ @@ -681,7 +684,7 @@ * Part of Write. * @return success */ - define boolean WriteGeneral () ``{ + global define boolean WriteGeneral () ``{ // create_config // if the user wanted it false, we did not proceed SCR::Write (.sysconfig.mail.MAIL_CREATE_CONFIG, "yes"); @@ -788,14 +791,7 @@ else if (mta == `postfix) { SCR::Write (.sysconfig.postfix.POSTFIX_RELAYHOST, outgoing_mail_server); - if( smtp_use_TLS ) - { - SCR::Write (.sysconfig.postfix.POSTFIX_SMTP_TLS_CLIENT, "yes"); - } - else - { - SCR::Write (.sysconfig.postfix.POSTFIX_SMTP_TLS_CLIENT, "no"); - } + SCR::Write (.sysconfig.postfix.POSTFIX_SMTP_TLS_CLIENT, smtp_use_TLS); } else { @@ -823,7 +819,7 @@ * Part of Write. * @return success */ - define boolean WriteMasquerading () ``{ + global define boolean WriteMasquerading () ``{ // from_header SCR::Write (.sysconfig.mail.FROM_HEADER, from_header); // masquerade_other_domains @@ -869,7 +865,7 @@ * Part of Write. * @return success */ - define boolean WriteDownloading () ``{ + global define boolean WriteDownloading () ``{ // fetchmail // TODO ?other settings: autofetch? at device up? SCR::Write (.mail.fetchmail.accounts, fetchmail); @@ -895,7 +891,7 @@ * Part of Write. * @return success */ - define boolean WriteAliasesAndVirtual () ``{ + global define boolean WriteAliasesAndVirtual () ``{ // aliases if (! MailAliases::WriteAliases ()) { @@ -928,7 +924,7 @@ * Part of Write. * @return success */ - define boolean WriteSmtpAuth () ``{ + global define boolean WriteSmtpAuth () ``{ // TODO how to remove the only entry? // filter it out in the dialog? if (enable_smtp_auth != nil) @@ -962,7 +958,7 @@ * Part of Write. * @return success */ - define boolean WriteFlush () ``{ + global define boolean WriteFlush () ``{ //flush the agents map<string, path> paths = $[ "/etc/sysconfig/mail": .sysconfig.mail, @@ -1020,7 +1016,7 @@ * Part of Write. * @return success */ - define boolean WriteSuSEconfig () ``{ + global define boolean WriteSuSEconfig () ``{ //run SuSEconfig with the necessary modules // TODO other modules using FROM_HEADER? integer ret = 0; @@ -1052,7 +1048,7 @@ * Part of Write. * @return success */ - define boolean WriteServices () ``{ + global define boolean WriteServices () ``{ if (amavis_service) { Service::Stop ("amavis"); @@ -1173,6 +1169,13 @@ return true; } + /** + * Wrapper for global Write function, without the callback argument + */ + global boolean WriteWithoutCallback () { + block<boolean> abort_block = ``{ return false; }; + return Write (abort_block); + } /** * Get all mail settings from the first parameter @@ -1230,6 +1233,7 @@ MailAliases::FilterRootAlias (); // MailAliases::merge_aliases = settings["merge_aliases"]: false; virtual_users = settings["virtual_users"]: []; + smtp_use_TLS = settings["smtp_use_TLS"]: "yes"; smtp_auth = settings["smtp_auth"]: []; y2debug ("after %1", settings); // may contain passwords return true; @@ -1257,6 +1261,7 @@ // "merge_aliases": MailAliases::merge_aliases, "virtual_users": virtual_users, "smtp_auth": smtp_auth, + "smtp_use_TLS": smtp_use_TLS, ]; if (mta == `postfix) { Modified: branches/SuSE-Code-11-SP1-Branch/mail/src/MailServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/mail/… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/mail/src/MailServer.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/mail/src/MailServer.ycp Wed Jan 27 15:40:56 2010 @@ -162,7 +162,6 @@ global boolean pam_ldap_installed = false; global boolean nss_ldap_installed = false; global boolean procmail_installed = false; -global boolean amavis_installed = false; global boolean ldap_installed = false; global boolean cyrus_installed = false; global boolean postfix_installed = false; @@ -170,6 +169,9 @@ global boolean sasl_installed = false; global boolean saslauthd_installed = false; global boolean plugins_installed = false; +global boolean amavis_installed = false; +global boolean spamassassin_installed=false; +global boolean clamav_installed = false; /* * Help funktion to check the DNS Settings @@ -268,10 +270,12 @@ postfix_installed = Installed("postfix"); fetchmail_installed = Installed("fetchmail"); ldap_installed = Installed("yast2-ldap-client"); - amavis_installed = Installed("amavisd-new"); sasl_installed = Installed("cyrus-sasl-plain"); saslauthd_installed = Installed("cyrus-sasl-saslauthd"); plugins_installed = Installed("yast2-mail-plugins"); + amavis_installed = Installed("amavisd-new"); + clamav_installed = Installed("clamav"); + spamassassin_installed= Installed("spamassassin"); string to_install = ""; list<string> l_to_install = []; @@ -310,13 +314,6 @@ l_to_install = add( l_to_install, "yast2-mail-plugins" ); to_install = to_install + "yast2-mail-plugins\n"; } - if(!amavis_installed) - { - l_to_install = add( l_to_install, "amavisd-new" ); - to_install = to_install + "amavisd-new\n"; - l_to_install = add( l_to_install, "clamav" ); - to_install = to_install + "clamav\n"; - } if(to_install != "") { if ( Report::AnyQuestion ("",_("You have not installed all needed packages.") + @@ -504,13 +501,13 @@ /* Progress stage 1/7 */ _("Write mail server global settings"), /* Progress stage 2/7 */ - _("Write mail server transports"), + _("Write mail server local delivery settings"), /* Progress stage 3/7 */ - _("Write mail server prevention settings"), + _("Write mail server transports"), /* Progress stage 4/7 */ - _("Write mail server relaying settings"), + _("Write mail server prevention settings"), /* Progress stage 5/7 */ - _("Write mail server local delivery settings"), + _("Write mail server relaying settings"), /* Progress stage 6/3 */ _("Write mail fetching jobs"), /* Progress stage 7/7 */ @@ -519,13 +516,13 @@ /* Progress stage 1/7 */ _("Writing mail server global settings..."), /* Progress stage 2/7 */ - _("Writing mail server transports..."), + _("Writing mail server local delivery settings..."), /* Progress stage 3/7 */ - _("Writing mail server prevention settings..."), + _("Writing mail server transports..."), /* Progress stage 4/7 */ - _("Writing mail server relaying settings..."), + _("Writing mail server prevention settings..."), /* Progress stage 5/7 */ - _("Writing mail server local delivery settings..."), + _("Writing mail server relaying settings..."), /* Progress stage 6/3 */ _("Writing mail fetching jobs..."), /* Progress stage 7/7 */ @@ -550,66 +547,6 @@ } sleep(sl); - // write mail transports - if(Abort()) return false; - Progress::NextStep(); - if( (boolean)MailTransports["Changed"]:false ) { - // First we have to clean up TLS Sites - if( ! YaPI::MailServer::WriteMailTransports(MailTransports,AdminPassword) ) { - Report::Error(_("Cannot write mail server transports.")); - } - } - sleep(sl); - - // write mail preventions - if(Abort()) return false; - Progress::NextStage(); - if((boolean)MailPrevention["VirusScanning"]:false) { - if(! amavis_installed) - { - if ( Report::AnyQuestion ("",_("You have not installed all needed packages.") + - "\n clamav \n amavisd-new \n", - Label::InstallButton(), - Label::AbortButton(), - `focus_yes)) - { - Package::DoInstall(["clamav","amavisd-new"]); - Service::Start("clamd"); - Service::Start("freshclam"); - Service::Start("amavis"); - y2milestone("Installing amavis"); - } - else - { - return false; - } - } - Service::Enable("amavis"); - Service::Enable("clamd"); - Service::Enable("freshclam"); - } - if( (boolean)MailPrevention["Changed"]:false ) { - if( ! YaPI::MailServer::WriteMailPrevention(MailPrevention,AdminPassword) ) { - Report::Error(_("Cannot write mail server preventions.")); - } - if((boolean)MailPrevention["VirusScanning"]:false) { - Service::Restart("clamd"); - Service::Restart("freshclam"); - Service::Restart("amavis"); - } - } - sleep(sl); - - // write mail realaying - if(Abort()) return false; - Progress::NextStage(); - if( (boolean)MailRelaying["Changed"]:false ) { - if( ! YaPI::MailServer::WriteMailRelaying(MailRelaying,AdminPassword) ) { - Report::Warning(_("Cannot write the mail server relay settings.")); - } - } - sleep(sl); - // write mail local delivery // first we looking for if all the needed packages are installed if(MailLocalDelivery["Type"]:"none" == "procmail"){ @@ -636,38 +573,26 @@ } if(MailLocalDelivery["Type"]:"none" == "cyrus") { - if(!cyrus_installed) - { - if ( Report::AnyQuestion ("",_("You have not installed all needed packages.") + - "\n cyrus-imapd \n", - Label::InstallButton(), - Label::AbortButton(), - `focus_yes)) - { - Package::DoInstall(["cyrus-imapd"]); - SCR::UnmountAgent(.etc.imapd_conf); - } - else - { - return false; - } - } - string crypted = Users::CryptPassword(AdminPassword, "system", "foo"); - SCR::Write(.target.passwd.cyrus, crypted); - - list Values = SCR::Dir(.etc.imapd_conf); - SCR::Write(.etc.imapd_conf.allowplaintext,"yes"); - if(!contains(Values,"unixhierarchysep")) { - SCR::Write(.etc.imapd_conf.unixhierarchysep,"yes"); - } - if(!contains(Values,"allowplainwithouttls")) { - SCR::Write(.etc.imapd_conf.allowplainwithouttls,"yes"); - } - SCR::Write(.etc.imapd_conf,nil); - if(Service::Status("cyrus") > 0) { - Service::Start("cyrus"); - Service::Enable("cyrus"); - } + if(!cyrus_installed) + { + if ( Report::AnyQuestion ("",_("You have not installed all needed packages.") + + "\n cyrus-imapd \n", + Label::InstallButton(), + Label::AbortButton(), + `focus_yes)) + { + Package::DoInstall(["cyrus-imapd"]); + SCR::UnmountAgent(.etc.imapd_conf); + } + else + { + return false; + } + } + string crypted = Users::CryptPassword(AdminPassword, "system", "foo"); + SCR::Write(.target.passwd.cyrus, crypted); + y2milestone("--- Enabling cyrus --"); + Service::Enable("cyrus"); } else { if(cyrus_installed) { Service::Stop("cyrus"); @@ -681,7 +606,102 @@ Report::Warning(_("Cannot write the mail server local delivery settings.")); } if(MailLocalDelivery["Type"]:"none" == "cyrus") { - Service::Reload("cyrus"); + y2milestone("--- Stop cyrus --"); + Service::Stop("cyrus"); + y2milestone("--- Start cyrus --"); + Service::Start("cyrus"); + sleep(10000); + YaPI::MailServer::CreateRootMailbox(AdminPassword); + } + } + sleep(sl); + + // write mail transports + if(Abort()) return false; + Progress::NextStep(); + if( (boolean)MailTransports["Changed"]:false ) { + // First we have to clean up TLS Sites + if( ! YaPI::MailServer::WriteMailTransports(MailTransports,AdminPassword) ) { + Report::Error(_("Cannot write mail server transports.")); + } + } + sleep(sl); + + // write mail preventions + if(Abort()) return false; + Progress::NextStage(); + if((boolean)MailPrevention["VirusScanning"]:false) + { + string to_install = ""; + list<string> l_to_install = []; + if(!amavis_installed) + { + l_to_install = add( l_to_install, "amavisd-new" ); + to_install = to_install + "\n amavisd-new"; + if(!clamav_installed) + { + l_to_install = add( l_to_install, "clamav" ); + to_install = to_install + "\n clamav"; + } + if(!spamassassin_installed) + { + l_to_install = add( l_to_install, "spamassassin" ); + to_install = to_install + "\n spamassassin"; + } + if(! amavis_installed || !clamav_installed || !spamassassin_installed) + { + if ( Report::AnyQuestion ("",_("You have not installed all needed packages.") + + to_install, + Label::InstallButton(), + Label::AbortButton(), + `focus_yes)) + { + Package::DoInstall(l_to_install); + y2milestone("Installing amavis"); + } + else + { + return false; + } + Service::Start("clamd"); + Service::Start("freshclam"); + Service::Start("amavis"); + } + Service::Enable("amavis"); + Service::Enable("clamd"); + Service::Enable("freshclam"); + } + } + if( (boolean)MailPrevention["Changed"]:false ) { + if( ! YaPI::MailServer::WriteMailPrevention(MailPrevention,AdminPassword) ) { + Report::Error(_("Cannot write mail server preventions.")); + } + if((boolean)MailPrevention["VirusScanning"]:false) { + Service::Enable("amavis"); + Service::Enable("clamd"); + Service::Enable("freshclam"); + Service::Restart("clamd"); + Service::Restart("freshclam"); + Service::Restart("amavis"); + } + else + { + Service::Stop("clamd"); + Service::Stop("freshclam"); + Service::Stop("amavis"); + Service::Disable("amavis"); + Service::Disable("clamd"); + Service::Disable("freshclam"); + } + } + sleep(sl); + + // write mail realaying + if(Abort()) return false; + Progress::NextStage(); + if( (boolean)MailRelaying["Changed"]:false ) { + if( ! YaPI::MailServer::WriteMailRelaying(MailRelaying,AdminPassword) ) { + Report::Warning(_("Cannot write the mail server relay settings.")); } } sleep(sl); Modified: branches/SuSE-Code-11-SP1-Branch/mail/src/MailServerLDAP.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/mail/… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/mail/src/MailServerLDAP.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/mail/src/MailServerLDAP.pm Wed Jan 27 15:40:56 2010 @@ -55,7 +55,8 @@ my $indices = YaPI::LdapServer->ReadIndex( $ldapMap->[2]->{'suffix'} ); my @attrs = ( "SuSEMailClient", "SUSEMailAcceptAddress", "zoneName", "SuSEMailDomainMasquerading", "relativeDomainName", "suseMailDomainType", - "suseTLSPerSitePeer", "SuSEMailTransportDestination" ); + "suseTLSPerSitePeer", "SuSEMailTransportDestination", + "suseDeliveryToFolder", "suseDeliveryToMember" ); foreach my $attr (@attrs){ my $curindex; if (! defined $indices->{$attr} ) { Modified: branches/SuSE-Code-11-SP1-Branch/mail/src/YaPI/MailServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/mail/… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/mail/src/YaPI/MailServer.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/mail/src/YaPI/MailServer.pm Wed Jan 27 15:40:56 2010 @@ -197,9 +197,8 @@ $GlobalSettings{'MaximumMailSize'} = read_attribute($MainCf,'message_size_limit'); # - $GlobalSettings{'Banner'} = `postconf -h smtpd_banner`; - $GlobalSettings{'Interfaces'} = `postconf -h inet_interfaces`; - chomp $GlobalSettings{'Banner'}; + chomp( $GlobalSettings{'Banner'} = `postconf -h smtpd_banner`); + chomp($GlobalSettings{'Interfaces'} = `postconf -h inet_interfaces`); # Determine if relay host is used $GlobalSettings{'SendingMail'}{'RelayHost'}{'Name'} = read_attribute($MainCf,'relayhost'); @@ -348,7 +347,14 @@ 'command' => 'smtp' }); if(! defined $smtpsrv ) { - SCR->Execute('.mail.postfix.mastercf.addService', { 'service' => 'smtp', 'command' => 'smtp' }); + SCR->Execute('.mail.postfix.mastercf.addService', { 'service' => 'smtp', + 'type' => 'inet', + 'private' => 'n', + 'unpriv' => '-', + 'chroot' => 'n', + 'wakeup' => '-', + 'maxproc' => '-', + 'command' => 'smtpd' }); } } @@ -1161,44 +1167,38 @@ } # Now we looking for if vscan (virusscanning) is started. - my $vscan = SCR->Execute('.mail.postfix.mastercf.findService', + my $vscanin = SCR->Execute('.mail.postfix.mastercf.findService', { 'service' => 'localhost:10025', 'command' => 'smtpd'} ); - my $smtp = SCR->Execute('.mail.postfix.mastercf.findService', - { 'service' => 'smtp', - 'command' => 'smtpd'}); -#print STDERR "SMTP"; -#print STDERR Dumper ($smtp); -#print STDERR "VSCAN"; -#print STDERR Dumper ($vscan); - if( defined $smtp->[0] && defined $smtp->[0]->{'options'} ) - { - if( $smtp->[0]->{'options'}->{'content_filter'} eq 'smtp:[127.0.0.1]:10024' && $vscan ) - { - $MailPrevention{'VirusScanning'} = YaST::YCP::Boolean(1); - if( ! open(IN,$aconf) ) - { - return "Error: $!"; - } - my @ACONF = <IN>; - close(IN); - my $ismax = 0; - foreach ( @ACONF ) - { - s/\s+//g; + my $vscanout = SCR->Execute('.mail.postfix.mastercf.findService', + { 'service' => 'amavis', + 'command' => 'lmtp'} ); + my $content_filter = read_attribute($MainCf,'content_filter'); + + if( $content_filter eq 'amavis:[127.0.0.1]:10024' && $vscanin && $vscanout) + { + $MailPrevention{'VirusScanning'} = YaST::YCP::Boolean(1); + if( ! open(IN,$aconf) ) + { + return "Error: $!"; + } + my @ACONF = <IN>; + close(IN); + my $ismax = 0; + foreach ( @ACONF ) + { + s/\s+//g; if ( /^\$max_servers=(\d+)/ ) { - $MailPrevention{'VSCount'} = YaST::YCP::Integer($1); + $MailPrevention{'VSCount'} = YaST::YCP::Integer($1); } $ismax = 1; - } - if( !$ismax ) - { - $MailPrevention{'VSCount'} = YaST::YCP::Integer(5); - } - } + } + if( !$ismax ) + { + $MailPrevention{'VSCount'} = YaST::YCP::Integer(2); + } } - # make IMAP connection my $imap = new Net::IMAP($imaphost, Debug => 0); if( $imap ) @@ -1211,6 +1211,7 @@ $MailPrevention{'SpamLearning'} = YaST::YCP::Boolean(1); } } + $imap->logout(); } return \%MailPrevention; @@ -1276,11 +1277,9 @@ if($MailPrevention->{'BasicProtection'} eq 'hard') { #Write hard settings - write_attribute($MainCf,'smtpd_sender_restrictions','ldap:/etc/postfix/ldapaccess.cf, reject_unknown_sender_domain'); write_attribute($MainCf,'smtpd_helo_required','yes'); write_attribute($MainCf,'smtpd_helo_restrictions','permit_mynetworks, reject_invalid_hostname'); write_attribute($MainCf,'strict_rfc821_envelopes','yes'); - write_attribute($MainCf,'local_recipient_maps','$alias_maps, ldap:/etc/postfix/ldaplocal_recipient_maps.cf'); if( $clnt_restrictions ne '') { write_attribute($MainCf,'smtpd_client_restrictions',"permit_mynetworks, $clnt_restrictions, ldap:/etc/postfix/ldapaccess.cf, reject_unknown_client"); @@ -1293,11 +1292,9 @@ elsif($MailPrevention->{'BasicProtection'} eq 'medium') { #Write medium settings - write_attribute($MainCf,'smtpd_sender_restrictions','ldap:/etc/postfix/ldapaccess.cf, reject_unknown_sender_domain'); write_attribute($MainCf,'smtpd_helo_required','yes'); write_attribute($MainCf,'smtpd_helo_restrictions',''); write_attribute($MainCf,'strict_rfc821_envelopes','no'); - write_attribute($MainCf,'local_recipient_maps','$alias_maps, ldap:/etc/postfix/ldaplocal_recipient_maps.cf'); if( $clnt_restrictions ne '') { write_attribute($MainCf,'smtpd_client_restrictions',"$clnt_restrictions, ldap:/etc/postfix/ldapaccess.cf"); @@ -1310,12 +1307,10 @@ elsif($MailPrevention->{'BasicProtection'} eq 'off') { # Write off settings - write_attribute($MainCf,'smtpd_sender_restrictions','ldap:/etc/postfix/ldapaccess.cf'); write_attribute($MainCf,'smtpd_helo_required','no'); write_attribute($MainCf,'smtpd_helo_restrictions',''); write_attribute($MainCf,'strict_rfc821_envelopes','no'); write_attribute($MainCf,'smtpd_client_restrictions','ldap:/etc/postfix/ldapaccess.cf'); - write_attribute($MainCf,'local_recipient_maps','$alias_maps, ldap:/etc/postfix/ldaplocal_recipient_maps.cf'); } else { @@ -1372,34 +1367,64 @@ code => "VIRUS_SCANNER_FAILED", description => "activating the virus scanner failed: $err"); } - if( SCR->Execute('.mail.postfix.mastercf.findService', - { 'service' => 'smtp', 'command' => 'smtpd' })) - { - SCR->Execute('.mail.postfix.mastercf.modifyService', - { 'service' => 'smtp', - 'command' => 'smtpd', - 'maxproc' => $MailPrevention->{'VSCount'}, - 'options' => { 'content_filter' => 'smtp:[127.0.0.1]:10024' } } ); - } - else + # This is only for systems updated from SLES10 + my $smtps = SCR->Execute('.mail.postfix.mastercf.findService', + { 'service' => 'smtps', 'command' => 'smtpd' }); + if( ref($smtps) eq 'ARRAY' && defined $smtps->[0]->{options} ) + { + my $opts = $smtps->[0]->{options}; + if ( defined $opts->{'content_filter'} ) + { + delete $opts->{'content_filter'}; + SCR->Execute('.mail.postfix.mastercf.modifyService', + { 'service' => 'smtps', + 'command' => 'smtpd', + 'maxproc' => '-', + 'options' => $opts } ); + } + } + my $smtp = SCR->Execute('.mail.postfix.mastercf.findService', + { 'service' => 'smtp', 'command' => 'smtpd' }); + if( ref($smtp) eq 'ARRAY' && defined $smtp->[0]->{options} ) + { + my $opts = $smtp->[0]->{options}; + if ( defined $opts->{'content_filter'} ) + { + delete $opts->{'content_filter'}; + SCR->Execute('.mail.postfix.mastercf.modifyService', + { 'service' => 'smtp', + 'command' => 'smtpd', + 'maxproc' => '-', + 'options' => $opts } ); + } + } + # End This is only for systems updated from SLES10 + if( SCR->Execute('.mail.postfix.mastercf.findService', + { 'service' => 'localhost:10025', 'command' => 'smtpd' })) { - SCR->Execute('.mail.postfix.mastercf.addService', - { 'service' => 'smtp', - 'command' => 'smtpd', + SCR->Execute('.mail.postfix.mastercf.deleteService', + { 'service' => 'localhost:10025', 'command' => 'smtpd' }); + } + if( SCR->Execute('.mail.postfix.mastercf.findService', + { 'service' => 'amavis', 'command' => 'lmtp' })) + { + SCR->Execute('.mail.postfix.mastercf.deleteService', + { 'service' => 'amavis', 'command' => 'lmtp' }); + } + # create smtpd pocess for getting back the emails + SCR->Execute('.mail.postfix.mastercf.addService', + { 'service' => 'amavis', + 'command' => 'lmtp', + 'type' => 'unix', + 'private' => '-', + 'unpriv' => '-', + 'chroot' => '-', + 'wakeup' => '-', 'maxproc' => $MailPrevention->{'VSCount'}, - 'options' => { 'content_filter' => 'smtp:[127.0.0.1]:10024' } } ); - } - my $smtps = SCR->Execute('.mail.postfix.mastercf.findService', - { 'service' => 'smtps', 'command' => 'smtpd' }); - if( ref($smtps) eq 'ARRAY' && defined $smtps->[0]->{options} ) - { - my $opts = $smtps->[0]->{options}; - $opts->{'content_filter'} = 'smtp:[127.0.0.1]:10024'; - SCR->Execute('.mail.postfix.mastercf.modifyService', - { 'service' => 'smtps', - 'command' => 'smtpd', - 'options' => $opts } ); - } + 'options' => { lmtp_data_done_timeout => 1200, + lmtp_send_xforward_command => 'yes', + disable_dns_lookups => 'yes', + max_use => 20 } } ); SCR->Execute('.mail.postfix.mastercf.addService', { 'service' => 'localhost:10025', 'command' => 'smtpd', @@ -1409,34 +1434,42 @@ 'chroot' => 'n', 'wakeup' => '-', 'maxproc' => '-', - 'options' => { 'content_filter' => '' } } ); + 'options' => { content_filter => '', + relay_recipient_maps => '', + smtpd_delay_reject => 'no', + smtpd_restriction_classes => '', + smtpd_client_restrictions => '', + smtpd_helo_restrictions => '', + smtpd_sender_restrictions => '', + smtpd_recipient_restrictions => 'permit_mynetworks,reject', + smtpd_data_restrictions => 'reject_unauth_pipelining', + smtpd_end_of_data_restrictions => '', + mynetworks => '127.0.0.0/8', + smtpd_error_sleep_time => '0', + smtpd_soft_error_limit => '1001', + smtpd_hard_error_limit => '1000', + smtpd_client_connection_count_limit => '0', + smtpd_client_connection_rate_limit => '0', + receive_override_options => 'no_header_body_checks,no_unknown_recipient_checks' + } + } ); + write_attribute($MainCf,'content_filter','amavis:[127.0.0.1]:10024'); } else { - SCR->Execute('.mail.postfix.mastercf.deleteService', - { 'service' => 'localhost:10025', 'command' => 'smtpd' }); - SCR->Execute('.mail.postfix.mastercf.modifyService', - { 'service' => 'smtp', 'command' => 'smtpd', 'options' => {} } ); - - my $smtps = SCR->Execute('.mail.postfix.mastercf.findService', - { 'service' => 'smtps', 'command' => 'smtpd' }); - if( ref($smtps) eq 'ARRAY' && defined $smtps->[0]->{options} ) - { - my $opts = $smtps->[0]->{options}; - delete $opts->{'content_filter'}; - SCR->Execute('.mail.postfix.mastercf.modifyService', - { 'service' => 'smtps', - 'command' => 'smtpd', - 'options' => $opts }); - } - Service->Stop('amavis'); - Service->Stop('clamd'); - Service->Disable('amavis'); - Service->Disable('clamd'); + SCR->Execute('.mail.postfix.mastercf.deleteService', + { 'service' => 'localhost:10025', 'command' => 'smtpd' }); + SCR->Execute('.mail.postfix.mastercf.deleteService', + { 'service' => 'amavis', 'command' => 'lmtp' }); + write_attribute($MainCf,'content_filter',''); + + Service->Stop('amavis'); + Service->Stop('clamd'); + Service->Disable('amavis'); + Service->Disable('clamd'); } # now we looks if the ldap entries in the main.cf for the access table are OK. - check_ldap_configuration('local_recipient_maps',$ldapMap); check_ldap_configuration('access',$ldapMap); SCR->Write('.mail.postfix.main.table',$MainCf); SCR->Write('.mail.postfix.main',undef); @@ -1468,13 +1501,13 @@ setfacl -m u:vscan:rx /var/spool/imap /var/spool/imap/{NoSpam,NewSpam} setfacl -m m::rx /var/spool/imap /var/spool/imap/{NoSpam,NewSpam} -su - vscan -c "/usr/bin/sa-learn --sync" +/usr/bin/sa-learn --sync --dbpath /var/spool/amavis/.spamassassin/ ( for i in `ls /var/spool/imap/NewSpam/[0-9]* 2> /dev/null` do setfacl -m user:vscan:r-x $i echo $i - su - vscan -c "/usr/bin/sa-learn --spam $i" + /usr/bin/sa-learn --spam --dbpath /var/spool/amavis/.spamassassin/ $i rm $i done ) >> $LOG 2>&1 @@ -1485,22 +1518,26 @@ do setfacl -m user:vscan:r-x $i echo $i - su - vscan -c "/usr/bin/sa-learn --ham $i" + /usr/bin/sa-learn --ham --dbpath /var/spool/amavis/.spamassassin/ $i rm $i done ) >> $LOG 2>&1 su - cyrus -c "reconstruct NoSpam" &>/dev/null +chown -R vscan /var/spool/amavis/.spamassassin/ setfacl -b /var/spool/imap /var/spool/imap/{NoSpam,NewSpam} '; SCR->Write(".target.string","/etc/cron.hourly/lern-spam",$lernspam); - SCR->Write(".target.bash","chmod 755 /etc/cron.hourly/lern-spam"); + SCR->Execute(".target.bash","chmod 755 /etc/cron.hourly/lern-spam"); } + $imap->logout(); } else { - SCR->Write(".target.bash","test -e /etc/cron.hourly/lern-spam && rm /etc/cron.hourly/lern-spam"); - $ret = $imap->delete('NewSpam'); + SCR->Execute(".target.bash","test -e /etc/cron.hourly/lern-spam && rm /etc/cron.hourly/lern-spam"); + $ret = $imap->delete('NewSpam'); + $ret = $imap->delete('NoSpam'); + $imap->logout(); } } return 1; @@ -1597,7 +1634,7 @@ my $smtpd_recipient_restrictions = read_attribute($MainCf,'smtpd_recipient_restrictions'); my $smtpd_sasl_auth_enable = read_attribute($MainCf,'smtpd_sasl_auth_enable'); my $smtpd_use_tls = read_attribute($MainCf,'smtpd_use_tls'); - my $smtpd_enforce_tls = read_attribute($MainCf,'smtpd_enforce_tls'); + my $smtpd_enforce_tls = read_attribute($MainCf,'smtpd_enforce_tls') || 'no'; my $smtpd_tls_auth_only = read_attribute($MainCf,'smtpd_tls_auth_only'); if($smtpd_use_tls eq 'no') { @@ -1643,7 +1680,6 @@ } y2milestone("-- WriteMailRelaying --"); -#print STDERR Dumper([$MailRelaying]); # Make LDAP Connection my $ldapMap = $self->ReadLDAPDefaults($AdminPassword); if( !$ldapMap ) @@ -1787,7 +1823,7 @@ my %MailLocalDelivery = ( 'Changed' => YaST::YCP::Boolean(0), 'Type' => '', - 'MailboxSizeLimit'=> '', + 'MailboxSizeLimit'=> 0, 'FallBackMailbox' => '', 'SpoolDirectory' => '', 'QuotaLimit' => 90, @@ -1915,13 +1951,7 @@ #print STDERR Dumper([$MailLocalDelivery]); if( $MailLocalDelivery->{'Type'} ne 'none') { - write_attribute($MainCf,'mydestination','$myhostname, localhost.$mydomain, $mydomain, ldap:/etc/postfix/ldapmydestination.cf'); - write_attribute($MainCf,'virtual_alias_maps', 'ldap:/etc/postfix/ldaplocal_recipient_maps.cf'); - write_attribute($MainCf,'virtual_alias_domains','ldap:/etc/postfix/ldapvirtual_alias_maps.cf'); - write_attribute($MainCf,'alias_maps','hash:/etc/aliases, ldap:/etc/postfix/ldapalias_maps_member.cf, ldap:/etc/postfix/ldapalias_maps.cf'); - check_ldap_configuration('alias_maps',$ldapMap); - check_ldap_configuration('alias_maps_member',$ldapMap); - check_ldap_configuration('virtual_alias_maps',$ldapMap); + write_ldap_maps($MainCf,$ldapMap); } if( $MailLocalDelivery->{'Type'} eq 'local') { @@ -1970,6 +2000,9 @@ SCR->Write('.etc.imapd_conf.quotawarn',$MailLocalDelivery->{'QuotaLimit'}); SCR->Write('.etc.imapd_conf.timeout',$MailLocalDelivery->{'ImapIdleTime'}); SCR->Write('.etc.imapd_conf.poptimeout',$MailLocalDelivery->{'PopIdleTime'}); + SCR->Write('.etc.imapd_conf.allowplaintext','yes'); + SCR->Write('.etc.imapd_conf.unixhierarchysep','yes'); + SCR->Write('.etc.imapd_conf.allowplainwithouttls','yes'); if($MailLocalDelivery->{'FallBackMailbox'} ne '' ) { SCR->Write('.etc.imapd_conf.lmtp_luser_relay',$MailLocalDelivery->{'FallBackMailbox'}); @@ -2054,6 +2087,24 @@ SCR->Execute('.mail.cyrusconf.toggleService', 'pop3s'); } } + Service->Enable('saslauthd'); + Service->Enable('cyrus'); + if( !Service->Status('saslauthd') ) + { + Service->Restart('saslauthd'); + } + else + { + Service->Start('saslauthd'); + } + if( !Service->Status('cyrus') ) + { + Service->Restart('cyrus'); + } + else + { + Service->Start('cyrus'); + } } elsif( $MailLocalDelivery->{'Type'} eq 'none') { @@ -2075,6 +2126,31 @@ return 1; } +BEGIN { $TYPEINFO{CreateRootMailbox} =["function", "any", "string"]; } +sub CreateRootMailbox { + my $self = shift; + my $AdminPassword = shift; + + #Create mailbox for root + my $imap = new Net::IMAP($imaphost, Debug => 0); + if( $imap ) + { + my $ret = $imap->login($imapadm, $AdminPassword); + if($$ret{Status} eq "ok") + { + $ret = $imap->select('usr/root'); + if( $ret->{Status} ne 'ok' ) + { + $ret = $imap->create('user/root'); + $ret = $imap->setacl('user/root', 'cyrus', "lrswipkxtea"); + $ret = $imap->setacl('user/root', 'root', "lrswipkxtea"); + $ret = $imap->setacl('user/root', 'anyone', "" ); + } + } + $imap->logout(); + } +} + BEGIN { $TYPEINFO{ReadFetchingMail} =["function", "any", "string"]; } sub ReadFetchingMail { my $self = shift; @@ -2323,43 +2399,38 @@ } else { - # This is a new domain, we create it. - # We create all the DNS attributes. `hostname -f` is the NS entry. - my $serial = POSIX::strftime("%Y%m%d%H%M",localtime); - my $host = `hostname -f`; chomp $host; - my $tmp = { 'Objectclass' => [ 'dNSZone','suseMailDomain' ], - 'zoneName' => $name, - 'suseMailDomainType' => $type, - 'suseMailDomainMasquerading' => $masquerading, + # This is a new domain, we create it. + # We create all the DNS attributes. `hostname -f` is the NS and MX entry. + my $serial = POSIX::strftime("%Y%m%d%H",localtime); + my $host = `hostname -f`; chomp $host; + my $tmp = { 'Objectclass' => [ 'dNSZone','suseMailDomain' ], + 'zoneName' => $name, + 'suseMailDomainType' => $type, + 'suseMailDomainMasquerading' => $masquerading, 'relativeDomainName' => '@', 'dNSClass' => 'IN', 'dNSTTL' => '86400', + 'nSRecord' => $host.'.', + 'mXRecord' => '40 '.$host.'.', 'sOARecord' => $host.'. root.'.$host.'. '.$serial.' 10800 3600 302400 43200' - }; - if(! SCR->Write('.ldap.add',{ "dn" => $DN } ,$tmp)){ - my $ldapERR = SCR->Read(".ldap.error"); - return $self->SetError(summary => "LDAP add failed", - code => "SCR_WRITE_FAILED", - description => $ldapERR->{'code'}." : ".$ldapERR->{'msg'}); - } + }; + if(! SCR->Write('.ldap.add',{ "dn" => $DN } ,$tmp)){ + my $ldapERR = SCR->Read(".ldap.error"); + return $self->SetError(summary => "LDAP add failed", + code => "SCR_WRITE_FAILED", + description => $ldapERR->{'code'}." : ".$ldapERR->{'msg'}); + } } } # First we read the main.cf my $MainCf = SCR->Read('.mail.postfix.main.table'); - write_attribute($MainCf,'masquerade_domains','ldap:/etc/postfix/ldapmasquerade_domains.cf'); write_attribute($MainCf,'masquerade_classes','envelope_sender, header_sender, header_recipient'); write_attribute($MainCf,'masquerade_exceptions','root'); - write_attribute($MainCf,'mydestination','$myhostname, localhost.$mydomain, $mydomain, ldap:/etc/postfix/ldapmydestination.cf'); - write_attribute($MainCf,'virtual_alias_maps', 'ldap:/etc/postfix/ldaplocal_recipient_maps.cf'); - write_attribute($MainCf,'virtual_alias_domains','ldap:/etc/postfix/ldapvirtual_alias_maps.cf'); + write_ldap_maps($MainCf,$ldapMap); SCR->Write('.mail.postfix.main.table',$MainCf); SCR->Write('.mail.postfix.main',undef); - check_ldap_configuration('masquerade_domains',$ldapMap); - check_ldap_configuration('mydestination',$ldapMap); - check_ldap_configuration('local_recipient_maps',$ldapMap); - check_ldap_configuration('virtual_alias_maps',$ldapMap); return 1; } @@ -2519,9 +2590,27 @@ code => "SCR_INIT_FAILED", description => $ldapERR->{'code'}." : ".$ldapERR->{'msg'}); } - if( ! SCR->Write('.ldap.add', - { "dn" => $uBase }, - $configOBJ->{$uBase} ) ) + if( ! SCR->Write('.ldap.add', { "dn" => $uBase }, $configOBJ->{$uBase} ) ) + { + my $ldapERR = SCR->Read(".ldap.error"); + return $self->SetError(summary => "LDAP add failed", + code => "SCR_INIT_FAILED", + description => $ldapERR->{'code'}." : ".$ldapERR->{'msg'}); + } + $uBase = "ou=Aliases,ou=Mailserver,".$ldapMap->{'ldap_domain'}; + $configOBJ->{$uBase}->{'objectClass'} = 'organizationalUnit'; + $configOBJ->{$uBase}->{'ou'} = 'Aliases'; + if( ! SCR->Write('.ldap.add', { "dn" => $uBase }, $configOBJ->{$uBase} ) ) + { + my $ldapERR = SCR->Read(".ldap.error"); + return $self->SetError(summary => "LDAP add failed", + code => "SCR_INIT_FAILED", + description => $ldapERR->{'code'}." : ".$ldapERR->{'msg'}); + } + $uBase = "ou=Canonical,ou=Mailserver,".$ldapMap->{'ldap_domain'}; + $configOBJ->{$uBase}->{'objectClass'} = 'organizationalUnit'; + $configOBJ->{$uBase}->{'ou'} = 'Canonical'; + if( ! SCR->Write('.ldap.add', { "dn" => $uBase }, $configOBJ->{$uBase} ) ) { my $ldapERR = SCR->Read(".ldap.error"); return $self->SetError(summary => "LDAP add failed", @@ -2845,30 +2934,10 @@ SCR->Execute('.mail.postfix.mastercf.deleteService', {'service' => 'tlsmgr','command' => 'tlsmgr'}); } } - #Setup the ldap tables; - # Transport - check_ldap_configuration('transport_maps',$ldapMap); - write_attribute($MainCf,'transport_maps','ldap:/etc/postfix/ldaptransport_maps.cf'); - # smtp_tls_per_site - check_ldap_configuration('smtp_tls_per_site',$ldapMap); - write_attribute($MainCf,'smtp_tls_per_site','ldap:/etc/postfix/ldapsmtp_tls_per_site.cf'); - # - write_attribute($MainCf,'masquerade_domains','ldap:/etc/postfix/ldapmasquerade_domains.cf'); write_attribute($MainCf,'masquerade_classes','envelope_sender, header_sender, header_recipient'); write_attribute($MainCf,'masquerade_exceptions','root'); - write_attribute($MainCf,'content_filter',''); - write_attribute($MainCf,'mydestination','$myhostname, localhost.$mydomain, $mydomain, ldap:/etc/postfix/ldapmydestination.cf'); - write_attribute($MainCf,'virtual_alias_maps', 'ldap:/etc/postfix/ldaplocal_recipient_maps.cf'); - write_attribute($MainCf,'virtual_alias_domains','ldap:/etc/postfix/ldapvirtual_alias_maps.cf'); - write_attribute($MainCf,'alias_maps','hash:/etc/aliases, ldap:/etc/postfix/ldapalias_maps.cf, ldap:/etc/postfix/ldapalias_maps_member.cf'); - check_ldap_configuration('transport_maps',$ldapMap); - check_ldap_configuration('smtp_tls_per_site',$ldapMap); - check_ldap_configuration('masquerade_domains',$ldapMap); - check_ldap_configuration('mydestination',$ldapMap); - check_ldap_configuration('local_recipient_maps',$ldapMap); - check_ldap_configuration('virtual_alias_maps',$ldapMap); - check_ldap_configuration('alias_maps',$ldapMap); - check_ldap_configuration('alias_maps_member',$ldapMap); + #Setup the ldap tables; + write_ldap_maps($MainCf,$ldapMap); SCR->Write('.mail.postfix.main.table',$MainCf); SCR->Write('.mail.postfix.main',undef); SCR->Write('.mail.postfix.mastercf',undef); @@ -2877,22 +2946,6 @@ return 1; } -# some helper funktions -sub read_attribute { - my $config = shift; - my $attribute = shift; - - foreach(@{$config}) - { - if($_->{"key"} eq $attribute) - { - return $_->{"value"}; - } - } - return ''; -} - - sub activate_virus_scanner { my $VSCount = shift || 5; use File::Copy; @@ -2908,16 +2961,28 @@ my @ACONF = <IN>; close(IN); - my $isclam = 0; - my $ismax = 0; + my $isclam = 0; + my $ismax = 0; + my $ismyhostname = 0; + my $myhostname = `hostname -f`; chomp $myhostname; + my $mydomain = `hostname -d`; chomp $mydomain; foreach my $l ( @ACONF ) { if ( $l =~ s/^\$max_servers = .*;/\$max_servers = $VSCount;/ ) { - #fix bnc#450888 : remove the supplementary entries next if $ismax; $ismax = 1; } + if ( $l =~ s/^\$myhostname = .*;/\$myhostname = '$myhostname';/ ) + { + next if $ismyhostname; + $ismyhostname = 1; + } + if ( $l =~ s/^\$mydomain = .*;/\$mydomain = '$mydomain';/ ) + { + push @CONF, $l; + next ; + } $l =~ s/(.*)/# $1/ if $l =~ /bypass_virus_checks_acl.*=.*qw\( \./; if( $isclam || $l =~ /Clam Antivirus-clamd/ ) { @@ -2931,14 +2996,20 @@ } push @CONF, $l; } + pop @CONF; if( !$ismax ) { - push @CONF, '$max_servers = '.$VSCount; + push @CONF, '$max_servers = '.$VSCount.";\n"; + } + if( !$ismyhostname ) + { + push @CONF, '$myhostname = '."'$myhostname';\n"; } if( ! open(OUT,">$aconf.new") ) { return "Error: $!"; } + push @CONF, '1;'; print OUT @CONF; close(OUT); @@ -2968,8 +3039,10 @@ move("$aconf.new",$aconf); move("$cconf.new",$cconf); Service->Enable('amavis'); + Service->Enable('freshclam'); Service->Enable('clamd'); Service->Start('amavis'); + Service->Start('freshclam'); Service->Start('clamd'); return ""; } @@ -3001,6 +3074,70 @@ return 1; } +sub read_attribute { + my $config = shift; + my $attribute = shift; + my $a = undef; + foreach(@{$config}) + { + if($_->{"key"} eq $attribute) + { + return $_->{"value"} if defined $_->{"value"}; + } + } + chomp( $a = `postconf -h $attribute` ); + return $a if( defined $a ); + return undef; +} + +# Internal helper Funktion to write the ldap maps +sub write_ldap_maps($$) +{ + my( $MainCf, $ldapMap ) = @_; + + my $alias_maps = read_attribute($MainCf,'alias_maps'); + if($alias_maps !~ /ldap:\/etc\/postfix\/ldapalias_maps_folder.cf/) + { + $alias_maps .= ', ldap:/etc/postfix/ldapalias_maps_folder.cf'; + } + if($alias_maps !~ /ldap:\/etc\/postfix\/ldapalias_maps.cf/) + { + $alias_maps .= ', ldap:/etc/postfix/ldapalias_maps.cf'; + } + write_attribute($MainCf,'alias_maps',$alias_maps); + my $masquerade_domains = read_attribute($MainCf,'masquerade_domains'); + if($masquerade_domains !~ /ldap:\/etc\/postfix\/ldapmasquerade_domains.cf/) + { + $masquerade_domains .= ', ldap:/etc/postfix/ldapmasquerade_domains.cf'; + } + write_attribute($MainCf,'masquerade_domains',$masquerade_domains); + my $mydestination = read_attribute($MainCf,'mydestination'); + if($mydestination !~ /ldap:\/etc\/postfix\/ldapmydestination.cf/ ) + { + $mydestination .= ', ldap:/etc/postfix/ldapmydestination.cf'; + } + write_attribute($MainCf,'mydestination',$mydestination); + write_attribute($MainCf,'smtpd_sender_restrictions','ldap:/etc/postfix/ldapaccess.cf'); + write_attribute($MainCf,'smtp_tls_per_site','ldap:/etc/postfix/ldapsmtp_tls_per_site.cf'); + write_attribute($MainCf,'transport_maps','ldap:/etc/postfix/ldaptransport_maps.cf'); + write_attribute($MainCf,'virtual_alias_maps', 'ldap:/etc/postfix/ldapuser_recipient_maps.cf, ldap:/etc/postfix/ldapvalias_maps_both.cf, ldap:/etc/postfix/ldapvalias_maps_member.cf, ldap:/etc/postfix/ldapvalias_maps_folder.cf, ldap:/etc/postfix/ldapvalias_maps_forward.cf'); + write_attribute($MainCf,'virtual_alias_domains','ldap:/etc/postfix/ldapvirtual_alias_domains.cf'); + check_ldap_configuration('access',$ldapMap); + check_ldap_configuration('alias_maps',$ldapMap); + check_ldap_configuration('alias_maps_folder',$ldapMap); + check_ldap_configuration('masquerade_domains',$ldapMap); + check_ldap_configuration('mydestination',$ldapMap); + check_ldap_configuration('smtp_tls_per_site',$ldapMap); + check_ldap_configuration('transport_maps',$ldapMap); + check_ldap_configuration('user_recipient_maps',$ldapMap); + check_ldap_configuration('valias_maps_both',$ldapMap); + check_ldap_configuration('valias_maps_member',$ldapMap); + check_ldap_configuration('valias_maps_folder',$ldapMap); + check_ldap_configuration('valias_maps_forward',$ldapMap); + check_ldap_configuration('virtual_alias_domains',$ldapMap); + +} + # Internal helper Funktion to check if a needed ldap table is correctly defined # in the main.cf. If not so the neccesary entries will be created. sub check_ldap_configuration { @@ -3009,71 +3146,97 @@ my $changes = 0; my %query_filter = ( - 'transport_maps' => '(&(objectClass=suseMailTransport)(suseMailTransportDestination=%s))', - 'smtp_tls_per_site' => '(&(objectClass=suseMailTransport)(suseMailTransportDestination=%s))', - 'access' => '(&(objectClass=suseMailAccess)(suseMailClient=%s))', - 'local_recipient_maps'=> '(&(objectClass=suseMailRecipient)(|(suseMailAcceptAddress=%s)(uid=%s)))', - 'alias_maps' => '(&(objectClass=suseMailRecipient)(cn=%s))', - 'alias_maps_member' => '(&(objectClass=suseMailRecipient)(cn=%s)(suseDeliveryToMember=yes))', - 'mynetworks' => '(&(objectClass=suseMailMyNetworks)(suseMailClient=%s))', - 'masquerade_domains' => '(&(objectClass=suseMailDomain)(zoneName=%s)(suseMailDomainMasquerading=yes))', - 'mydestination' => '(&(objectClass=suseMailDomain)(zoneName=%s)(relativeDomainName=@)(!(suseMailDomainType=virtual)))', - 'virtual_alias_maps' => '(&(objectClass=suseMailDomain)(zoneName=%s)(relativeDomainName=@)(suseMailDomainType=virtual))', - 'canonical_maps' => '(&(objectClass=suseCanonicalTable)(tableKey=%s)(valueType=both))', - 'recipient_canonical_maps' => '(&(objectClass=suseCanonicalTable)(tableKey=%s)(valueType=recipient))', - 'sender_canonical_maps' => '(&(objectClass=suseCanonicalTable)(tableKey=%s)(valueType=sender))' + 'access' => '(&(objectClass=suseMailAccess)(suseMailClient=%s))', + 'alias_maps' => '(&(objectClass=suseMailTable)(tableKey=%s))', + 'alias_maps_folder' => '(&(objectClass=suseMailRecipient)(cn=%s)(suseDeliveryToFolder=yes))', + 'masquerade_domains' => '(&(objectClass=suseMailDomain)(zoneName=%s)(suseMailDomainMasquerading=yes))', + 'mydestination' => '(&(objectClass=suseMailDomain)(zoneName=%s)(relativeDomainName=@)(!(suseMailDomainType=virtual)))', + 'mynetworks' => '(&(objectClass=suseMailMyNetworks)(suseMailClient=%s))', + 'smtp_tls_per_site' => '(&(objectClass=suseMailTransport)(suseMailTransportDestination=%s))', + 'transport_maps' => '(&(objectClass=suseMailTransport)(suseMailTransportDestination=%s))', + 'user_recipient_maps' => '(&(objectClass=suseMailRecipient)(suseMailAcceptAddress=%s))', + 'valias_maps_both' => '(&(objectClass=suseMailRecipient)(suseMailAcceptAddress=%s)(suseDeliveryToMember=yes)(suseDeliveryToFolder=yes))', + 'valias_maps_member' => '(&(objectClass=suseMailRecipient)(suseMailAcceptAddress=%s)(suseDeliveryToMember=yes)(!(suseDeliveryToFolder=yes)))', + 'valias_maps_folder' => '(&(objectClass=suseMailRecipient)(suseMailAcceptAddress=%s)(!(suseDeliveryToMember=yes))(suseDeliveryToFolder=yes))', + 'valias_maps_forward' => '(&(objectClass=suseMailRecipient)(suseMailAcceptAddress=%s)(!(suseDeliveryToMember=yes))(!(suseDeliveryToFolder=yes)))', + 'virtual_alias_domains' => '(&(objectClass=suseMailDomain)(zoneName=%s)(relativeDomainName=@)(suseMailDomainType=virtual))', + 'canonical_maps' => '(&(objectClass=suseCanonicalTable)(tableKey=%s)(valueType=both))', + 'recipient_canonical_maps'=> '(&(objectClass=suseCanonicalTable)(tableKey=%s)(valueType=recipient))', + 'sender_canonical_maps' => '(&(objectClass=suseCanonicalTable)(tableKey=%s)(valueType=sender))' ); my %result_attribute = ( - 'transport_maps' => 'suseMailTransportNexthop', - 'smtp_tls_per_site' => 'suseTLSPerSiteMode', - 'access' => 'suseMailAction', - 'local_recipient_maps'=> 'uid', - 'alias_maps' => 'suseMailCommand,suseMailForwardAddress', - 'alias_maps_member' => 'uid,suseMailForwardAddress', - 'mynetworks' => 'suseMailClient', - 'masquerade_domains' => 'zoneName', - 'mydestination' => 'zoneName', - 'virtual_alias_maps' => 'zoneName', - 'canonical_maps' => 'tableValue', - 'recipient_canonical_maps' => 'tableValue', - 'sender_canonical_maps' => 'tableValue' + 'access' => 'suseMailAction', + 'alias_maps' => 'tableValue', + 'alias_maps_folder' => 'suseMailCommand', + 'masquerade_domains' => 'zoneName', + 'mydestination' => 'zoneName', + 'mynetworks' => 'suseMailClient', + 'transport_maps' => 'suseMailTransportNexthop', + 'valias_maps_both' => 'suseMailForwardAddress,cn,uid', + 'valias_maps_member' => 'suseMailForwardAddress,uid', + 'valias_maps_folder' => 'suseMailForwardAddress,cn', + 'valias_maps_forward' => 'suseMailForwardAddress', + 'virtual_alias_domains' => 'zoneName', + 'canonical_maps' => 'tableValue', + 'recipient_canonical_maps'=> 'tableValue', + 'smtp_tls_per_site' => 'suseMailTransportNexthop', + 'sender_canonical_maps' => 'tableValue', + 'user_recipient_maps' => 'uid,suseMailForwardAddress' ); my %scope = ( - 'transport_maps' => 'one', - 'smtp_tls_per_site' => 'one', - 'access' => 'one', - 'local_recipient_maps'=> 'one', - 'alias_maps' => 'one', - 'alias_maps_member' => 'one', - 'mynetworks' => 'one', - 'masquerade_domains' => 'sub', - 'mydestination' => 'sub', - 'virtual_alias_maps' => 'sub', - 'canonical_maps' => 'one', - 'recipient_canonical_maps' => 'one', - 'sender_canonical_maps' => 'one' + 'access' => 'one', + 'alias_maps' => 'one', + 'alias_maps_folder' => 'one', + 'masquerade_domains' => 'sub', + 'mydestination' => 'sub', + 'mynetworks' => 'one', + 'transport_maps' => 'one', + 'smtp_tls_per_site' => 'one', + 'valias_maps_both' => 'one', + 'valias_maps_member' => 'one', + 'valias_maps_folder' => 'one', + 'valias_maps_forward' => 'one', + 'virtual_alias_domains' => 'sub', + 'canonical_maps' => 'one', + 'recipient_canonical_maps'=> 'one', + 'sender_canonical_maps' => 'one', + 'user_recipient_maps' => 'one' ); my %base = ( - 'transport_maps' => $ldapMap->{'mail_config_dn'}, - 'smtp_tls_per_site' => $ldapMap->{'mail_config_dn'}, - 'access' => $ldapMap->{'mail_config_dn'}, - 'local_recipient_maps'=> $ldapMap->{'user_config_dn'}, - 'alias_maps' => $ldapMap->{'group_config_dn'}, - 'alias_maps_member' => $ldapMap->{'group_config_dn'}, - 'mynetworks' => $ldapMap->{'mail_config_dn'}, - 'masquerade_domains' => $ldapMap->{'dns_config_dn'}, - 'mydestination' => $ldapMap->{'dns_config_dn'}, - 'virtual_alias_maps' => $ldapMap->{'dns_config_dn'}, - 'canonical_maps' => $ldapMap->{'mail_config_dn'}, - 'recipient_canonical_maps' => $ldapMap->{'mail_config_dn'}, - 'sender_canonical_maps' => $ldapMap->{'mail_config_dn'} + 'access' => $ldapMap->{'mail_config_dn'}, + 'alias_maps' => 'ou=Aliases,'.$ldapMap->{'mail_config_dn'}, + 'alias_maps_folder' => $ldapMap->{'group_config_dn'}, + 'masquerade_domains' => $ldapMap->{'dns_config_dn'}, + 'mydestination' => $ldapMap->{'dns_config_dn'}, + 'mynetworks' => $ldapMap->{'mail_config_dn'}, + 'smtp_tls_per_site' => $ldapMap->{'mail_config_dn'}, + 'transport_maps' => $ldapMap->{'mail_config_dn'}, + 'valias_maps_both' => $ldapMap->{'group_config_dn'}, + 'valias_maps_member' => $ldapMap->{'group_config_dn'}, + 'valias_maps_folder' => $ldapMap->{'group_config_dn'}, + 'valias_maps_forward' => $ldapMap->{'group_config_dn'}, + 'virtual_alias_domains' => $ldapMap->{'dns_config_dn'}, + 'canonical_maps' => 'ou=Canonical,'.$ldapMap->{'mail_config_dn'}, + 'recipient_canonical_maps'=> 'ou=Canonical,'.$ldapMap->{'mail_config_dn'}, + 'sender_canonical_maps' => 'ou=Canonical,'.$ldapMap->{'mail_config_dn'}, + 'user_recipient_maps' => $ldapMap->{'user_config_dn'} ); my %special_result_attribute = ( - 'alias_maps_member' => 'member', + 'valias_maps_both' => 'member', + 'valias_maps_member' => 'member' ); + my %terminal_result_attribute = ( + 'valias_maps_both' => 'uid', + 'valias_maps_member' => 'uid' + ); +if( ! defined $result_attribute{$config} ) +{ + print STDERR "BAJAVAN $config"; + return; +} #First we read the whool main.cf configuration my $LDAPCF = SCR->Read('.mail.ldaptable',$config); @@ -3125,6 +3288,10 @@ { $LDAPCF->{'special_result_attribute'} = $special_result_attribute{$config}; } + if(defined $terminal_result_attribute{$config}) + { + $LDAPCF->{'terminal_result_attribute'} = $terminal_result_attribute{$config}; + } $LDAPCF->{'scope'} = $scope{$config}; SCR->Write('.mail.ldaptable',[$config,$LDAPCF]); Modified: branches/SuSE-Code-11-SP1-Branch/mail/src/mail-server_complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/mail/… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/mail/src/mail-server_complex.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/mail/src/mail-server_complex.ycp Wed Jan 27 15:40:56 2010 @@ -127,6 +127,8 @@ */ symbol WriteDialog() { + Wizard::CreateDialog (); + Wizard::SetDesktopIcon("mail"); Wizard::RestoreHelp(HELPS["write"]:""); boolean ret = MailServer::Write(); return ret ? `next : `abort; Modified: branches/SuSE-Code-11-SP1-Branch/mail/src/mail-server_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/mail/… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/mail/src/mail-server_dialogs.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/mail/src/mail-server_dialogs.ycp Wed Jan 27 15:40:56 2010 @@ -658,7 +658,7 @@ term MailPreventionDialog(string CID, string CIDRBL) { - y2milestone("--Start MailTransportsDialog ---"); + y2milestone("--Start MailPreventionDialog ---"); list<term> AccessItems= []; list<term> RBLItems = []; string BasicProtection = (string)MailServer::MailPrevention["BasicProtection"]:""; @@ -666,13 +666,12 @@ list<map<string,string> > AccessList = (list<map<string,string> >) MailServer::MailPrevention["AccessList"]:[]; boolean VirusScanning = (boolean)MailServer::MailPrevention["VirusScanning"]:false; boolean SpamLearning = (boolean)MailServer::MailPrevention["SpamLearning"]:false; - integer VSCount = (integer)MailServer::MailPrevention["VSCount"]:10; + integer VSCount = (integer)MailServer::MailPrevention["VSCount"]:5; boolean BasicProtectionOff = false; boolean BasicProtectionMedium = false; boolean BasicProtectionHard = true; -y2milestone("---- MailPrevention %1",MailServer::MailPrevention); -y2milestone("---- VSCount %1",VSCount); + y2milestone("---- VSCount %1",VSCount); if(BasicProtection == "off"){ BasicProtectionOff = true; @@ -701,9 +700,9 @@ SpamL = `Left(`CheckBox (`id(`SpamLearning), `opt(`notify), _("Configure Spam Learning Extension"), SpamLearning)); } term content = `VBox ( - `Left(`CheckBox (`id(`VirusScanning), `opt(`notify), _("Start Virus Scanner AMAVIS"), VirusScanning)), + `Left(`CheckBox (`id(`VirusScanning), `opt(`notify), _("Start Virus Scanner AMAVIS"), VirusScanning)), `VSpacing (1), - `Left(`IntField (`id(`VSCount), `opt(`notify), _("Count of Virsus Scanner Process"), 1,50,VSCount)), + `Left(`IntField (`id(`VSCount), `opt(`notify), _("Count of Virsus Scanner Process"), 1,50,VSCount)), `VSpacing (1), SpamL, `VSpacing (1), @@ -1349,6 +1348,10 @@ ret = event["ID"]:nil; EventType = event["EventType"]:nil; +y2milestone("event %1",event); +y2milestone("event %1",ret); +y2milestone("FocusedContent %1",FocusedContent); + if(ret == `cancel || ret == `abort ) { if(ReallyAbort()) break; else continue; @@ -1427,7 +1430,7 @@ if( ret == `SpamLearning ) { MailServer::MailPrevention["Changed"] = true; UI::ChangeWidget(`id(`VirusScanning), `Value, true); - UI::ChangeWidget(`id(`VSCount), `Value, 10); + UI::ChangeWidget(`id(`VSCount), `Value, MailServer::MailPrevention["VSCount"]:"5"); continue; } if(ret == `RBLAdd) { @@ -1655,9 +1658,6 @@ focus_changed = true; FocusedContent ="MailLocalDomains"; } -y2milestone("event %1",event); -y2milestone("event %1",ret); -y2milestone("FocusedContent %1",FocusedContent); if(ret != `cancel && ret != `abort && ret != `next ) { Wizard::SetContents(title, content ,helptext, false, true); Wizard::SetDesktopIcon("mail"); Modified: branches/SuSE-Code-11-SP1-Branch/mail/src/mail-server_helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/mail/… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/mail/src/mail-server_helps.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/mail/src/mail-server_helps.ycp Wed Jan 27 15:40:56 2010 @@ -18,7 +18,7 @@ /* AuthorizingDialog dialog help 1/2 */ "AuthorizingDialog" : _("<big>Administrator Authorization</big> -To use the YaST2 mail server component, your system must use LDAP +To use the YaST mail server component, your system must use LDAP as a repository for the user and group accounts and for the DNS services. Some of the mail server settings will be stored in the LDAP repository, too. "), @@ -145,7 +145,7 @@ ") + /* MailLocalDomains dialog help 2/3 */ -_("Note: You can create and set up the domains with the YaST2 +_("Note: You can create and set up the domains with the YaST DNS server module. In this module, you only can set the properties concerning the mail server. @@ -155,7 +155,7 @@ You can define virtual and local domains. In virtual domains, only users assigned a mail address in the domain can receive mail. In local domains, all user can get mails. Assign virtual mail -addresses in the YaST2 user module. +addresses in the YaST user module. "), Modified: branches/SuSE-Code-11-SP1-Branch/mail/src/suse-mailserver.schema URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/mail/… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/mail/src/suse-mailserver.schema (original) +++ branches/SuSE-Code-11-SP1-Branch/mail/src/suse-mailserver.schema Wed Jan 27 15:40:56 2010 @@ -140,6 +140,12 @@ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{16} SINGLE-VALUE ) +attributetype ( MailAT:22 NAME ( 'suseDeliveryToFolder' 'deliveryToFolder' ) + DESC 'Shows if the member of the group the mails will get' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{16} ) + ## ## Objectclass Section ## @@ -147,7 +153,7 @@ DESC 'represents an entry which is able to receive mail' MAY ( suseMailAcceptAddress $ suseMailAlias $ suseVirtualAddress $ suseMailCommand $ - suseMailForwardAddress $ suseDeliveryToMember $ suseImapQuota) ) + suseMailForwardAddress $ suseDeliveryToMember $ suseImapQuota $ suseDeliveryToFolder ) ) objectclass ( MailOC:2 NAME ( 'suseMailDomain' 'mailDomain' ) SUP top AUXILIARY DESC 'To configure behaviour of mail domains' @@ -172,8 +178,8 @@ DESC 'To build TLS per side maps' MUST ( suseTLSPerSiteMode $ suseTLSPerSitePeer ) ) -objectclass ( MailOC:7 NAME ( 'suseCanonicalTable' 'CanonicalTable' ) SUP top STRUCTURAL - DESC 'To build canonical maps' +objectclass ( MailOC:7 NAME ( 'suseMailTable' 'MailTable' ) SUP top STRUCTURAL + DESC 'To build Mail Tables' MUST ( tableKey $ tableValue ) MAY ( valueType $ description ) ) Modified: branches/SuSE-Code-11-SP1-Branch/mail/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/mail/… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/mail/src/ui.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/mail/src/ui.ycp Wed Jan 27 15:40:56 2010 @@ -91,7 +91,7 @@ // bb) read English // TODO: look at exim and mention it in the popup // Translators: error popup - Popup::Error (_("YaST2 can only configure Postfix and Sendmail, + Popup::Error (_("YaST can only configure Postfix and Sendmail, but neither of them is installed.")); } } @@ -342,6 +342,10 @@ define symbol OutgoingDialog () ``{ Wizard::SetScreenShotName ("mail-21-outgoing"); + boolean TLSnone = ( Mail::smtp_use_TLS == "no" ); + boolean TLSuse = ( Mail::smtp_use_TLS == "yes" ); + boolean TLSmust = ( Mail::smtp_use_TLS == "must" ); + // what buttons can be used to leave this dialog //(except the std wizarding ones) list<symbol> buttons = []; @@ -357,7 +361,13 @@ `VBox ( WJ_MakeWidget (`outgoing_mail_server), // TLS - `CheckBox( `id(`tls), _("The server use &TLS"), Mail::smtp_use_TLS ), + `RadioButtonGroup(`id(`TLS), _("The server use &TLS") + `HBox( + `Left(`RadioButton(`id("no"), _("No"), TLSnone)), + `Left(`RadioButton(`id("yes"), _("Use"), TLSuse)), + `Left(`RadioButton(`id("must"), _("Enforce"),TLSmust)) + ) + ), // Translators: button // TODO ... `PushButton (`id(`outgoing_details), _("&Masquerading")), @@ -479,6 +489,9 @@ `HSpacing (1), // pushbutton `Bottom (`PushButton (`id (`downloading), `opt (`key_F7), _("&Details..."))) + ), + `HBox ( + `Left(`ComboBox (`id (`fm_start),_("Start &fetchmail"),["manual","daemon"])) ) ); // frame label: mail downloading (fetchmail) @@ -533,6 +546,7 @@ WJ_GetWidget (`delivery_mode); // initialize the widget (set the current value) CWMFirewallInterfaces::OpenFirewallInit (fw_cwm_widget, ""); + UI::ChangeWidget(`id(`fm_start),`Value, Mail::fetchmail_mode); // nothing entered in the dowloading items - don't save them boolean fm_empty = true; @@ -557,9 +571,9 @@ } else if (ret == `next || contains (buttons, ret)) { + Mail::fetchmail_mode = (string) UI::QueryWidget(`id (`fm_start), `Value); // input validation // For consistency, all querywidgets are done here - if (WJ_Validate (widgets)) { fm_empty = Modified: branches/SuSE-Code-11-SP1-Branch/mail/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/mail/… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/mail/src/widgets.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/mail/src/widgets.ycp Wed Jan 27 15:40:56 2010 @@ -796,7 +796,7 @@ "label": _("&Delivery Mode"), "choices": Choices_delivery_mode, // help text - "help": _("The delivery mode is usually procmail, unless you do not forward root's mail or want to access the mail via IMAP."), + "help": _("The delivery mode is usually Directly, unless you do not forward root's mail or want to access the mail via IMAP."), "get": Get_delivery_mode, "set": Set_delivery_mode, "validate": Validate_delivery_mode, Modified: branches/SuSE-Code-11-SP1-Branch/mail/users-plugin/users_plugin_mail_groups.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/mail/… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/mail/users-plugin/users_plugin_mail_groups.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/mail/users-plugin/users_plugin_mail_groups.ycp Wed Jan 27 15:40:56 2010 @@ -145,17 +145,17 @@ list<term> result = []; integer i = 0; - if( is(data["suseMailForwardAaddress"]:(any)"", string) - && size (data["suseMailForwardAaddress"]:"") > 0 ) + if( is(data["suseMailForwardAddress"]:(any)"", string) + && size (data["suseMailForwardAddress"]:"") > 0 ) { result = [`item (`id (i), - data["suseMailForwardAaddress"]:"")]; + data["suseMailForwardAddress"]:"")]; // transforming to list - data["suseMailForwardAaddress"] = [data["suseMailForwardAaddress"]:""]; + data["suseMailForwardAddress"] = [data["suseMailForwardAddress"]:""]; } - else if ( is(data["suseMailForwardAaddress"]:(any)[], list) ) + else if ( is(data["suseMailForwardAddress"]:(any)[], list) ) { - foreach (string element, data["suseMailForwardAaddress"]:[], ``{ + foreach (string element, data["suseMailForwardAddress"]:[], ``{ result = add (result, `item (`id (i), element)); i = i + 1; }); @@ -169,12 +169,11 @@ string what = config["what"]:"user"; string action = data["what"]:""; - if( data["suseMailCommand"]:"" != "" ) { - sharedfolder = true; - } if( data["suseDeliveryToMember"]:"no" == "yes" ) { deliverytomember = true; - sharedfolder = false; + } + if( data["suseDeliveryToFolder"]:"no" == "yes" ) { + sharedfolder = true; } map<string, any> tmp_data = $[]; @@ -334,13 +333,13 @@ { if (check_mail_address (emailName)) { - if (contains (data["suseMailForwardAaddress"]:[], emailName)) + if (contains (data["suseMailForwardAddress"]:[], emailName)) { Popup::Error(_("Entry already exists.")); } else { - data["suseMailForwardAaddress"] = add (data["suseMailForwardAaddress"]:[], + data["suseMailForwardAddress"] = add (data["suseMailForwardAddress"]:[], emailName); UI::ChangeWidget(`id(`table), `Items, getEMAILList ()); UI::ChangeWidget(`id(`id_emailname), `Value, ""); @@ -355,24 +354,24 @@ if (ret == `deleteEmail) { integer id = (integer) UI::QueryWidget (`id (`table), `CurrentItem); - data["suseMailForwardAaddress"] = remove (data["suseMailForwardAaddress"]:[], + data["suseMailForwardAddress"] = remove (data["suseMailForwardAddress"]:[], id); UI::ChangeWidget(`id(`table), `Items, getEMAILList ()); } if (ret == `editEmail) { integer id = (integer) UI::QueryWidget (`id (`table), `CurrentItem); - string oldEMAIL = (string)((list) data["suseMailForwardAaddress"]:[])[id]:""; + string oldEMAIL = (string)((list) data["suseMailForwardAddress"]:[])[id]:""; string newEMAIL = editEMAIL (oldEMAIL); - if (contains (data["suseMailForwardAaddress"]:[], newEMAIL)) + if (contains (data["suseMailForwardAddress"]:[], newEMAIL)) { Popup::Error(_("Entry already exists.")); } else { - data["suseMailForwardAaddress"] = remove (data["suseMailForwardAaddress"]:[], id); - data["suseMailForwardAaddress"] = add (data["suseMailForwardAaddress"]:[], newEMAIL); + data["suseMailForwardAddress"] = remove (data["suseMailForwardAddress"]:[], id); + data["suseMailForwardAddress"] = add (data["suseMailForwardAddress"]:[], newEMAIL); } UI::ChangeWidget(`id(`table), `Items, getEMAILList ()); } @@ -385,13 +384,12 @@ } // We put it everytime into the LDAP, and the ldap filter control if it is visible data["suseMailCommand"] = "\"|/usr/bin/formail -I \\\"From \\\" |/usr/lib/cyrus/bin/deliver -r "+data["cn"]:""+" -a cyrus -m "+data["cn"]:""+"\""; -// if( (boolean) UI::QueryWidget (`id (`sharedfolder), `Value)) { -// data["suseMailCommand"] = "\"|/usr/bin/formail -I \\\"From \\\" |/usr/lib/cyrus/bin/deliver -r "+data["cn"]:""+" -a cyrus -m "+data["cn"]:""+"\""; -// } else { -// if( data["suseMailCommand"]:"" != "" ) { -// data = remove (data, "suseMailCommand"); -// } -// } + if( (boolean) UI::QueryWidget (`id (`sharedfolder), `Value)) { + data["suseDeliveryToFolder"] = "yes"; + } else { + data["suseDeliveryToFolder"] = "no"; + } + string err = UsersPluginMail::Check ( config, (map<string,any>) union (data, tmp_data)); if (err != "") @@ -407,10 +405,10 @@ data["plugins"] = add (data["plugins"]:[], "UsersPluginMail"); } - if( size(data["suseMailForwardAaddress"]:[]) == 1 ) { - data["suseMailForwardAaddress"] = ((list)data["suseMailForwardAaddress"]:[])[0]:""; - } else if( size(data["suseMailForwardAaddress"]:[]) == 0 ) { - remove(data,"suseMailForwardAaddress"); + if( size(data["suseMailForwardAddress"]:[]) == 1 ) { + data["suseMailForwardAddress"] = ((list)data["suseMailForwardAddress"]:[])[0]:""; + } else if( size(data["suseMailForwardAddress"]:[]) == 0 ) { + remove(data,"suseMailForwardAddress"); } if(data["localdeliverytype"]:"local" == "cyrus" ) { Modified: branches/SuSE-Code-11-SP1-Branch/mail/yast2-mail.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/mail/… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/mail/yast2-mail.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/mail/yast2-mail.spec.in Wed Jan 27 15:40:56 2010 @@ -1,6 +1,8 @@ @HEADER-COMMENT@ @HEADER@ +Group: System/YaST +License: GPL v2 or later BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite BuildRequires: yast2-perl-bindings yast2-ldap-server yast2-users yast2-network BuildRequires: perl-NetxAP @@ -12,7 +14,6 @@ Requires: yast2-users Requires: yast2-ldap Requires: perl-NetxAP - Provides: yast2-config-network:/usr/lib/YaST2/clients/lan_sendmail.ycp Provides: yast2-config-sendmail yast2-config-sendmail-devel Obsoletes: yast2-config-sendmail yast2-config-sendmail-devel @@ -24,23 +25,22 @@ Obsoletes: yast2-trans-mail <= %{version} Provides: yast2-mail-server = %{version} Obsoletes: yast2-mail-server <= %{version} - Conflicts: aaa_base < 10.3 - -BuildArchitectures: noarch - -Summary: Configuration of mail +BuildArch: noarch +Summary: YaST2 - Mail Configuration %description -- +The YaST2 component for mail configuration. It handles Postfix, Cyrus, +Amavis and Fetchmail. %package plugins -Summary: Plugins for the YaST2 users modul for enterprise mail server configuration. +Summary: YaST2 - Users/Group Plugins for the mail delivery configuration Group: System/YaST Requires: perl-NetxAP %description plugins -- +Plugins for the YaST2 users modul for enterprise mail server +configuration. @PREP@ -- 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] r60557 - /branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc
by aschnell＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: aschnell Date: Wed Jan 27 15:35:19 2010 New Revision: 60557 URL: http://svn.opensuse.org/viewcvs/yast?rev=60557&view=rev Log: - and avoid IMSM popup Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc Wed Jan 27 15:35:19 2010 @@ -516,6 +516,8 @@ y2mil(" md raids:" + mdDevs); if( !mdDevs.empty()) { + if (getImsmDriver() == IMSM_UNDECIDED) + { string txt = sformat( // popup text %1$s is replaced by disk name e.g. /dev/hda _("You are running on the Intel(R) Matrix Storage Manager compatible platform.\n" @@ -538,7 +540,12 @@ ret = false; setImsmDriver(IMSM_DMRAID); } - } + } + else + { + ret = getImsmDriver() == IMSM_MDADM; + } + } else { /* No mdDevs */ -- 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] r60556 - in /trunk/network/src: installation/inst_hostname.ycp lan/complex.ycp lan/help.ycp modules/DNS.ycp modules/Lan.ycp services/dns.ycp
by kmachalkova＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: kmachalkova Date: Wed Jan 27 15:21:30 2010 New Revision: 60556 URL: http://svn.opensuse.org/viewcvs/yast?rev=60556&view=rev Log: Fixes of bnc#439235, bnc#510228 & co. (from SLE11 SP1) Modified: trunk/network/src/installation/inst_hostname.ycp trunk/network/src/lan/complex.ycp trunk/network/src/lan/help.ycp trunk/network/src/modules/DNS.ycp trunk/network/src/modules/Lan.ycp trunk/network/src/services/dns.ycp Modified: trunk/network/src/installation/inst_hostname.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/installation/inst_ho… ============================================================================== --- trunk/network/src/installation/inst_hostname.ycp (original) +++ trunk/network/src/installation/inst_hostname.ycp Wed Jan 27 15:21:30 2010 @@ -59,7 +59,10 @@ { // do not let Lan override us, #152218 DNS::proposal_valid = true; - DNS::Write (); // handles NetworkConfig too + + // delay writing, write along with the rest of network configuration + // in lan_proposal + // DNS::Write (); } return ret; Modified: trunk/network/src/lan/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/complex.ycp?rev=… ============================================================================== --- trunk/network/src/lan/complex.ycp (original) +++ trunk/network/src/lan/complex.ycp Wed Jan 27 15:21:30 2010 @@ -38,16 +38,6 @@ /** - * Return a modification status - * @return true if data was modified - */ -define boolean Modified() ``{ - boolean ret = LanItems::Modified() || DNS::modified || Routing::Modified() || - NetworkConfig::Modified(); - return ret; -} - -/** * Commit changes to internal structures * @return always `next */ @@ -60,9 +50,9 @@ * Display finished popup * @return dialog result */ -define symbol FinishDialog() ``{ +/*define symbol FinishDialog() ``{ return FinishPopup(Modified(), "lan", "", "mail", ["permanent"]); -} +}*/ /** * Read settings dialog @@ -101,7 +91,7 @@ define symbol WriteDialog() ``{ ScreenName("lan-write"); - if(!Modified()) return `next; + if(!Lan::Modified()) return `next; LanItems::SetModified(); Wizard::RestoreHelp(help["write"]:""); Modified: trunk/network/src/lan/help.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/help.ycp?rev=605… ============================================================================== --- trunk/network/src/lan/help.ycp (original) +++ trunk/network/src/lan/help.ycp Wed Jan 27 15:21:30 2010 @@ -94,12 +94,11 @@ different hostnames. "), "write_hostname": -_("Your hostname will be written to <tt>/etc/hosts</tt> and will be -resolvable as <tt>127.0.0.2</tt> IP address. To disable this modification, -uncheck Write Hostname to /etc/hosts box. In that case your -hostname will not be resolvable without an active network. - -"), +_("Assign Hostname to Loopback IP associates your hostname with +<tt>127.0.0.2</tt> (loopback) IP address in <tt>/etc/hosts</tt>. This is an +useful option if you want to have the hostname resolvable at all times, even +without active network. In all other cases, use it carefully, especially +if this computer provides some network services."), "searchlist_s": _("Enter the name servers and domain search list for resolving Modified: trunk/network/src/modules/DNS.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/DNS.ycp?rev=… ============================================================================== --- trunk/network/src/modules/DNS.ycp (original) +++ trunk/network/src/modules/DNS.ycp Wed Jan 27 15:21:30 2010 @@ -70,7 +70,7 @@ if (ns == "" || ns == nil) return false; nameservers = [ ns ]; - modified = true; + //modified = true; return true; } @@ -85,7 +85,7 @@ return false; hostname = hn; domain = dn; - modified = true; + //modified = true; return true; } Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=… ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Wed Jan 27 15:21:30 2010 @@ -89,7 +89,17 @@ /*------------------*/ /* GLOBAL FUNCTIONS */ +/*------------------*/ +/** + * Return a modification status + * @return true if data was modified + */ +global boolean Modified() { + boolean ret = LanItems::Modified() || DNS::modified || Routing::Modified() || + NetworkConfig::Modified(); + return ret; +} // function for use from autoinstallation (Fate #301032) global define boolean isAnyInterfaceDown(){ @@ -344,8 +354,10 @@ y2milestone("Writing configuration"); - /* Stop the detection */ - if(!LanItems::modified) { + // Query modified flag in all components, not just LanItems - DNS, + // Routing, NetworkConfig too in order not to discard changes made + // outside LanItems (bnc#439235) + if(!Modified()) { y2milestone("No changes to network setup -> nothing to write"); return true; } @@ -396,7 +408,8 @@ if(Abort()) return false; /* Progress step 3 - multiple devices may be present, really plural*/ ProgressNextStage(_("Writing device configuration...")); - if (!Mode::autoinst()) LanItems::WriteUdevDriverRules(); + if (!Mode::autoinst()) + LanItems::WriteUdevDriverRules(); NetworkInterfaces::Write("netcard"); // WriteDevices(); sleep(sl); Modified: trunk/network/src/services/dns.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/services/dns.ycp?rev… ============================================================================== --- trunk/network/src/services/dns.ycp (original) +++ trunk/network/src/services/dns.ycp Wed Jan 27 15:21:30 2010 @@ -47,6 +47,11 @@ boolean resolver_modifiable = false; /** + * original setup, used to determine whether data have been modified + */ +map settings_orig = $[]; + +/** * CWM buffer for both dialogs. Note that NAMESERVERS and SEARCHLIST * are lists and their widgets are suffixed. */ @@ -87,6 +92,8 @@ settings["NAMESERVER_2"] = DNS::nameservers[1]:""; settings["NAMESERVER_3"] = DNS::nameservers[2]:""; + settings_orig = settings; + return settings; } @@ -94,6 +101,7 @@ * @param settings map of settings to be stored to DNS:: */ define void StoreSettings (map settings) { + list<string> nameservers = [ settings["NAMESERVER_1"]:"", settings["NAMESERVER_2"]:"", @@ -110,8 +118,8 @@ DNS::write_hostname = settings["WRITE_HOSTNAME"]:true; /* update modified flag */ - DNS::modified = true; - y2milestone("modified DNS"); + DNS::modified = DNS::modified || (settings != settings_orig); + y2milestone("Modified DNS: %1", DNS::modified ); } /** @@ -332,6 +340,7 @@ has_dhcp = Lan::AnyDHCPDevice (); hn_settings = InitSettings (); + foreach(string key, (list<string>)Map::Keys(hn_settings),{ InitHnWidget(key); }); @@ -401,7 +410,7 @@ "WRITE_HOSTNAME": $[ "widget": `checkbox, /* checkbox label */ - "label": _("&Write Hostname to /etc/hosts"), + "label": _("&Assign Hostname to Loopback IP"), "opt": [], // help "help": help["write_hostname"]:"", -- 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] r60555 - in /branches/SuSE-Code-11-SP1-Branch/storage: libstorage/src/ package/ storage/src/modules/
by aschnell＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: aschnell Date: Wed Jan 27 15:12:50 2010 New Revision: 60555 URL: http://svn.opensuse.org/viewcvs/yast?rev=60555&view=rev Log: - allow to set driver for IMSM without callback (bnc #574270) Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.h branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.h branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/StorageInterface.h branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc Wed Jan 27 15:12:50 2010 @@ -2319,8 +2319,6 @@ bool MdPartCo::active = false; -bool MdPartCo::handlingMd = false; - void MdPartCo::logData( const string& Dir ) {} Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.h (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.h Wed Jan 27 15:12:50 2010 @@ -58,7 +58,6 @@ virtual ~MdPartCo(); - unsigned long long sizeK() const { return size_k; } const string& labelName() const { return disk->labelName(); } const string& udevPath() const { return udev_path; } @@ -171,10 +170,6 @@ /* Return true if there is no Filesystem on device (it can contain partition table). */ static bool hasFileSystem(const string& name); - - static void setHandlingDev(bool val) { handlingMd = val; } - static bool isHandlingDev() { return handlingMd; } - static bool isImsmPlatform(); static bool matchRegex( const string& dev ); @@ -390,7 +385,7 @@ mutable storage::MdPartCoInfo info; static bool active; - static bool handlingMd; + }; } Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc Wed Jan 27 15:12:50 2010 @@ -135,6 +135,8 @@ fstab = NULL; raidtab = NULL; + imsm_driver = IMSM_UNDECIDED; + logSystemInfo(); } @@ -244,7 +246,7 @@ DmraidCo::activate( true ); waitForDevice(); //If user said No then this is the way it was before. - if( MdPartCo::isHandlingDev() == false ) + if (getImsmDriver() != IMSM_MDADM) { MdPartCo::activate(true, tmpDir() ); waitForDevice(); @@ -529,11 +531,12 @@ if( yesnoPopupCb(txt) ) { ret = true; - MdPartCo::setHandlingDev(true); + setImsmDriver(IMSM_MDADM); } else { ret = false; + setImsmDriver(IMSM_DMRAID); } } else @@ -6547,7 +6550,7 @@ y2mil("val:" << val); if (val) { - if( MdPartCo::isHandlingDev() == true) + if (getImsmDriver() == IMSM_MDADM) { MdPartCo::activate(val, tmpDir()); Dm::activate(val); Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.h (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.h Wed Jan 27 15:12:50 2010 @@ -476,11 +476,13 @@ int computeMdSize(MdType md_type, list<string> devices, unsigned long long& sizeK); + void setImsmDriver(ImsmDriver val) { imsm_driver = val; } + ImsmDriver getImsmDriver() const { return imsm_driver; } + int getMdPartCoInfo( const string& name, MdPartCoInfo& info); int getContMdPartCoInfo( const string& name, ContainerInfo& cinfo, MdPartCoInfo& info); int getMdPartCoStateInfo(const string& name, MdPartCoStateInfo& info); - bool useMdForImsm() { return MdPartCo::isHandlingDev(); } int removeMdPartCo(const string& devName, bool destroySb); int addNfsDevice( const string& nfsDev, const string& opts, @@ -1929,6 +1931,8 @@ EtcFstab *fstab; EtcRaidtab *raidtab; + ImsmDriver imsm_driver; + CallbackProgressBar progress_bar_cb; CallbackShowInstallInfo install_info_cb; CallbackInfoPopup info_popup_cb; Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/StorageInterface.h (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/StorageInterface.h Wed Jan 27 15:12:50 2010 @@ -143,6 +143,9 @@ enum CType { CUNKNOWN, DISK, MD, LOOP, LVM, DM, DMRAID, NFSC, DMMULTIPATH, MDPART, COTYPE_LAST_ENTRY }; + enum ImsmDriver { IMSM_UNDECIDED, IMSM_DMRAID, IMSM_MDADM }; + + /** * typedef for a pointer to a function that is called on progress bar events */ @@ -884,21 +887,19 @@ virtual int getContMdPartCoInfo( const string& name, ContainerInfo& cinfo, MdPartCoInfo& info) = 0; + /** + * Set which driver should be used for IMSM Software RAIDs. + * + * @param driver driver to use for IMSM Software RAIDs. + */ + virtual void setImsmDriver(ImsmDriver driver) = 0; + /** - * Checks if Md and MdPart are used for IMSM/ISW SW RAIDs. - * - * In 'normal mode' it will become true after first MdPart class is - * created and it will true until such class exist. - * In 'install mode' it will be true: - * a) if clean or partitioned IMSM RAIDs were detected and no YesOrNo - * callback was registered. - * b) if clean or partitioned IMSM RAIDs were detected and user chose - * 'yes' when asked to use Md classes for IMSM/ISW RAIDs. + * Query which driver is used for IMSM Software RAIDs. * - * @return true if IMSM/ISW SW RAIDa are handled by Md/MdPart classes. - * False otherwise. + * @return driver used for IMSM Software RAIDs. */ - virtual bool useMdForImsm() = 0; + virtual ImsmDriver getImsmDriver() const = 0; /** * Query all volumes found in system Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Wed Jan 27 15:12:50 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jan 27 15:09:27 CET 2010 - aschnell(a)suse.de + +- allow to set driver for IMSM without callback (bnc #574270) + +------------------------------------------------------------------- Mon Jan 25 17:30:26 CET 2010 - aschnell(a)suse.de - fixed default mount-by for multipath (bnc #572209) Modified: branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp Wed Jan 27 15:12:50 2010 @@ -164,6 +164,11 @@ "right_asymmetric" : LibStorage::RIGHT_ASYMMETRIC(), "right_symmetric" : LibStorage::RIGHT_SYMMETRIC() ]; +map<symbol, integer> conv_imsm_driver = + $[ `IMSM_UNDECIDED : LibStorage::IMSM_UNDECIDED(), + `IMSM_DMRAID : LibStorage::IMSM_DMRAID(), + `IMSM_MDADM : LibStorage::IMSM_MDADM() ]; + map DiskMapVersion = $[]; map DiskMap = $[]; map type_order = $[ `CT_DISK : 0, `CT_MD : 1, `CT_MDPART : 2, `CT_DMRAID : 3, @@ -343,6 +348,14 @@ } +symbol imsm_driver = `IMSM_UNDECIDED; + +global void SetImsmDriver(symbol val) +{ + imsm_driver = val; +} + + list<map> getContainers(); global boolean InitLibstorage(boolean readonly) @@ -365,6 +378,8 @@ LibStorage::StorageInterface::setEfiBoot(sint, Partitions::EfiBoot()); + LibStorage::StorageInterface::setImsmDriver(sint, conv_imsm_driver[imsm_driver]:LibStorage::IMSM_UNDECIDED()); + conts = getContainers(); y2milestone("InitLibstorage conts:%1", conts); FileSystems::InitSlib(sint); -- 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] r60554 - /tags/branch-Code-11-SP1-2_17_118/network/
by kmachalkova＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: kmachalkova Date: Wed Jan 27 15:12:47 2010 New Revision: 60554 URL: http://svn.opensuse.org/viewcvs/yast?rev=60554&view=rev Log: Created tag branch-Code-11-SP1-2_17_118 for network Added: tags/branch-Code-11-SP1-2_17_118/network/ (props changed) - copied from r60553, branches/SuSE-Code-11-SP1-Branch/network/ -- 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] r60553 - /tags/branch-Code-11-SP1-2_17_118/
by kmachalkova＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: kmachalkova Date: Wed Jan 27 15:12:45 2010 New Revision: 60553 URL: http://svn.opensuse.org/viewcvs/yast?rev=60553&view=rev Log: Created tag branch-Code-11-SP1-2_17_118 Added: tags/branch-Code-11-SP1-2_17_118/ -- 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] r60552 - in /branches/SuSE-Code-11-SP1-Branch/network: VERSION package/yast2-network.changes src/lan/help.ycp
by kmachalkova＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: kmachalkova Date: Wed Jan 27 14:38:30 2010 New Revision: 60552 URL: http://svn.opensuse.org/viewcvs/yast?rev=60552&view=rev Log: changes + bump Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP1-Branch/network/src/lan/help.ycp Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/network/VERSION Wed Jan 27 14:38:30 2010 @@ -1 +1 @@ -2.17.117 +2.17.118 Modified: branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes Wed Jan 27 14:38:30 2010 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Tue Jan 26 12:54:44 CET 2010 - kmachalkova(a)suse.cz + +- Evaluate modified flag of all net components (not only LanItems), + so that change in any of them triggers Write (bnc#439235) +- Write DNS data along with other network settings in lan_proposal, + not separately in inst_hostname (related to bnc#556613) +- Renamed "Write hostname to /etc/hosts" and updated related help + text (bnc#510228, bnc#469752) +- 2.17.118 + +------------------------------------------------------------------- Mon Jan 18 09:56:54 CET 2010 - mzugec(a)suse.cz - fixed remote.desktop file (Categories) Modified: branches/SuSE-Code-11-SP1-Branch/network/src/lan/help.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/lan/help.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/lan/help.ycp Wed Jan 27 14:38:30 2010 @@ -98,7 +98,7 @@ <tt>127.0.0.2</tt> (loopback) IP address in <tt>/etc/hosts</tt>. This is an useful option if you want to have the hostname resolvable at all times, even without active network. In all other cases, use it carefully, especially -if this computer runs some network services."), +if this computer provides some network services."), "searchlist_s": _("Enter the name servers and domain search list for resolving -- 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] r60551 - /tags/branch-Code-11-2_17_8_2/wagon/
by locilka＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: locilka Date: Wed Jan 27 14:21:56 2010 New Revision: 60551 URL: http://svn.opensuse.org/viewcvs/yast?rev=60551&view=rev Log: Created tag branch-Code-11-2_17_8_2 for wagon Added: tags/branch-Code-11-2_17_8_2/wagon/ - copied from r60550, branches/SuSE-Code-11-Branch/wagon/ -- 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] r60550 - /tags/branch-Code-11-2_17_8_2/
by locilka＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: locilka Date: Wed Jan 27 14:21:54 2010 New Revision: 60550 URL: http://svn.opensuse.org/viewcvs/yast?rev=60550&view=rev Log: Created tag branch-Code-11-2_17_8_2 Added: tags/branch-Code-11-2_17_8_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] r60549 - /tags/branch-Code-11-SP1-2_17_11/wagon/
by locilka＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: locilka Date: Wed Jan 27 14:19:35 2010 New Revision: 60549 URL: http://svn.opensuse.org/viewcvs/yast?rev=60549&view=rev Log: Created tag branch-Code-11-SP1-2_17_11 for wagon Added: tags/branch-Code-11-SP1-2_17_11/wagon/ (props changed) - copied from r60548, branches/SuSE-Code-11-SP1-Branch/wagon/ -- 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] r60548 - /trunk/mail/src/Mail.ycp
by varkoly＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: varkoly Date: Wed Jan 27 12:51:43 2010 New Revision: 60548 URL: http://svn.opensuse.org/viewcvs/yast?rev=60548&view=rev Log: Apply jsuchomes changes from bnc#559145 Export and Import smtp_use_TLS Modified: trunk/mail/src/Mail.ycp Modified: trunk/mail/src/Mail.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/Mail.ycp?rev=60548&r1=6… ============================================================================== --- trunk/mail/src/Mail.ycp (original) +++ trunk/mail/src/Mail.ycp Wed Jan 27 12:51:43 2010 @@ -630,6 +630,14 @@ } /** + * Wrapper for global Read function, without the callback argument + */ + global boolean ReadWithoutCallback () { + block<boolean> abort_block = ``{ return false; }; + return Read (abort_block); + } + + /** * Make up data for screnshots */ global define void Fake () ``{ @@ -676,7 +684,7 @@ * Part of Write. * @return success */ - define boolean WriteGeneral () ``{ + global define boolean WriteGeneral () ``{ // create_config // if the user wanted it false, we did not proceed SCR::Write (.sysconfig.mail.MAIL_CREATE_CONFIG, "yes"); @@ -811,7 +819,7 @@ * Part of Write. * @return success */ - define boolean WriteMasquerading () ``{ + global define boolean WriteMasquerading () ``{ // from_header SCR::Write (.sysconfig.mail.FROM_HEADER, from_header); // masquerade_other_domains @@ -857,7 +865,7 @@ * Part of Write. * @return success */ - define boolean WriteDownloading () ``{ + global define boolean WriteDownloading () ``{ // fetchmail // TODO ?other settings: autofetch? at device up? SCR::Write (.mail.fetchmail.accounts, fetchmail); @@ -883,7 +891,7 @@ * Part of Write. * @return success */ - define boolean WriteAliasesAndVirtual () ``{ + global define boolean WriteAliasesAndVirtual () ``{ // aliases if (! MailAliases::WriteAliases ()) { @@ -916,7 +924,7 @@ * Part of Write. * @return success */ - define boolean WriteSmtpAuth () ``{ + global define boolean WriteSmtpAuth () ``{ // TODO how to remove the only entry? // filter it out in the dialog? if (enable_smtp_auth != nil) @@ -950,7 +958,7 @@ * Part of Write. * @return success */ - define boolean WriteFlush () ``{ + global define boolean WriteFlush () ``{ //flush the agents map<string, path> paths = $[ "/etc/sysconfig/mail": .sysconfig.mail, @@ -1008,7 +1016,7 @@ * Part of Write. * @return success */ - define boolean WriteSuSEconfig () ``{ + global define boolean WriteSuSEconfig () ``{ //run SuSEconfig with the necessary modules // TODO other modules using FROM_HEADER? integer ret = 0; @@ -1040,7 +1048,7 @@ * Part of Write. * @return success */ - define boolean WriteServices () ``{ + global define boolean WriteServices () ``{ if (amavis_service) { Service::Stop ("amavis"); @@ -1161,6 +1169,13 @@ return true; } + /** + * Wrapper for global Write function, without the callback argument + */ + global boolean WriteWithoutCallback () { + block<boolean> abort_block = ``{ return false; }; + return Write (abort_block); + } /** * Get all mail settings from the first parameter @@ -1218,6 +1233,7 @@ MailAliases::FilterRootAlias (); // MailAliases::merge_aliases = settings["merge_aliases"]: false; virtual_users = settings["virtual_users"]: []; + smtp_use_TLS = settings["smtp_use_TLS"]: "yes"; smtp_auth = settings["smtp_auth"]: []; y2debug ("after %1", settings); // may contain passwords return true; @@ -1245,6 +1261,7 @@ // "merge_aliases": MailAliases::merge_aliases, "virtual_users": virtual_users, "smtp_auth": smtp_auth, + "smtp_use_TLS": smtp_use_TLS, ]; if (mta == `postfix) { -- 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] r60547 - in /trunk/mail/src: Mail.ycp ui.ycp
by varkoly＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: varkoly Date: Wed Jan 27 12:44:45 2010 New Revision: 60547 URL: http://svn.opensuse.org/viewcvs/yast?rev=60547&view=rev Log: Make smtp_use_TLS ternary Modified: trunk/mail/src/Mail.ycp trunk/mail/src/ui.ycp Modified: trunk/mail/src/Mail.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/Mail.ycp?rev=60547&r1=6… ============================================================================== --- trunk/mail/src/Mail.ycp (original) +++ trunk/mail/src/Mail.ycp Wed Jan 27 12:44:45 2010 @@ -103,7 +103,7 @@ /** * Do the MTA use TLS for sending the email. */ - global boolean smtp_use_TLS = true; + global string smtp_use_TLS = "yes"; /** * Mail will appear to come from this domain. Applies also for the @@ -447,7 +447,7 @@ } else if (mta == `postfix) { - smtp_use_TLS = ( (string) SCR::Read (.sysconfig.postfix.POSTFIX_SMTP_TLS_CLIENT) == "yes" ); + smtp_use_TLS = (string) SCR::Read (.sysconfig.postfix.POSTFIX_SMTP_TLS_CLIENT); outgoing_mail_server = (string) SCR::Read (.sysconfig.postfix.POSTFIX_RELAYHOST); } @@ -783,14 +783,7 @@ else if (mta == `postfix) { SCR::Write (.sysconfig.postfix.POSTFIX_RELAYHOST, outgoing_mail_server); - if( smtp_use_TLS ) - { - SCR::Write (.sysconfig.postfix.POSTFIX_SMTP_TLS_CLIENT, "yes"); - } - else - { - SCR::Write (.sysconfig.postfix.POSTFIX_SMTP_TLS_CLIENT, "no"); - } + SCR::Write (.sysconfig.postfix.POSTFIX_SMTP_TLS_CLIENT, smtp_use_TLS); } else { Modified: trunk/mail/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/ui.ycp?rev=60547&r1=605… ============================================================================== --- trunk/mail/src/ui.ycp (original) +++ trunk/mail/src/ui.ycp Wed Jan 27 12:44:45 2010 @@ -342,6 +342,10 @@ define symbol OutgoingDialog () ``{ Wizard::SetScreenShotName ("mail-21-outgoing"); + boolean TLSnone = ( Mail::smtp_use_TLS == "no" ); + boolean TLSuse = ( Mail::smtp_use_TLS == "yes" ); + boolean TLSmust = ( Mail::smtp_use_TLS == "must" ); + // what buttons can be used to leave this dialog //(except the std wizarding ones) list<symbol> buttons = []; @@ -357,7 +361,13 @@ `VBox ( WJ_MakeWidget (`outgoing_mail_server), // TLS - `CheckBox( `id(`tls), _("The server use &TLS"), Mail::smtp_use_TLS ), + `RadioButtonGroup(`id(`TLS), _("The server use &TLS") + `HBox( + `Left(`RadioButton(`id("no"), _("No"), TLSnone)), + `Left(`RadioButton(`id("yes"), _("Use"), TLSuse)), + `Left(`RadioButton(`id("must"), _("Enforce"),TLSmust)) + ) + ), // Translators: button // TODO ... `PushButton (`id(`outgoing_details), _("&Masquerading")), -- 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 #727
by Hudson Integration Service 27 Jan '10

27 Jan '10

See <http://yast.suse.de:3334/job/webyast-service-11.1-i586/727/changes> Changes: [Stefan Schubert] cleanup of the log model/module [Stefan Schubert] Merge branch 'master' of git@gitorious.org:opensuse/yast-rest-service ------------------------------------------ [...truncated 2981 lines...] 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 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/./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/doc/ www/doc/README_FOR_APP www/Rakefile www/init.rb www/uninstall.rb www/restdoc/ www/restdoc/ntp.xml www/restdoc/api.txt www/restdoc/sync_request.xml cd - WARNING: Ignoring file: config/status_configuration.yaml 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/graphs_controller.rb ln ./app/controllers/graphs_controller.rb package/www/./app/controllers/graphs_controller.rb 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 mkdir -p package/www/./app/models rm -f package/www/./app/models/graph.rb ln ./app/models/graph.rb package/www/./app/models/graph.rb rm -f package/www/./app/models/log.rb ln ./app/models/log.rb package/www/./app/models/log.rb 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/graphs rm -f package/www/./app/views/graphs/show.html.erb ln ./app/views/graphs/show.html.erb package/www/./app/views/graphs/show.html.erb rm -f package/www/./app/views/graphs/show.xml.erb ln ./app/views/graphs/show.xml.erb package/www/./app/views/graphs/show.xml.erb mkdir -p package/www/./app/views/logs rm -f package/www/./app/views/logs/show.html.erb ln ./app/views/logs/show.html.erb package/www/./app/views/logs/show.html.erb rm -f package/www/./app/views/logs/show.xml.erb ln ./app/views/logs/show.xml.erb package/www/./app/views/logs/show.xml.erb mkdir -p package/www/./app/views/metrics rm -f package/www/./app/views/metrics/show.html.erb ln ./app/views/metrics/show.html.erb package/www/./app/views/metrics/show.html.erb rm -f package/www/./app/views/metrics/show.xml.erb ln ./app/views/metrics/show.xml.erb package/www/./app/views/metrics/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/graphs.yml ln ./config/resources/graphs.yml package/www/./config/resources/graphs.yml 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/./restdoc rm -f package/www/./restdoc/api.txt ln ./restdoc/api.txt package/www/./restdoc/api.txt rm -f package/www/./restdoc/graphs.xml ln ./restdoc/graphs.xml package/www/./restdoc/graphs.xml rm -f package/www/./restdoc/memory.xml ln ./restdoc/memory.xml package/www/./restdoc/memory.xml rm -f package/www/./restdoc/metrics.xml ln ./restdoc/metrics.xml package/www/./restdoc/metrics.xml rm -f package/www/./restdoc/waerden+memory+memory-used.xml ln ./restdoc/waerden+memory+memory-used.xml package/www/./restdoc/waerden+memory+memory-used.xml 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/config/ www/config/rails_parent.rb www/config/resources/ www/config/resources/logs.yml www/config/resources/graphs.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/models/graph.rb www/app/models/log.rb www/app/controllers/ www/app/controllers/logs_controller.rb www/app/controllers/graphs_controller.rb www/app/controllers/metrics_controller.rb www/app/views/ www/app/views/logs/ www/app/views/logs/show.xml.erb www/app/views/logs/show.html.erb www/app/views/metrics/ www/app/views/metrics/show.xml.erb www/app/views/metrics/show.html.erb www/app/views/graphs/ www/app/views/graphs/show.xml.erb www/app/views/graphs/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 www/restdoc/ www/restdoc/memory.xml www/restdoc/waerden+memory+memory-used.xml www/restdoc/metrics.xml www/restdoc/graphs.xml www/restdoc/api.txt cd - WARNING: Ignoring file: config/status_configuration.yaml ++ 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/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: File /src/rest-service/webservice/package/www.tar.bz2: No such file or directory + 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 1

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

27 Jan '10

See <http://yast.suse.de:3334/job/webyast-service-head-i586/680/changes> Changes: [Stefan Schubert] cleanup of the log model/module [Stefan Schubert] Merge branch 'master' of git@gitorious.org:opensuse/yast-rest-service ------------------------------------------ [...truncated 3081 lines...] 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 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/./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/doc/ www/doc/README_FOR_APP www/Rakefile www/init.rb www/uninstall.rb www/restdoc/ www/restdoc/ntp.xml www/restdoc/api.txt www/restdoc/sync_request.xml cd - WARNING: Ignoring file: config/status_configuration.yaml 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/graphs_controller.rb ln ./app/controllers/graphs_controller.rb package/www/./app/controllers/graphs_controller.rb 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 mkdir -p package/www/./app/models rm -f package/www/./app/models/graph.rb ln ./app/models/graph.rb package/www/./app/models/graph.rb rm -f package/www/./app/models/log.rb ln ./app/models/log.rb package/www/./app/models/log.rb 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/graphs rm -f package/www/./app/views/graphs/show.html.erb ln ./app/views/graphs/show.html.erb package/www/./app/views/graphs/show.html.erb rm -f package/www/./app/views/graphs/show.xml.erb ln ./app/views/graphs/show.xml.erb package/www/./app/views/graphs/show.xml.erb mkdir -p package/www/./app/views/logs rm -f package/www/./app/views/logs/show.html.erb ln ./app/views/logs/show.html.erb package/www/./app/views/logs/show.html.erb rm -f package/www/./app/views/logs/show.xml.erb ln ./app/views/logs/show.xml.erb package/www/./app/views/logs/show.xml.erb mkdir -p package/www/./app/views/metrics rm -f package/www/./app/views/metrics/show.html.erb ln ./app/views/metrics/show.html.erb package/www/./app/views/metrics/show.html.erb rm -f package/www/./app/views/metrics/show.xml.erb ln ./app/views/metrics/show.xml.erb package/www/./app/views/metrics/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/graphs.yml ln ./config/resources/graphs.yml package/www/./config/resources/graphs.yml 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/./restdoc rm -f package/www/./restdoc/api.txt ln ./restdoc/api.txt package/www/./restdoc/api.txt rm -f package/www/./restdoc/graphs.xml ln ./restdoc/graphs.xml package/www/./restdoc/graphs.xml rm -f package/www/./restdoc/memory.xml ln ./restdoc/memory.xml package/www/./restdoc/memory.xml rm -f package/www/./restdoc/metrics.xml ln ./restdoc/metrics.xml package/www/./restdoc/metrics.xml rm -f package/www/./restdoc/waerden+memory+memory-used.xml ln ./restdoc/waerden+memory+memory-used.xml package/www/./restdoc/waerden+memory+memory-used.xml 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/config/ www/config/rails_parent.rb www/config/resources/ www/config/resources/logs.yml www/config/resources/graphs.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/models/graph.rb www/app/models/log.rb www/app/controllers/ www/app/controllers/logs_controller.rb www/app/controllers/graphs_controller.rb www/app/controllers/metrics_controller.rb www/app/views/ www/app/views/logs/ www/app/views/logs/show.xml.erb www/app/views/logs/show.html.erb www/app/views/metrics/ www/app/views/metrics/show.xml.erb www/app/views/metrics/show.html.erb www/app/views/graphs/ www/app/views/graphs/show.xml.erb www/app/views/graphs/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 www/restdoc/ www/restdoc/memory.xml www/restdoc/waerden+memory+memory-used.xml www/restdoc/metrics.xml www/restdoc/graphs.xml www/restdoc/api.txt cd - WARNING: Ignoring file: config/status_configuration.yaml ++ 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/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: File /src/rest-service/webservice/package/www.tar.bz2: No such file or directory + 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 1

[yast-commit] r60546 - in /branches/SuSE-Code-11-Branch/wagon: ./ package/ src/clients/ src/config/ src/include/ src/modules/
by locilka＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: locilka Date: Wed Jan 27 12:06:50 2010 New Revision: 60546 URL: http://svn.opensuse.org/viewcvs/yast?rev=60546&view=rev Log: - Disabling repositories that provide some old version of product to be upgraded (BNC #573092). - Fixed RPM dependencies. - 2.17.8.2 Added: branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_modify_repositories.ycp Modified: branches/SuSE-Code-11-Branch/wagon/VERSION branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-Branch/wagon/src/clients/wagon.ycp branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_migration_products.ycp branches/SuSE-Code-11-Branch/wagon/src/config/online_migration.xml branches/SuSE-Code-11-Branch/wagon/src/include/common_func.ycp branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp branches/SuSE-Code-11-Branch/wagon/yast2-wagon.spec.in Modified: branches/SuSE-Code-11-Branch/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/VER… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/VERSION (original) +++ branches/SuSE-Code-11-Branch/wagon/VERSION Wed Jan 27 12:06:50 2010 @@ -1 +1 @@ -2.17.8.1 +2.17.8.2 Modified: branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/pac… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes Wed Jan 27 12:06:50 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Jan 27 11:52:01 CET 2010 - locilka(a)suse.cz + +- Disabling repositories that provide some old version of product + to be upgraded (BNC #573092). +- Fixed RPM dependencies. +- 2.17.8.2 + +------------------------------------------------------------------- Tue Jan 26 15:13:12 CET 2010 - locilka(a)suse.cz - Added support for migration hook scripts. Modified: branches/SuSE-Code-11-Branch/wagon/src/clients/wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/clients/wagon.ycp (original) +++ branches/SuSE-Code-11-Branch/wagon/src/clients/wagon.ycp Wed Jan 27 12:06:50 2010 @@ -206,6 +206,24 @@ false, true ); + y2milestone ("Repositories disabled by migration: %1", Wagon::disabled_repositories); + foreach (string repo_alias, Wagon::disabled_repositories, { + integer repo_id = FindRepoIdByAlias (repo_alias); + + if (repo_id == nil) { + y2error ("Cannot enable repo (alias)%1, repo not found ", repo_alias); + Report::Error (sformat(_("Cannot enable repository with alias +%1 +Repository was not found."), repo_alias)); + return; + } + + y2milestone ("Enabling repository %1 returned: %2", repo_id, Pkg::SourceSetEnabled (repo_id, true)); + }); + + Pkg::SourceSaveAll(); + Wagon::InitPkg(); + // Remove all the migration products using packages approach manually // Removing via ResolvableRemove + PkgSolve usually produces errors, // dependency loops etc. Modified: branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_migration_products.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_migration_products.ycp (original) +++ branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_migration_products.ycp Wed Jan 27 12:06:50 2010 @@ -135,6 +135,77 @@ return true; } + /** + * Finds all products that contain information about their migration product + * finds which repositories provide these products and disables the + * repositories. + * + * @see BNC #573092 + */ + boolean FindOldRepositoriesToBeDisabled () { + if (Wagon::InitPkg() != true) { + Report::Error (_("Unable to initialize the package manager.")); + return false; + } + + list <map <string,any> > products = Pkg::ResolvableProperties ("", `product, ""); + + foreach (map<string, any> p, products, { + if (p["status"]:`unknown != `installed) { + y2milestone ("Product %1 (%2) is not installed, skipping...", + p["name"]:"not-defined", p["short_name"]:p["display_name"]:"not-defined"); + return; + } + + if (! haskey (p, "upgrades") || p["upgrades"]:[] == []) { + y2warning ("Product %1 (%2) does not contain 'upgrades' section...", + p["name"]:"not-defined", p["short_name"]:p["display_name"]:"not-defined"); + return; + } + + y2milestone ("Going to disable repositories providing product %1 (%2)", + p["name"]:"not-defined", p["short_name"]:p["display_name"]:"not-defined"); + + if (p["name"]:"" == nil || p["name"]:"" == "") { + y2error ("Product %1 doesn't have a name, reverting will be impossible", p); + Report::Error (sformat(_("Product %1 does not have a machine-readable 'name'. +Cannot disable ."), p["short_name"]:p["display_name"]:"not-defined")); + } + + // Find all available products + list <map <string, any> > matching_products = Pkg::ResolvableProperties (p["name"]:"", `product, ""); + matching_products = filter (map <string, any> one_product, matching_products, { + return (one_product["status"]:`unknown == `available); + }); + + if (matching_products == nil || size (matching_products) == 0) { + y2error ("Nothing provides product: '%1'", p["name"]:""); + Report::Error (sformat(_("No repository provides product %1 (%2). +Migration might not work."), + p["name"]:"not-defined", p["short_name"]:p["display_name"]:"not-defined")); + } + + integer repo_id = nil; + map repo_details = nil; + + foreach (map <string, any> one_product, matching_products, { + repo_id = one_product["source"]:-1; + + if (repo_id < 0) { + y2error ("Available product with source<0: %1", Wagon::MinimizeProductMap (one_product)); + return; + } + + repo_details = Pkg::SourceGeneralData (repo_id); + Wagon::repositories_to_disable = add (Wagon::repositories_to_disable, repo_details["alias"]:""); + }); + }); + + y2milestone ("Repositories to be disabled later: %1", Wagon::repositories_to_disable); + + return true; + } + Wagon::InitPkg(); Wagon::ReadProductsBeforeMigration(); @@ -183,6 +254,9 @@ ResetPackager(); + // Remembers all repositories that will be disabled later (after registration run) + FindOldRepositoriesToBeDisabled(); + y2milestone ("Returning: %1", ret); return ret; Added: branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_modify_repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_modify_repositories.ycp (added) +++ branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_modify_repositories.ycp Wed Jan 27 12:06:50 2010 @@ -0,0 +1,62 @@ +/** + * File: + * clients/wagon_migration_products.ycp + * + * Module: + * Wagon + * + * Authors: + * Lukas Ocilka <locilka(a)suse.cz> + * + * Summary: + * Online Migration Tool + * + * $Id$ + * + */ + +{ + /** + * Modify repositories as needed. + */ + + textdomain "wagon"; + + import "Wagon"; + import "GetInstArgs"; + import "Report"; + + include "wagon/common_func.ycp"; + + if (GetInstArgs::going_back()) { + y2milestone ("Going back..."); + return `back; + } + + symbol ret = `auto; + + Wagon::InitPkg(); + + integer repo_id = nil; + + foreach (string repo_alias, Wagon::repositories_to_disable, { + repo_id = FindRepoIdByAlias (repo_alias); + + if (repo_id == nil) { + y2error ("Cannot disable repository %1, alias not found", repo_alias); + return; + } + + y2milestone ("Disabling repository (alias)%1 (id)%2 returned: %3", repo_alias, repo_id, Pkg::SourceSetEnabled (repo_id, false)); + Wagon::disabled_repositories = add (Wagon::disabled_repositories, repo_alias); + }); + + if (size (Wagon::disabled_repositories) > 0) + Pkg::SourceSaveAll(); + + ResetPackager(); + + y2milestone ("Returning: %1", ret); + + return ret; +} Modified: branches/SuSE-Code-11-Branch/wagon/src/config/online_migration.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/config/online_migration.xml (original) +++ branches/SuSE-Code-11-Branch/wagon/src/config/online_migration.xml Wed Jan 27 12:06:50 2010 @@ -31,6 +31,7 @@ <module>update_online_mechanism</module> <module>install_migration_products</module> <module>suse_register_workflow</module> + <module>wagon_modify_repositories</module> <module>prepare_progress</module> <module>point_of_no_return</module> <module>wagon_kickoff</module> @@ -60,6 +61,7 @@ <module>suse_register_workflow</module> <module>wagon_custom_url</module> <module>wagon_selfupdate_from_url</module> + <module>wagon_modify_repositories</module> <module>prepare_progress</module> <module>point_of_no_return</module> <module>wagon_kickoff</module> @@ -85,6 +87,7 @@  <module>update_url_dialog</module> <module>suse_register_workflow</module> + <module>wagon_modify_repositories</module> <module>prepare_progress</module> <module>point_of_no_return</module> <module>wagon_kickoff</module> @@ -111,6 +114,7 @@ <module>update_url_dialog</module> <module>wagon_custom_url</module> <module>wagon_selfupdate_from_url</module> + <module>wagon_modify_repositories</module> <module>prepare_progress</module> <module>point_of_no_return</module> <module>wagon_kickoff</module> @@ -256,6 +260,11 @@ </module> <module> + <name>wagon_modify_repositories</name> + <execute>wagon_modify_repositories</execute> + </module> + + <module> <heading>yes</heading> <label>Migration</label> </module> Modified: branches/SuSE-Code-11-Branch/wagon/src/include/common_func.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/include/common_func.ycp (original) +++ branches/SuSE-Code-11-Branch/wagon/src/include/common_func.ycp Wed Jan 27 12:06:50 2010 @@ -125,4 +125,21 @@ Wagon::InitPkg(); Pkg::PkgSolve (true); } + + integer FindRepoIdByAlias (string repo_alias) { + integer repo_id = nil; + + map one_repo = $[]; + + foreach (integer repo_id_to_check, Pkg::SourceGetCurrent (false /* all repos */), { + one_repo = Pkg::SourceGeneralData (repo_id_to_check); + + if (one_repo["alias"]:"" == repo_alias) { + repo_id = repo_id_to_check; + break; + } + }); + + return repo_id; + } } Modified: branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp Wed Jan 27 12:06:50 2010 @@ -42,6 +42,12 @@ // Products installed before the migration global list <map <string, string> > products_before_migration = []; + // Repositories that were disabled by wagon during migration + // List of aliases (unique identification) + // BNC #573092 + global list <string> disabled_repositories = []; + global list <string> repositories_to_disable = []; + // When aborting before the real migration starts, we can still // revert to the old products global boolean abort_can_revert_products = true; @@ -499,6 +505,5 @@ return true; } - /* EOF */ } Modified: branches/SuSE-Code-11-Branch/wagon/yast2-wagon.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/yas… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/yast2-wagon.spec.in (original) +++ branches/SuSE-Code-11-Branch/wagon/yast2-wagon.spec.in Wed Jan 27 12:06:50 2010 @@ -7,6 +7,9 @@ # <upgrades> section from product file Requires: yast2-pkg-bindings >= 2.17.39.2 +# Called in proposal and in code +Requires: yast2-packager yast2-update yast2-add-on + BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-update # xmllint -- 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] r60545 - in /trunk/wagon: ./ package/ src/clients/ src/config/ src/include/ src/modules/
by locilka＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: locilka Date: Wed Jan 27 12:05:58 2010 New Revision: 60545 URL: http://svn.opensuse.org/viewcvs/yast?rev=60545&view=rev Log: - Disabling repositories that provide some old version of product to be upgraded (BNC #573092). - Fixed RPM dependencies. Added: trunk/wagon/src/clients/wagon_modify_repositories.ycp Modified: trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/clients/wagon.ycp trunk/wagon/src/clients/wagon_migration_products.ycp trunk/wagon/src/config/online_migration.xml trunk/wagon/src/include/common_func.ycp trunk/wagon/src/modules/Wagon.ycp trunk/wagon/yast2-wagon.spec.in Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Wed Jan 27 12:05:58 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jan 27 11:52:01 CET 2010 - locilka(a)suse.cz + +- Disabling repositories that provide some old version of product + to be upgraded (BNC #573092). +- Fixed RPM dependencies. + +------------------------------------------------------------------- Tue Jan 26 15:13:12 CET 2010 - locilka(a)suse.cz - Added support for migration hook scripts. Modified: trunk/wagon/src/clients/wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon.ycp?rev=… ============================================================================== --- trunk/wagon/src/clients/wagon.ycp (original) +++ trunk/wagon/src/clients/wagon.ycp Wed Jan 27 12:05:58 2010 @@ -206,6 +206,24 @@ false, true ); + y2milestone ("Repositories disabled by migration: %1", Wagon::disabled_repositories); + foreach (string repo_alias, Wagon::disabled_repositories, { + integer repo_id = FindRepoIdByAlias (repo_alias); + + if (repo_id == nil) { + y2error ("Cannot enable repo (alias)%1, repo not found ", repo_alias); + Report::Error (sformat(_("Cannot enable repository with alias +%1 +Repository was not found."), repo_alias)); + return; + } + + y2milestone ("Enabling repository %1 returned: %2", repo_id, Pkg::SourceSetEnabled (repo_id, true)); + }); + + Pkg::SourceSaveAll(); + Wagon::InitPkg(); + // Remove all the migration products using packages approach manually // Removing via ResolvableRemove + PkgSolve usually produces errors, // dependency loops etc. Modified: trunk/wagon/src/clients/wagon_migration_products.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_migratio… ============================================================================== --- trunk/wagon/src/clients/wagon_migration_products.ycp (original) +++ trunk/wagon/src/clients/wagon_migration_products.ycp Wed Jan 27 12:05:58 2010 @@ -135,6 +135,77 @@ return true; } + /** + * Finds all products that contain information about their migration product + * finds which repositories provide these products and disables the + * repositories. + * + * @see BNC #573092 + */ + boolean FindOldRepositoriesToBeDisabled () { + if (Wagon::InitPkg() != true) { + Report::Error (_("Unable to initialize the package manager.")); + return false; + } + + list <map <string,any> > products = Pkg::ResolvableProperties ("", `product, ""); + + foreach (map<string, any> p, products, { + if (p["status"]:`unknown != `installed) { + y2milestone ("Product %1 (%2) is not installed, skipping...", + p["name"]:"not-defined", p["short_name"]:p["display_name"]:"not-defined"); + return; + } + + if (! haskey (p, "upgrades") || p["upgrades"]:[] == []) { + y2warning ("Product %1 (%2) does not contain 'upgrades' section...", + p["name"]:"not-defined", p["short_name"]:p["display_name"]:"not-defined"); + return; + } + + y2milestone ("Going to disable repositories providing product %1 (%2)", + p["name"]:"not-defined", p["short_name"]:p["display_name"]:"not-defined"); + + if (p["name"]:"" == nil || p["name"]:"" == "") { + y2error ("Product %1 doesn't have a name, reverting will be impossible", p); + Report::Error (sformat(_("Product %1 does not have a machine-readable 'name'. +Cannot disable ."), p["short_name"]:p["display_name"]:"not-defined")); + } + + // Find all available products + list <map <string, any> > matching_products = Pkg::ResolvableProperties (p["name"]:"", `product, ""); + matching_products = filter (map <string, any> one_product, matching_products, { + return (one_product["status"]:`unknown == `available); + }); + + if (matching_products == nil || size (matching_products) == 0) { + y2error ("Nothing provides product: '%1'", p["name"]:""); + Report::Error (sformat(_("No repository provides product %1 (%2). +Migration might not work."), + p["name"]:"not-defined", p["short_name"]:p["display_name"]:"not-defined")); + } + + integer repo_id = nil; + map repo_details = nil; + + foreach (map <string, any> one_product, matching_products, { + repo_id = one_product["source"]:-1; + + if (repo_id < 0) { + y2error ("Available product with source<0: %1", Wagon::MinimizeProductMap (one_product)); + return; + } + + repo_details = Pkg::SourceGeneralData (repo_id); + Wagon::repositories_to_disable = add (Wagon::repositories_to_disable, repo_details["alias"]:""); + }); + }); + + y2milestone ("Repositories to be disabled later: %1", Wagon::repositories_to_disable); + + return true; + } + Wagon::InitPkg(); Wagon::ReadProductsBeforeMigration(); @@ -183,6 +254,9 @@ ResetPackager(); + // Remembers all repositories that will be disabled later (after registration run) + FindOldRepositoriesToBeDisabled(); + y2milestone ("Returning: %1", ret); return ret; Added: trunk/wagon/src/clients/wagon_modify_repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_modify_r… ============================================================================== --- trunk/wagon/src/clients/wagon_modify_repositories.ycp (added) +++ trunk/wagon/src/clients/wagon_modify_repositories.ycp Wed Jan 27 12:05:58 2010 @@ -0,0 +1,62 @@ +/** + * File: + * clients/wagon_migration_products.ycp + * + * Module: + * Wagon + * + * Authors: + * Lukas Ocilka <locilka(a)suse.cz> + * + * Summary: + * Online Migration Tool + * + * $Id$ + * + */ + +{ + /** + * Modify repositories as needed. + */ + + textdomain "wagon"; + + import "Wagon"; + import "GetInstArgs"; + import "Report"; + + include "wagon/common_func.ycp"; + + if (GetInstArgs::going_back()) { + y2milestone ("Going back..."); + return `back; + } + + symbol ret = `auto; + + Wagon::InitPkg(); + + integer repo_id = nil; + + foreach (string repo_alias, Wagon::repositories_to_disable, { + repo_id = FindRepoIdByAlias (repo_alias); + + if (repo_id == nil) { + y2error ("Cannot disable repository %1, alias not found", repo_alias); + return; + } + + y2milestone ("Disabling repository (alias)%1 (id)%2 returned: %3", repo_alias, repo_id, Pkg::SourceSetEnabled (repo_id, false)); + Wagon::disabled_repositories = add (Wagon::disabled_repositories, repo_alias); + }); + + if (size (Wagon::disabled_repositories) > 0) + Pkg::SourceSaveAll(); + + ResetPackager(); + + y2milestone ("Returning: %1", ret); + + return ret; +} Modified: trunk/wagon/src/config/online_migration.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/config/online_migratio… ============================================================================== --- trunk/wagon/src/config/online_migration.xml (original) +++ trunk/wagon/src/config/online_migration.xml Wed Jan 27 12:05:58 2010 @@ -31,6 +31,7 @@ <module>update_online_mechanism</module> <module>install_migration_products</module> <module>suse_register_workflow</module> + <module>wagon_modify_repositories</module> <module>prepare_progress</module> <module>point_of_no_return</module> <module>wagon_kickoff</module> @@ -60,6 +61,7 @@ <module>suse_register_workflow</module> <module>wagon_custom_url</module> <module>wagon_selfupdate_from_url</module> + <module>wagon_modify_repositories</module> <module>prepare_progress</module> <module>point_of_no_return</module> <module>wagon_kickoff</module> @@ -85,6 +87,7 @@  <module>update_url_dialog</module> <module>suse_register_workflow</module> + <module>wagon_modify_repositories</module> <module>prepare_progress</module> <module>point_of_no_return</module> <module>wagon_kickoff</module> @@ -111,6 +114,7 @@ <module>update_url_dialog</module> <module>wagon_custom_url</module> <module>wagon_selfupdate_from_url</module> + <module>wagon_modify_repositories</module> <module>prepare_progress</module> <module>point_of_no_return</module> <module>wagon_kickoff</module> @@ -257,6 +261,11 @@ </module> <module> + <name>wagon_modify_repositories</name> + <execute>wagon_modify_repositories</execute> + </module> + + <module> <heading>yes</heading> <label>Migration</label> </module> Modified: trunk/wagon/src/include/common_func.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/include/common_func.yc… ============================================================================== --- trunk/wagon/src/include/common_func.ycp (original) +++ trunk/wagon/src/include/common_func.ycp Wed Jan 27 12:05:58 2010 @@ -125,4 +125,21 @@ Wagon::InitPkg(); Pkg::PkgSolve (true); } + + integer FindRepoIdByAlias (string repo_alias) { + integer repo_id = nil; + + map one_repo = $[]; + + foreach (integer repo_id_to_check, Pkg::SourceGetCurrent (false /* all repos */), { + one_repo = Pkg::SourceGeneralData (repo_id_to_check); + + if (one_repo["alias"]:"" == repo_alias) { + repo_id = repo_id_to_check; + break; + } + }); + + return repo_id; + } } Modified: trunk/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/modules/Wagon.ycp?rev=… ============================================================================== --- trunk/wagon/src/modules/Wagon.ycp (original) +++ trunk/wagon/src/modules/Wagon.ycp Wed Jan 27 12:05:58 2010 @@ -42,6 +42,12 @@ // Products installed before the migration global list <map <string, string> > products_before_migration = []; + // Repositories that were disabled by wagon during migration + // List of aliases (unique identification) + // BNC #573092 + global list <string> disabled_repositories = []; + global list <string> repositories_to_disable = []; + // When aborting before the real migration starts, we can still // revert to the old products global boolean abort_can_revert_products = true; @@ -499,6 +505,5 @@ return true; } - /* EOF */ } Modified: trunk/wagon/yast2-wagon.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/yast2-wagon.spec.in?rev=60… ============================================================================== --- trunk/wagon/yast2-wagon.spec.in (original) +++ trunk/wagon/yast2-wagon.spec.in Wed Jan 27 12:05:58 2010 @@ -9,6 +9,9 @@ # BNC #571621, Returns <upgrades> section from product file Requires: yast2-pkg-bindings >= 2.19.1 +# Called in proposal and in code +Requires: yast2-packager yast2-update yast2-add-on + BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-update # xmllint -- 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] r60544 - in /branches/SuSE-Code-11-SP1-Branch/wagon: ./ package/ src/clients/ src/config/ src/include/ src/modules/
by locilka＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: locilka Date: Wed Jan 27 12:04:31 2010 New Revision: 60544 URL: http://svn.opensuse.org/viewcvs/yast?rev=60544&view=rev Log: - Disabling repositories that provide some old version of product to be upgraded (BNC #573092). - Fixed RPM dependencies. - 2.17.11 Added: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_modify_repositories.ycp Modified: branches/SuSE-Code-11-SP1-Branch/wagon/VERSION branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_migration_products.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml branches/SuSE-Code-11-SP1-Branch/wagon/src/include/common_func.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/VERSION Wed Jan 27 12:04:31 2010 @@ -1 +1 @@ -2.17.10 +2.17.11 Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes Wed Jan 27 12:04:31 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Jan 27 11:52:01 CET 2010 - locilka(a)suse.cz + +- Disabling repositories that provide some old version of product + to be upgraded (BNC #573092). +- Fixed RPM dependencies. +- 2.17.11 + +------------------------------------------------------------------- Tue Jan 26 15:13:12 CET 2010 - locilka(a)suse.cz - Added support for migration hook scripts. Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon.ycp Wed Jan 27 12:04:31 2010 @@ -206,6 +206,24 @@ false, true ); + y2milestone ("Repositories disabled by migration: %1", Wagon::disabled_repositories); + foreach (string repo_alias, Wagon::disabled_repositories, { + integer repo_id = FindRepoIdByAlias (repo_alias); + + if (repo_id == nil) { + y2error ("Cannot enable repo (alias)%1, repo not found ", repo_alias); + Report::Error (sformat(_("Cannot enable repository with alias +%1 +Repository was not found."), repo_alias)); + return; + } + + y2milestone ("Enabling repository %1 returned: %2", repo_id, Pkg::SourceSetEnabled (repo_id, true)); + }); + + Pkg::SourceSaveAll(); + Wagon::InitPkg(); + // Remove all the migration products using packages approach manually // Removing via ResolvableRemove + PkgSolve usually produces errors, // dependency loops etc. Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_migration_products.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_migration_products.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_migration_products.ycp Wed Jan 27 12:04:31 2010 @@ -135,6 +135,77 @@ return true; } + /** + * Finds all products that contain information about their migration product + * finds which repositories provide these products and disables the + * repositories. + * + * @see BNC #573092 + */ + boolean FindOldRepositoriesToBeDisabled () { + if (Wagon::InitPkg() != true) { + Report::Error (_("Unable to initialize the package manager.")); + return false; + } + + list <map <string,any> > products = Pkg::ResolvableProperties ("", `product, ""); + + foreach (map<string, any> p, products, { + if (p["status"]:`unknown != `installed) { + y2milestone ("Product %1 (%2) is not installed, skipping...", + p["name"]:"not-defined", p["short_name"]:p["display_name"]:"not-defined"); + return; + } + + if (! haskey (p, "upgrades") || p["upgrades"]:[] == []) { + y2warning ("Product %1 (%2) does not contain 'upgrades' section...", + p["name"]:"not-defined", p["short_name"]:p["display_name"]:"not-defined"); + return; + } + + y2milestone ("Going to disable repositories providing product %1 (%2)", + p["name"]:"not-defined", p["short_name"]:p["display_name"]:"not-defined"); + + if (p["name"]:"" == nil || p["name"]:"" == "") { + y2error ("Product %1 doesn't have a name, reverting will be impossible", p); + Report::Error (sformat(_("Product %1 does not have a machine-readable 'name'. +Cannot disable ."), p["short_name"]:p["display_name"]:"not-defined")); + } + + // Find all available products + list <map <string, any> > matching_products = Pkg::ResolvableProperties (p["name"]:"", `product, ""); + matching_products = filter (map <string, any> one_product, matching_products, { + return (one_product["status"]:`unknown == `available); + }); + + if (matching_products == nil || size (matching_products) == 0) { + y2error ("Nothing provides product: '%1'", p["name"]:""); + Report::Error (sformat(_("No repository provides product %1 (%2). +Migration might not work."), + p["name"]:"not-defined", p["short_name"]:p["display_name"]:"not-defined")); + } + + integer repo_id = nil; + map repo_details = nil; + + foreach (map <string, any> one_product, matching_products, { + repo_id = one_product["source"]:-1; + + if (repo_id < 0) { + y2error ("Available product with source<0: %1", Wagon::MinimizeProductMap (one_product)); + return; + } + + repo_details = Pkg::SourceGeneralData (repo_id); + Wagon::repositories_to_disable = add (Wagon::repositories_to_disable, repo_details["alias"]:""); + }); + }); + + y2milestone ("Repositories to be disabled later: %1", Wagon::repositories_to_disable); + + return true; + } + Wagon::InitPkg(); Wagon::ReadProductsBeforeMigration(); @@ -183,6 +254,9 @@ ResetPackager(); + // Remembers all repositories that will be disabled later (after registration run) + FindOldRepositoriesToBeDisabled(); + y2milestone ("Returning: %1", ret); return ret; Added: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_modify_repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_modify_repositories.ycp (added) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_modify_repositories.ycp Wed Jan 27 12:04:31 2010 @@ -0,0 +1,62 @@ +/** + * File: + * clients/wagon_migration_products.ycp + * + * Module: + * Wagon + * + * Authors: + * Lukas Ocilka <locilka(a)suse.cz> + * + * Summary: + * Online Migration Tool + * + * $Id$ + * + */ + +{ + /** + * Modify repositories as needed. + */ + + textdomain "wagon"; + + import "Wagon"; + import "GetInstArgs"; + import "Report"; + + include "wagon/common_func.ycp"; + + if (GetInstArgs::going_back()) { + y2milestone ("Going back..."); + return `back; + } + + symbol ret = `auto; + + Wagon::InitPkg(); + + integer repo_id = nil; + + foreach (string repo_alias, Wagon::repositories_to_disable, { + repo_id = FindRepoIdByAlias (repo_alias); + + if (repo_id == nil) { + y2error ("Cannot disable repository %1, alias not found", repo_alias); + return; + } + + y2milestone ("Disabling repository (alias)%1 (id)%2 returned: %3", repo_alias, repo_id, Pkg::SourceSetEnabled (repo_id, false)); + Wagon::disabled_repositories = add (Wagon::disabled_repositories, repo_alias); + }); + + if (size (Wagon::disabled_repositories) > 0) + Pkg::SourceSaveAll(); + + ResetPackager(); + + y2milestone ("Returning: %1", ret); + + return ret; +} Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml Wed Jan 27 12:04:31 2010 @@ -31,6 +31,7 @@ <module>update_online_mechanism</module> <module>install_migration_products</module> <module>suse_register_workflow</module> + <module>wagon_modify_repositories</module> <module>prepare_progress</module> <module>point_of_no_return</module> <module>wagon_kickoff</module> @@ -60,6 +61,7 @@ <module>suse_register_workflow</module> <module>wagon_custom_url</module> <module>wagon_selfupdate_from_url</module> + <module>wagon_modify_repositories</module> <module>prepare_progress</module> <module>point_of_no_return</module> <module>wagon_kickoff</module> @@ -85,6 +87,7 @@  <module>update_url_dialog</module> <module>suse_register_workflow</module> + <module>wagon_modify_repositories</module> <module>prepare_progress</module> <module>point_of_no_return</module> <module>wagon_kickoff</module> @@ -111,6 +114,7 @@ <module>update_url_dialog</module> <module>wagon_custom_url</module> <module>wagon_selfupdate_from_url</module> + <module>wagon_modify_repositories</module> <module>prepare_progress</module> <module>point_of_no_return</module> <module>wagon_kickoff</module> @@ -256,6 +260,11 @@ </module> <module> + <name>wagon_modify_repositories</name> + <execute>wagon_modify_repositories</execute> + </module> + + <module> <heading>yes</heading> <label>Migration</label> </module> Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/include/common_func.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/include/common_func.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/include/common_func.ycp Wed Jan 27 12:04:31 2010 @@ -125,4 +125,21 @@ Wagon::InitPkg(); Pkg::PkgSolve (true); } + + integer FindRepoIdByAlias (string repo_alias) { + integer repo_id = nil; + + map one_repo = $[]; + + foreach (integer repo_id_to_check, Pkg::SourceGetCurrent (false /* all repos */), { + one_repo = Pkg::SourceGeneralData (repo_id_to_check); + + if (one_repo["alias"]:"" == repo_alias) { + repo_id = repo_id_to_check; + break; + } + }); + + return repo_id; + } } Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp Wed Jan 27 12:04:31 2010 @@ -42,6 +42,12 @@ // Products installed before the migration global list <map <string, string> > products_before_migration = []; + // Repositories that were disabled by wagon during migration + // List of aliases (unique identification) + // BNC #573092 + global list <string> disabled_repositories = []; + global list <string> repositories_to_disable = []; + // When aborting before the real migration starts, we can still // revert to the old products global boolean abort_can_revert_products = true; @@ -499,6 +505,5 @@ return true; } - /* EOF */ } Modified: branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in Wed Jan 27 12:04:31 2010 @@ -7,6 +7,9 @@ # <upgrades> section from product file Requires: yast2-pkg-bindings >= 2.17.44 +# Called in proposal and in code +Requires: yast2-packager yast2-update yast2-add-on + BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-update # xmllint -- 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] r60543 - in /branches/SuSE-Code-11-SP1-Branch/network/src: lan/help.ycp services/dns.ycp
by kmachalkova＠svn.opensuse.org 26 Jan '10

26 Jan '10

Author: kmachalkova Date: Tue Jan 26 17:42:34 2010 New Revision: 60543 URL: http://svn.opensuse.org/viewcvs/yast?rev=60543&view=rev Log: Renaming the most popular option in yast2-notwork Modified: branches/SuSE-Code-11-SP1-Branch/network/src/lan/help.ycp branches/SuSE-Code-11-SP1-Branch/network/src/services/dns.ycp Modified: branches/SuSE-Code-11-SP1-Branch/network/src/lan/help.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/lan/help.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/lan/help.ycp Tue Jan 26 17:42:34 2010 @@ -94,12 +94,11 @@ different hostnames. "), "write_hostname": -_("Your hostname will be written to <tt>/etc/hosts</tt> and will be -resolvable as <tt>127.0.0.2</tt> IP address. To disable this modification, -uncheck Write Hostname to /etc/hosts box. In that case your -hostname will not be resolvable without an active network. - -"), +_("Assign Hostname to Loopback IP associates your hostname with +<tt>127.0.0.2</tt> (loopback) IP address in <tt>/etc/hosts</tt>. This is an +useful option if you want to have the hostname resolvable at all times, even +without active network. In all other cases, use it carefully, especially +if this computer runs some network services."), "searchlist_s": _("Enter the name servers and domain search list for resolving Modified: branches/SuSE-Code-11-SP1-Branch/network/src/services/dns.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/services/dns.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/services/dns.ycp Tue Jan 26 17:42:34 2010 @@ -406,7 +406,7 @@ "WRITE_HOSTNAME": $[ "widget": `checkbox, /* checkbox label */ - "label": _("&Write Hostname to /etc/hosts"), + "label": _("&Assign Hostname to Loopback IP"), "opt": [], // help "help": help["write_hostname"]:"", -- 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] r60542 - /trunk/storage/storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 26 Jan '10

26 Jan '10

Author: aschnell Date: Tue Jan 26 17:38:35 2010 New Revision: 60542 URL: http://svn.opensuse.org/viewcvs/yast?rev=60542&view=rev Log: - better logging Modified: trunk/storage/storage/src/modules/Storage.ycp 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 Tue Jan 26 17:38:35 2010 @@ -4289,7 +4289,8 @@ need_crypt = true; }); - y2milestone("AddPackageList need lvm:%1 need nfs: %2 quota:%3 crypt:%4", need_lvm, need_nfs, need_quota, need_crypt); + y2milestone("AddPackageList need_lvm:%1 need_nfs:%2 need_quota:%3 need_crypt:%4", + need_lvm, need_nfs, need_quota, need_crypt); if (need_lvm) { -- 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] r60541 - in /trunk/gtk: ./ src/ src/pkg/
by rpmcruz＠svn.opensuse.org 26 Jan '10

26 Jan '10

Author: rpmcruz Date: Tue Jan 26 17:10:22 2010 New Revision: 60541 URL: http://svn.opensuse.org/viewcvs/yast?rev=60541&view=rev Log: * src/pkg/yzyppwrapper.h/cc: changed PkgList property method names to reflect those of Package, and made refreshProps() public. * src/pkg/ygtkpackageview.h/cc: reverted API so that columns are again added by the user-code. * src/pkg/ygtkpackagedetails.h/cc: some general polishing. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGPackageSelectorPluginStub.cc trunk/gtk/src/pkg/CMakeLists.txt trunk/gtk/src/pkg/YGPackageSelector.cc trunk/gtk/src/pkg/ygtkdetailview.cc trunk/gtk/src/pkg/ygtkpackageview.cc trunk/gtk/src/pkg/ygtkpackageview.h trunk/gtk/src/pkg/yzyppwrapper.cc trunk/gtk/src/pkg/yzyppwrapper.h trunk/gtk/src/ygtkrichtext.c 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=60541&r1=60540… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Tue Jan 26 17:10:22 2010 @@ -1,3 +1,14 @@ +2010-01-26 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/pkg/yzyppwrapper.h/cc: changed PkgList property + method names to reflect those of Package, and made + refreshProps() public. + + * src/pkg/ygtkpackageview.h/cc: reverted API so that + columns are again added by the user-code. + + * src/pkg/ygtkpackagedetails.h/cc: some general polishing. + 2010-01-19 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/pkg/YGPackageSelector.cc: added --plug-sidebar flag. 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 Tue Jan 26 17:10:22 2010 @@ -11,21 +11,21 @@ #include <YEvent.h> #include <string.h> -bool search_entry_side = true, search_entry_top = false, dynamic_sidebar = true, +bool search_entry_side = false, search_entry_top = true, dynamic_sidebar = true, expander_sidebar = false, flex_sidebar = false, grid_sidebar = false, - layered_sidebar = false, layered_tabs_sidebar = false, plug_sidebar = false, + layered_sidebar = true, layered_tabs_sidebar = false, plug_sidebar = false, startup_menu = false, - big_icons_sidebar = false, icons_sidebar = false, + big_icons_sidebar = true, icons_sidebar = false, categories_side = true, repositories_side = true, categories_top = false, repositories_top = false, 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, + undo_box = true, 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, - italicize_changed_row = false, golden_changed_row = false, + italicize_changed_row = false, golden_changed_row = true, details_start_hide = false, toolbar_top = false, toolbar_yast = false, arrange_by = false; Modified: trunk/gtk/src/pkg/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/CMakeLists.txt?rev=6… ============================================================================== --- trunk/gtk/src/pkg/CMakeLists.txt (original) +++ trunk/gtk/src/pkg/CMakeLists.txt Tue Jan 26 17:10:22 2010 @@ -11,6 +11,7 @@ ygtkdiskview.cc ygtkcellrendererbutton.c + ygtkcellrenderersidebutton.c ygtknotebook.c ygtktreemodel.cc ygtktooltip.c 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 Tue Jan 26 17:10:22 2010 @@ -38,6 +38,19 @@ action_col, action_col_as_button, action_col_as_check, version_col, single_line_rows, details_start_hide, toolbar_top, toolbar_yast, arrange_by; +//** utilities + +static gboolean tree_view_row_separator_cb ( + GtkTreeModel *model, GtkTreeIter *iter, gpointer _text_col) +{ + int text_col = GPOINTER_TO_INT (_text_col); + gchar *str; + gtk_tree_model_get (model, iter, text_col, &str, -1); + bool ret = !str || !(*str); + g_free (str); + return ret; +} + //** UI components -- split up for re-usability, but mostly for readability static gboolean paint_white_expose_cb (GtkWidget *widget, GdkEventExpose *event) @@ -133,9 +146,8 @@ gtk_box_pack_start (GTK_BOX (label_box), icon, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (label_box), label, TRUE, TRUE, 0); YGtkPackageView *view = ygtk_package_view_new (FALSE); - view->setVisible ("available-version", false); -/* view->appendCheckColumn (checkCol); - view->appendTextColumn (NULL, NAME_PROP, -1, true);*/ + view->appendCheckColumn (INSTALLED_CHECK_PROP); + view->appendTextColumn (NULL, NAME_PROP, true, -1, true); view->setActivateAction (YGtkPackageView::UNDO_ACTION); view->setList (list, NULL); view->setListener (listener); @@ -1871,8 +1883,8 @@ } static bool confirmPkgs (const char *title, const char *message, - GtkMessageType icon, const Ypp::PkgList list, - const std::string &extraProp) + GtkMessageType icon, const Ypp::PkgList list, const char *extra_property_header, + int extra_property) { GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), GtkDialogFlags (0), icon, GTK_BUTTONS_NONE, "%s", title); @@ -1885,7 +1897,8 @@ gtk_widget_show_all (dialog); YGtkPackageView *view = ygtk_package_view_new (TRUE); - view->setVisible (extraProp, true); + view->appendTextColumn (_("Name"), NAME_SUMMARY_PROP, true, -1); + view->appendTextColumn (extra_property_header, extra_property, true, -1); view->setList (list, NULL); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (view), GTK_SHADOW_IN); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), GTK_WIDGET (view)); @@ -1906,7 +1919,8 @@ if (list.size() > 0) return confirmPkgs (_("Unsupported Packages"), _("Please realize that the following " "software is either unsupported or requires an additional customer contract " - "for support."), GTK_MESSAGE_WARNING, list, "support"); + "for support."), GTK_MESSAGE_WARNING, list, + _("Supportability"), SUPPORT_PROP); return true; } @@ -2132,52 +2146,82 @@ bool m_clearIcon; public: - SearchEntry (bool combo_props) : _QueryWidget() + SearchEntry (bool ver_combo) : _QueryWidget() { m_entry = gtk_entry_new(); g_signal_connect (G_OBJECT (m_entry), "realize", - G_CALLBACK (grab_focus_cb), NULL); - gtk_widget_set_size_request (m_entry, 50, -1); + G_CALLBACK (grab_focus_cb), this); + g_signal_connect (G_OBJECT (m_entry), "activate", + G_CALLBACK (activate_cb), this); + if (ver_combo) + gtk_widget_set_size_request (m_entry, 50, -1); + else + gtk_widget_set_size_request (m_entry, 150, -1); GtkWidget *entry_hbox = gtk_hbox_new (FALSE, 2), *find_label; - find_label = gtk_label_new_with_mnemonic (_("_Find:")); + find_label = gtk_label_new_with_mnemonic (_("_Search:")); gtk_box_pack_start (GTK_BOX (entry_hbox), find_label, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (entry_hbox), m_entry, TRUE, TRUE, 0); gtk_label_set_mnemonic_widget (GTK_LABEL (find_label), m_entry); + gtk_entry_set_icon_from_stock (GTK_ENTRY (m_entry), + GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_FIND); + gtk_entry_set_icon_activatable (GTK_ENTRY (editable), GTK_ENTRY_ICON_PRIMARY, TRUE); + m_clearIcon = false; g_signal_connect (G_OBJECT (m_entry), "changed", G_CALLBACK (entry_changed_cb), this); g_signal_connect (G_OBJECT (m_entry), "icon-press", G_CALLBACK (icon_press_cb), this); - m_combo = 0; - if (combo_props) { - m_combo = gtk_combo_box_new_text(); - gtk_combo_box_append_text (GTK_COMBO_BOX (m_combo), _("Name & Summary")); - gtk_combo_box_append_text (GTK_COMBO_BOX (m_combo), _("Description")); - gtk_combo_box_append_text (GTK_COMBO_BOX (m_combo), _("File List")); - gtk_combo_box_append_text (GTK_COMBO_BOX (m_combo), _("Author")); - gtk_combo_box_set_active (GTK_COMBO_BOX (m_combo), 0); - g_signal_connect (G_OBJECT (m_combo), "changed", - G_CALLBACK (combo_changed_cb), this); - - GtkWidget *opt_hbox = gtk_hbox_new (FALSE, 2), *empty = gtk_event_box_new(); + m_combo = gtk_combo_box_new_text(); + GtkWidget *opt_hbox, *empty; + gtk_combo_box_append_text (GTK_COMBO_BOX (m_combo), _("Name & Summary")); + gtk_combo_box_append_text (GTK_COMBO_BOX (m_combo), _("Description")); + gtk_combo_box_append_text (GTK_COMBO_BOX (m_combo), _("File List")); + gtk_combo_box_append_text (GTK_COMBO_BOX (m_combo), ""); + gtk_combo_box_append_text (GTK_COMBO_BOX (m_combo), "RPM Provides"); + gtk_combo_box_append_text (GTK_COMBO_BOX (m_combo), "RPM Requires"); + + opt_hbox = gtk_hbox_new (FALSE, 2); + if (ver_combo) { + empty = gtk_event_box_new(); gtk_box_pack_start (GTK_BOX (opt_hbox), empty, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (opt_hbox), gtk_label_new (_("by")), FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (opt_hbox), m_combo, TRUE, TRUE, 0); + } + gtk_box_pack_start (GTK_BOX (opt_hbox), gtk_label_new (_("by")), FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (opt_hbox), m_combo, TRUE, TRUE, 0); + if (ver_combo) { GtkSizeGroup *group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); gtk_size_group_add_widget (group, find_label); gtk_size_group_add_widget (group, empty); g_object_unref (G_OBJECT (group)); + } + +/* gtk_combo_box_append_text (GTK_COMBO_BOX (m_combo), _("by Name & Summary")); + gtk_combo_box_append_text (GTK_COMBO_BOX (m_combo), _("by Description")); + gtk_combo_box_append_text (GTK_COMBO_BOX (m_combo), _("by File List")); + gtk_combo_box_append_text (GTK_COMBO_BOX (m_combo), ""); + gtk_combo_box_append_text (GTK_COMBO_BOX (m_combo), _("by RPM Provides")); + gtk_combo_box_append_text (GTK_COMBO_BOX (m_combo), _("by RPM Requires")); +*/ + if (ver_combo) m_widget = gtk_vbox_new (FALSE, 4); - gtk_box_pack_start (GTK_BOX (m_widget), entry_hbox, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (m_widget), opt_hbox, FALSE, TRUE, 0); - } else - m_widget = entry_hbox; + m_widget = gtk_hbox_new (FALSE, 4); + gtk_box_pack_start (GTK_BOX (m_widget), entry_hbox, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (m_widget), opt_hbox, FALSE, TRUE, 0); + + gtk_combo_box_set_active (GTK_COMBO_BOX (m_combo), 0); + g_signal_connect (G_OBJECT (m_combo), "changed", + G_CALLBACK (combo_changed_cb), this); + gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (m_combo), + tree_view_row_separator_cb, GINT_TO_POINTER (0), NULL); gtk_widget_show_all (m_widget); + + gtk_widget_set_tooltip_markup (m_entry, + _("Package search: Use spaces to separate your keywords.\n" + "(usage example: a name search for \"yast dhcp\" would match yast dhcpd tool)")); } virtual GtkWidget *getWidget() { return m_widget; } @@ -2216,11 +2260,17 @@ break; case 2: writeQueryStr (subquery, "filelist", name, true, false); + //writeQueryStr (subquery, "provides", name, true, false); + break; + case 4: writeQueryStr (subquery, "provides", name, true, false); break; - case 3: - subquery->add (new Ypp::QueryProperty ("authors", name, false, true)); + case 5: + writeQueryStr (subquery, "requires", name, true, false); break; +/* case 3: + subquery->add (new Ypp::QueryProperty ("authors", name, false, true)); + break;*/ default: break; } query->add (subquery); @@ -2258,12 +2308,20 @@ static void icon_press_cb (GtkEntry *entry, GtkEntryIconPosition pos, GdkEvent *event, SearchEntry *pThis) { - gtk_entry_set_text (entry, ""); + if (pos == GTK_ENTRY_ICON_PRIMARY) + gtk_editable_select_region (GTK_EDITABLE (entry), 0, -1); + else + gtk_entry_set_text (entry, ""); gtk_widget_grab_focus (GTK_WIDGET (entry)); } static void grab_focus_cb (GtkWidget *widget) { gtk_widget_grab_focus (widget); } + + static void activate_cb (GtkEntry *entry, SearchEntry *pThis) + { + // TODO: activate package entry list + } }; class PropertyModel @@ -2273,11 +2331,11 @@ GtkTreeModel *m_filter; public: - enum Column { TEXT_COLUMN, VISIBLE_COLUMN, DATA_COLUMN, ICON_COLUMN, TOTAL_COLUMNS }; + enum Column { TEXT_COLUMN, VISIBLE_COLUMN, DATA_COLUMN, ICON_COLUMN, ENABLED_COLUMN, TOTAL_COLUMNS }; PropertyModel() { - m_store = gtk_list_store_new (TOTAL_COLUMNS, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_POINTER, G_TYPE_STRING); + m_store = gtk_list_store_new (TOTAL_COLUMNS, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_BOOLEAN); if (dynamic_sidebar) { m_filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (m_store), NULL); gtk_tree_model_filter_set_visible_column (GTK_TREE_MODEL_FILTER (m_filter), 1); @@ -2303,6 +2361,12 @@ gtk_list_store_set (store, iter, 0, _text, 1, count > 0, -1); g_free (_text); } + + void appendRow (GtkTreeIter *iter) + { + gtk_list_store_append (m_store, &iter); + gtk_list_store_set (m_store, &iter, 0, "", 1, TRUE, 2, 0, 3, NULL, 4, TRUE, -1); + } }; class StatusModel : public PropertyModel @@ -2311,23 +2375,23 @@ StatusModel() : PropertyModel() { GtkTreeIter iter; - gtk_list_store_append (m_store, &iter); + appendRow (&iter); if (!dynamic_sidebar) gtk_list_store_set (m_store, &iter, 0, _("All packages"), -1); gtk_list_store_set (m_store, &iter, 1, TRUE, 2, GINT_TO_POINTER (0), 3, NULL, -1); - gtk_list_store_append (m_store, &iter); + appendRow (&iter); if (!dynamic_sidebar) gtk_list_store_set (m_store, &iter, 0, _("Available"), -1); gtk_list_store_set (m_store, &iter, 1, TRUE, 2, GINT_TO_POINTER (1), 3, GTK_STOCK_NETWORK, -1); - gtk_list_store_append (m_store, &iter); + appendRow (&iter); if (!dynamic_sidebar) gtk_list_store_set (m_store, &iter, 0, _("Installed"), -1); gtk_list_store_set (m_store, &iter, 1, TRUE, 2, GINT_TO_POINTER (2), 3, GTK_STOCK_HARDDISK, -1); - gtk_list_store_append (m_store, &iter); + appendRow (&iter); if (!dynamic_sidebar) gtk_list_store_set (m_store, &iter, 0, _("Upgrades"), -1); gtk_list_store_set (m_store, &iter, 1, TRUE, 2, GINT_TO_POINTER (3), 3, GTK_STOCK_GO_UP, -1); - gtk_list_store_append (m_store, &iter); + appendRow (&iter); if (!dynamic_sidebar) gtk_list_store_set (m_store, &iter, 0, _("Summary"), -1); gtk_list_store_set (m_store, &iter, 1, TRUE, 2, GINT_TO_POINTER (4), 3, NULL, -1); @@ -2405,7 +2469,7 @@ gtk_list_store_clear (m_store); GtkTreeIter iter; - gtk_list_store_append (m_store, &iter); + appendRow (&iter); if (!dynamic_sidebar) gtk_list_store_set (m_store, &iter, 0, _("All packages"), -1); gtk_list_store_set (m_store, &iter, 1, TRUE, 2, NULL, ICON_COLUMN, NULL, -1); @@ -2415,7 +2479,7 @@ else category = Ypp::get()->getFirstCategory (type); for (; category; category = category->next()) { - gtk_list_store_append (m_store, &iter); + appendRow (&iter); if (!dynamic_sidebar) gtk_list_store_set (m_store, &iter, 0, category->name.c_str(), -1); gtk_list_store_set (m_store, &iter, 1, TRUE, 2, category, ICON_COLUMN, category->icon, -1); @@ -2468,31 +2532,23 @@ RepositoryModel() : PropertyModel() { GtkTreeIter iter; - gtk_list_store_append (m_store, &iter); + appendRow (&iter); if (!dynamic_sidebar) gtk_list_store_set (m_store, &iter, 0, _("All packages"), -1); gtk_list_store_set (m_store, &iter, 1, TRUE, 2, NULL, ICON_COLUMN, NULL, -1); for (int i = 0; Ypp::get()->getRepository (i); i++) { const Ypp::Repository *repo = Ypp::get()->getRepository (i); - gtk_list_store_append (m_store, &iter); + appendRow (&iter); if (!dynamic_sidebar) { if (big_icons_sidebar) gtk_list_store_set (m_store, &iter, 0, (repo->name + '\n' + repo->url).c_str(), -1); else gtk_list_store_set (m_store, &iter, 0, repo->name.c_str(), -1); } - gtk_list_store_set (m_store, &iter, 1, TRUE, 2, repo, -1); + gtk_list_store_set (m_store, &iter, 1, TRUE, 2, repo, , + ENABLED_COLUMN, repo->enabled, -1); - const gchar *icon; - if (repo->url.empty()) - icon = GTK_STOCK_MISSING_IMAGE; - else if (repo->url.compare (0, 2, "cd", 2) == 0 || - repo->url.compare (0, 3, "dvd", 3) == 0) - icon = GTK_STOCK_CDROM; - else if (repo->url.compare (0, 3, "iso", 3) == 0) - icon = GTK_STOCK_FILE; - else - icon = GTK_STOCK_NETWORK; + const gchar *icon = getRepositoryStockIcon (repo->url); gtk_list_store_set (m_store, &iter, ICON_COLUMN, icon, -1); } } @@ -2568,12 +2624,12 @@ if (icons_sidebar || big_icons_sidebar) { GtkCellRenderer *renderer = gtk_cell_renderer_pixbuf_new(); column = gtk_tree_view_column_new_with_attributes (NULL, - renderer, "icon-name", PropertyModel::ICON_COLUMN, NULL); + renderer, "icon-name", PropertyModel::ICON_COLUMN, "sensitive", PropertyModel::ENABLED_COLUMN, NULL); g_object_set (G_OBJECT (renderer), "stock-size", big_icons_sidebar ? GTK_ICON_SIZE_LARGE_TOOLBAR : GTK_ICON_SIZE_MENU, NULL); gtk_tree_view_append_column (tview, column); } column = gtk_tree_view_column_new_with_attributes ( - NULL, renderer, "markup", PropertyModel::TEXT_COLUMN, NULL); + NULL, renderer, "markup", PropertyModel::TEXT_COLUMN, "sensitive", PropertyModel::ENABLED_COLUMN, NULL); gtk_tree_view_append_column (tview, column); GtkWidget *scroll = gtk_scrolled_window_new (NULL, NULL); @@ -2719,7 +2775,8 @@ { pThis->notify(); } }; -#define BROWSER_PATH "/usr/bin/firefox" +#if 0 +#define BROWSER_BIN "/usr/bin/firefox" class DetailBox { @@ -2729,8 +2786,7 @@ public: GtkWidget *getWidget() { return m_widget; } - DetailBox() - : m_link_popup (NULL) + DetailBox() : m_link_popup (NULL) { m_text = ygtk_rich_text_new(); /* @@ -2738,6 +2794,7 @@ _("Write a little introductory text here")); */ YGtkPackageView *view = ygtk_package_view_new (TRUE); + view->appendTextColumn (_("Name"), NAME_SUMMARY_PROP, true, -1, true); m_pkg_view = GTK_WIDGET (view); //gtk_widget_set_size_request (m_pkg_view, -1, 200); @@ -2789,7 +2846,7 @@ gtk_menu_attach_to_widget (GTK_MENU (menu), GTK_WIDGET (text), NULL); GtkWidget *item; - if (g_file_test (BROWSER_PATH, G_FILE_TEST_IS_EXECUTABLE)) { + if (g_file_test (BROWSER_BIN, G_FILE_TEST_IS_EXECUTABLE)) { std::string label; if (getuid() == 0) { const char *username = getenv ("USERNAME"); @@ -2836,12 +2893,12 @@ if (username) { command += "gnomesu -u "; command += username; - command += " -c \"" BROWSER_PATH " --new-window "; + command += " -c \"" BROWSER_BIN " --new-window "; command += link; command += "\""; } else { - command += BROWSER_PATH " --new-window "; + command += BROWSER_BIN " --new-window "; command += link; } command += " &"; @@ -2856,6 +2913,7 @@ gtk_clipboard_set_text (clipboard, link.c_str(), -1); } }; +#endif class Toolbar { @@ -2918,10 +2976,9 @@ gtk_widget_set_sensitive (m_remove_button, FALSE); } else { - bool installed = list.installed(); - gtk_widget_set_sensitive (m_install_button, !installed); - gtk_widget_set_sensitive (m_remove_button, installed); - gtk_widget_set_sensitive (m_upgrade_button, list.upgradable()); + gtk_widget_set_sensitive (m_install_button, list.isNotInstalled()); + gtk_widget_set_sensitive (m_remove_button, list.isInstalled()); + gtk_widget_set_sensitive (m_upgrade_button, list.hasUpgrade()); } } @@ -3309,16 +3366,17 @@ class UndoBox : public Ypp::PkgList::Listener { -GtkWidget *m_undo_box, *m_undo_package, *m_undo_details, *m_title; +GtkWidget *m_undo_box, *m_action_image, *m_package_label, *m_dependencies_label, *m_undo_button, *m_undo_details, *m_to_download_label, *m_to_occupy_label, *m_title, *m_disk_combo, *m_disk_label, *m_disk_delta_label, *m_package_box, *m_details_link; Ypp::PkgList m_pool; Ypp::Package *m_package; bool m_closed; +int m_autoNb; public: GtkWidget *getWidget() { return m_undo_box; } - UndoBox() : m_closed (false) + UndoBox() : m_closed (false), m_autoNb (0) { Ypp::QueryBase *query = new Ypp::QueryProperty ("to-modify", true); // if (pkg_selector->onlineUpdateMode()) @@ -3326,11 +3384,13 @@ // TODO: there could already be packages modified m_pool.addListener (this); + GtkWidget *hbox; 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); - m_title = gtk_label_new (_("Software changes")); + + GtkWidget *main_box = gtk_vbox_new (FALSE, 2); + gtk_container_set_border_width (GTK_CONTAINER (main_box), 6); + gtk_container_add (GTK_CONTAINER (m_undo_box), main_box); + m_title = gtk_label_new (""); 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")); @@ -3339,30 +3399,72 @@ 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); - GtkWidget *undo_button = gtk_button_new_from_stock (GTK_STOCK_UNDO); + gtk_box_pack_start (GTK_BOX (main_box), title_box, TRUE, TRUE, 0); + + GtkWidget *undo_button, *undo_align; + m_package_box = gtk_vbox_new (FALSE, 2); + hbox = gtk_hbox_new (FALSE, 2); + m_action_image = gtk_image_new(); + GtkWidget *label_vbox = gtk_vbox_new (TRUE, 0); + m_package_label = gtk_label_new (""); + gtk_misc_set_alignment (GTK_MISC (m_package_label), 0, .5); + m_dependencies_label = gtk_label_new (""); + gtk_misc_set_alignment (GTK_MISC (m_dependencies_label), 0, .5); + undo_button = gtk_button_new_from_stock (GTK_STOCK_UNDO); + undo_align = gtk_alignment_new (1, 0, 0, 0); + gtk_container_add (GTK_CONTAINER (undo_align), undo_button); 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); - 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); + gtk_box_pack_start (GTK_BOX (label_vbox), m_package_label, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (label_vbox), m_dependencies_label, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), m_action_image, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), label_vbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), undo_align, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (m_package_box), hbox, TRUE, TRUE, 0); + + m_to_download_label = gtk_label_new (_("To download: X")); + gtk_misc_set_alignment (GTK_MISC (m_to_download_label), 0, .5); + gtk_box_pack_start (GTK_BOX (m_package_box), m_to_download_label, TRUE, TRUE, 0); + + m_to_occupy_label = gtk_label_new (""); + gtk_misc_set_alignment (GTK_MISC (m_to_occupy_label), 0, .5); + gtk_box_pack_start (GTK_BOX (m_package_box), m_to_occupy_label, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (main_box), m_package_box, TRUE, TRUE, 0); + + hbox = gtk_hbox_new (FALSE, 4); + GtkWidget *icon = gtk_image_new_from_stock (GTK_STOCK_HARDDISK, GTK_ICON_SIZE_MENU); + m_disk_combo = gtk_combo_box_new_text(); + Ypp::Disk *disk = Ypp::get()->getDisk(); + for (int i = 0; disk->getPartition (i); i++) { + const Ypp::Disk::Partition *part = disk->getPartition (i); + gtk_combo_box_append_text (GTK_COMBO_BOX (m_disk_combo), part->path.c_str()); + if (part->path == "/usr" || part->path == "/usr/" || part->path == "/") { + if (gtk_combo_box_get_active (GTK_COMBO_BOX (m_disk_combo)) == -1 || part->path != "/") + gtk_combo_box_set_active (GTK_COMBO_BOX (m_disk_combo), i); + } + } + m_disk_label = gtk_label_new (""); + m_disk_delta_label = gtk_label_new (""); + YGUtils::setWidgetFont (m_disk_delta_label, PANGO_STYLE_ITALIC, PANGO_WEIGHT_NORMAL, PANGO_SCALE_MEDIUM); + GtkWidget *disk_label = gtk_frame_new (NULL); + gtk_container_add (GTK_CONTAINER (disk_label), m_disk_label); + gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), m_disk_combo, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), disk_label, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), m_disk_delta_label, FALSE, TRUE, 0); + g_signal_connect (G_OBJECT (m_disk_combo), "changed", + G_CALLBACK (disk_combo_changed_cb), this); + gtk_box_pack_start (GTK_BOX (main_box), hbox, TRUE, TRUE, 0); + + char *details_str = g_strdup_printf ("<a href=\"details\">%s</a>", _("View all changes...")); + m_details_link = gtk_label_new (details_str); + gtk_label_set_use_markup (GTK_LABEL (m_details_link), 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", + gtk_label_set_track_visited_links (GTK_LABEL (m_details_link), FALSE); + gtk_misc_set_alignment (GTK_MISC (m_details_link), 1, .5); + g_signal_connect (G_OBJECT (m_details_link), "activate-link", G_CALLBACK (details_link_cb), this); - - // TODO: start by showing available disk space + gtk_box_pack_start (GTK_BOX (main_box), m_details_link, TRUE, TRUE, 0); } ~UndoBox() @@ -3371,27 +3473,55 @@ } void startHack() // call after init, after you did a show_all in the dialog - { gtk_widget_hide (m_undo_box); } + { + //gtk_widget_hide (m_undo_box); + gtk_widget_hide (m_package_box); + gtk_widget_hide (m_details_link); + setHasChanges (false); + } + + void setHasChanges (bool hasChanges) + { + const char *title = hasChanges ? _("Software changes") : _("Available space"); + gtk_label_set_text (GTK_LABEL (m_title), title); + hasChanges ? gtk_widget_show (m_package_box) : gtk_widget_hide (m_package_box); + } void setPackage (Ypp::Package *package) { if (m_closed) return; - m_package = package; + setHasChanges (true); + gtk_widget_show (m_details_link); - std::string action; - if (package->toInstall()) { - if (package->isInstalled()) - action = _("upgrade"); - else - action = _("add"); + gchar *str; + if (package->isAuto()) { + m_autoNb++; + gchar *str = g_strdup_printf ("\u26ab %s %d %s", _("plus"), m_autoNb, _("dependencies")); + gtk_label_set_text (GTK_LABEL (m_dependencies_label), str); + g_free (str); } - else //if (package->toRemove()) - action = _("remove"); + else { + m_package = package; + m_autoNb = 0; - 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); + str = g_strdup_printf ("\u26ab %s", package->name().c_str()); + gtk_label_set_text (GTK_LABEL (m_package_label), str); + g_free (str); + gtk_label_set_text (GTK_LABEL (m_dependencies_label), ""); + + const char *stock; + if (package->toInstall()) { + if (package->isInstalled()) + stock = GTK_STOCK_GO_UP; + else + stock = GTK_STOCK_SAVE; + } + else //if (package->toRemove()) + stock = GTK_STOCK_DELETE; + gtk_image_set_from_stock (GTK_IMAGE (m_action_image), stock, GTK_ICON_SIZE_BUTTON); + } +/* const Ypp::PkgList packages (Ypp::get()->getPackages (Ypp::Package::PACKAGE_TYPE)); int added = 0, removed = 0; for (int i = 0; i < packages.size(); i++) { @@ -3401,15 +3531,6 @@ 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); - // 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; - } - gchar *added_str = 0, *removed_str = 0; if (added) added_str = g_strdup_printf (_("Added %d packages\n"), added); @@ -3417,21 +3538,47 @@ 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); +*/ + 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; + if (part->path == "/") + break; + } + } + + str = g_strdup_printf (_("To occupy: %s"), delta_str.c_str()); + gtk_label_set_text (GTK_LABEL (m_to_occupy_label), str); + g_free (str); + + updateDisk(); gtk_widget_show (m_undo_box); } + void updateDisk() + { + int n = gtk_combo_box_get_active (GTK_COMBO_BOX (m_disk_combo)); + const Ypp::Disk::Partition *part = Ypp::get()->getDisk()->getPartition (n); + gchar *str = g_strdup_printf (_("%s free out of %s"), part->free_str.c_str(), part->total_str.c_str()); + gtk_label_set_text (GTK_LABEL (m_disk_label), str); + part->delta == 0 ? gtk_widget_hide (m_disk_label) : gtk_widget_show (m_disk_label); + g_free (str); + gtk_label_set_text (GTK_LABEL (m_disk_delta_label), part->delta_str.c_str()); + } + 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) - { if (package == m_package) gtk_widget_hide (m_undo_box); } + { if (package == m_package) setHasChanges (false); } virtual void entryChanged (const Ypp::PkgList list, int index, Ypp::Package *package) {} @@ -3496,6 +3643,9 @@ delete changes; return TRUE; } + + static void disk_combo_changed_cb (GtkComboBox *combo, UndoBox *pThis) + { pThis->updateDisk(); } }; class UI : public YGtkPackageView::Listener, _QueryListener, Ypp::Disk::Listener @@ -3503,7 +3653,7 @@ GtkWidget *m_widget, *m_disk_label, *m_arrange_combo; YGtkPackageView *m_all_view, *m_installed_view, *m_available_view, *m_upgrades_view; std::list <_QueryWidget *> m_query; -DetailBox *m_details; +GtkWidget *m_details; DiskView *m_disk; StartupMenu *m_startup_menu; Ypp::Package::Type m_type; @@ -3532,7 +3682,7 @@ if (search_entry_top) { search_entry = new SearchEntry (false); m_query.push_back (search_entry); - gtk_widget_set_size_request (search_entry->getWidget(), 160, -1); + //gtk_widget_set_size_request (search_entry->getWidget(), 160, -1); } UndoView *undo_view = 0; @@ -3542,10 +3692,13 @@ GtkWidget *packages_view; if (status_tabs) { m_installed_view = ygtk_package_view_new (TRUE); + m_installed_view->appendTextColumn (_("Name"), NAME_SUMMARY_PROP, true, -1, true); m_installed_view->setListener (this); m_available_view = ygtk_package_view_new (TRUE); + m_available_view->appendTextColumn (_("Name"), NAME_SUMMARY_PROP, true, -1, true); m_available_view->setListener (this); m_upgrades_view = ygtk_package_view_new (TRUE); + m_upgrades_view->appendTextColumn (_("Name"), NAME_SUMMARY_PROP, true, -1, true); m_upgrades_view->setListener (this); packages_view = ygtk_notebook_new(); @@ -3581,12 +3734,18 @@ } else { m_all_view = ygtk_package_view_new (TRUE); + m_all_view->appendCheckColumn (INSTALLED_CHECK_PROP); + m_all_view->appendTextColumn (_("Name"), NAME_SUMMARY_PROP, true, -1); + m_all_view->appendTextColumn (_("Version"), VERSION_PROP, true, 120); + m_all_view->appendTextColumn (_("Size"), SIZE_PROP, true, 80); + m_all_view->appendTextColumn (_("Repository"), REPOSITORY_PROP, false, 180); + m_all_view->appendTextColumn (_("Supportability"), SUPPORT_PROP, false, 120); m_all_view->setListener (this); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (m_all_view), GTK_SHADOW_IN); packages_view = GTK_WIDGET (m_all_view); } - GtkWidget *packages_box = gtk_vbox_new (FALSE, 4); + GtkWidget *packages_box = gtk_vbox_new (FALSE, 2); if (arrange_by) { GtkWidget *arrange_box = gtk_hbox_new (FALSE, 4); gtk_box_pack_start (GTK_BOX (arrange_box), gtk_label_new (_("Software arranged by")), FALSE, TRUE, 0); @@ -3604,7 +3763,7 @@ { GtkWidget *header_box = gtk_hbox_new (FALSE, 6); - GtkWidget *header = gtk_label_new_with_mnemonic (_("_Listing:")); + GtkWidget *header = gtk_label_new_with_mnemonic (_("Packages _listing:")); gtk_misc_set_alignment (GTK_MISC (header), 0, .5); gtk_label_set_mnemonic_widget (GTK_LABEL (header), GTK_WIDGET (m_all_view)); gtk_box_pack_start (GTK_BOX (header_box), header, TRUE, TRUE, 0); @@ -3659,9 +3818,10 @@ GtkWidget *view_pane = gtk_vpaned_new(); gtk_paned_pack1 (GTK_PANED (view_pane), packages_pane, TRUE, FALSE); - m_details = new DetailBox(); - gtk_paned_pack2 (GTK_PANED (view_pane), m_details->getWidget(), FALSE, TRUE); - gtk_paned_set_position (GTK_PANED (view_pane), 500); + + m_details = ygtk_detail_view_new (sel->onlineUpdateMode()); + gtk_paned_pack2 (GTK_PANED (view_pane), m_details, FALSE, TRUE); + gtk_paned_set_position (GTK_PANED (view_pane), 460); #if 0 GtkWidget *combo = gtk_combo_box_new_text(); @@ -3814,6 +3974,7 @@ GtkWidget *vpaned = gtk_vpaned_new(); gtk_paned_pack1 (GTK_PANED (vpaned), stack1->getWidget(), TRUE, FALSE); gtk_paned_pack2 (GTK_PANED (vpaned), stack2->getWidget(), TRUE, FALSE); + gtk_paned_set_position (GTK_PANED (vpaned), 480); gtk_box_pack_start (GTK_BOX (side_vbox), vpaned, TRUE, TRUE, 0); } @@ -3838,9 +3999,7 @@ gtk_widget_show_all (m_widget); if (details_start_hide) - gtk_widget_hide (m_details->getWidget()); - else - m_details->setPackage (NULL); + gtk_widget_hide (m_details); if (!categories_side && !search_entry_side && !status_side) gtk_widget_hide (side_vbox); if (changes_pane) @@ -3993,7 +4152,7 @@ virtual void packagesSelected (Ypp::PkgList packages) { - m_details->setPackage (packages.size() ? packages.get (0) : NULL); + YGTK_DETAIL_VIEW (m_details)->setPackages (packages); if (m_toolbar) m_toolbar->setPackages (packages); } @@ -4080,7 +4239,7 @@ ygtk_wizard_set_button_str_id (wizard, wizard->abort_button, "cancel"); ygtk_wizard_set_button_label (wizard, wizard->back_button, NULL, NULL); ygtk_wizard_set_button_label (wizard, wizard->next_button, - _("A_pply"), GTK_STOCK_APPLY); + _("_Apply"), GTK_STOCK_APPLY); ygtk_wizard_set_button_str_id (wizard, wizard->next_button, "accept"); g_signal_connect (G_OBJECT (wizard), "action-triggered", G_CALLBACK (wizard_action_cb), this); @@ -4091,39 +4250,65 @@ 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); + GtkWidget *menu_bar = gtk_menu_bar_new(), *item, *submenu, *sub3menu, *subitem; + item = append_menu_item (menu_bar, _("File"), NULL, NULL, NULL); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), (submenu = gtk_menu_new())); + append_menu_item (submenu, _("Import..."), NULL, + G_CALLBACK (import_file_cb), this); + append_menu_item (submenu, _("Export..."), NULL, + G_CALLBACK (export_file_cb), this); + append_menu_item (submenu, NULL, NULL, NULL, NULL); + append_menu_item (submenu, NULL, GTK_STOCK_APPLY, NULL, this); + append_menu_item (submenu, NULL, GTK_STOCK_QUIT, NULL, this); + item = append_menu_item (menu_bar, _("Package"), NULL, NULL, NULL); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), (submenu = gtk_menu_new())); + append_menu_item (submenu, _("Install"), NULL, NULL, this); + append_menu_item (submenu, _("Do Not Install"), NULL, NULL, this); + append_menu_item (submenu, _("Keep"), NULL, NULL, this); + append_menu_item (submenu, _("Delete"), NULL, NULL, this); + append_menu_item (submenu, _("Taboo -- Never Install"), NULL, NULL, this); + //append_menu_item (submenu, _("Show solver information"), NULL, NULL, this); + append_menu_item (submenu, NULL, NULL, NULL, NULL); + subitem = append_menu_item (submenu, _("All in This List"), NULL, NULL, NULL); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (subitem), (sub3menu = gtk_menu_new())); + append_menu_item (sub3menu, _("Install"), NULL, NULL, this); + append_menu_item (sub3menu, _("Do Not Install"), NULL, NULL, this); + append_menu_item (sub3menu, _("Keep"), NULL, NULL, this); + append_menu_item (sub3menu, _("Delete"), NULL, NULL, this); + append_menu_item (sub3menu, _("Update if newer version available"), NULL, NULL, this); + append_menu_item (sub3menu, _("Update unconditionally"), NULL, NULL, this); + append_menu_item (sub3menu, _("Taboo -- Never Install"), NULL, NULL, this); + append_menu_item (sub3menu, _("Protected -- Do Not Modify"), NULL, NULL, this); + subitem = append_menu_item (submenu, _("All Packages"), NULL, NULL, NULL); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (subitem), (sub3menu = gtk_menu_new())); + append_menu_item (sub3menu, _("Update if newer version available"), NULL, NULL, this); + append_menu_item (sub3menu, _("Update unconditionally"), NULL, NULL, this); + item = append_menu_item (menu_bar, _("Configuration"), NULL, NULL, NULL); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), (submenu = gtk_menu_new())); + append_menu_item (submenu, _("Repositories..."), NULL, NULL, this); + append_menu_item (submenu, _("Online Update..."), NULL, NULL, this); + append_menu_item (submenu, _("Search Packages on Web..."), NULL, NULL, this); + item = append_menu_item (menu_bar, _("Dependencies"), NULL, NULL, NULL); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), (submenu = gtk_menu_new())); + append_menu_item (submenu, _("Check Now"), NULL, NULL, this); + append_menu_item (submenu, _("Autocheck"), NULL, NULL, this); + item = append_menu_item (menu_bar, _("Options"), NULL, NULL, NULL); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), (submenu = gtk_menu_new())); + append_menu_item (submenu, _("Show -devel packages"), NULL, NULL, this); + append_menu_item (submenu, _("Show -debuginfo/-debugsource Packages"), NULL, NULL, this); + append_menu_item (submenu, _("System Verification Mode"), NULL, NULL, this); + item = append_menu_item (menu_bar, _("Extras"), NULL, NULL, NULL); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), (submenu = gtk_menu_new())); + append_menu_item (submenu, _("Show Products"), NULL, NULL, this); + append_menu_item (submenu, _("Show Package Changes"), NULL, NULL, this); + append_menu_item (submenu, NULL, NULL, NULL, NULL); + append_menu_item (submenu, _("Install All Matching -debug-info Packages"), NULL, NULL, this); + append_menu_item (submenu, _("Install All Matching -debug-source Packages"), NULL, NULL, this); + append_menu_item (submenu, NULL, NULL, NULL, NULL); + append_menu_item (submenu, _("Generate Dependency Resolver Test Case"), NULL, NULL, this); + append_menu_item (submenu, _("Reset Ignored Dependency Conflicts"), NULL, NULL, this); gtk_widget_show_all (menu_bar); - ygtk_wizard_set_custom_menu (wizard, menu_bar); -#endif + ygtk_wizard_set_custom_menu (wizard, menu_bar, FALSE); m_progressbar = gtk_progress_bar_new(); GtkWidget *empty = gtk_event_box_new(); @@ -4215,7 +4400,7 @@ return confirmPkgs (_("Dependencies from Filtered Repositories"), _("The following packages have necessary dependencies that are not provided " "by the filtered repository. Install them?"), GTK_MESSAGE_WARNING, list, - "repository"); + _("Repository"), REPOSITORY_PROP); } virtual void loading (float progress) @@ -4240,6 +4425,28 @@ } } + // utilities + static GtkWidget *append_menu_item (GtkWidget *menu, const char *text, + const char *stock, GCallback callback, gpointer callback_data) + { + GtkWidget *item; + if (stock && text) { + GtkWidget *icon = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_MENU); + item = gtk_image_menu_item_new_with_label (text); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), icon); + } + else if (text) + item = gtk_menu_item_new_with_label (text); + else if (stock) + item = gtk_image_menu_item_new_from_stock (stock, NULL); + else + item = gtk_separator_menu_item_new(); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + if (callback) + g_signal_connect (G_OBJECT (item), "activate", callback, callback_data); + return item; + } + YGWIDGET_IMPL_COMMON (YPackageSelector) }; Modified: trunk/gtk/src/pkg/ygtkdetailview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkdetailview.cc?re… ============================================================================== --- trunk/gtk/src/pkg/ygtkdetailview.cc (original) +++ trunk/gtk/src/pkg/ygtkdetailview.cc Tue Jan 26 17:10:22 2010 @@ -24,432 +24,411 @@ //** Utilities -#define BROWSER_PATH "/usr/bin/firefox" -#define GNOME_OPEN_PATH "/usr/bin/gnome-open" -inline bool CAN_OPEN_URL() -{ return g_file_test (BROWSER_PATH, G_FILE_TEST_IS_EXECUTABLE); } -inline bool CAN_OPEN_DIRNAME() -{ return g_file_test (GNOME_OPEN_PATH, G_FILE_TEST_IS_EXECUTABLE); } - -void run (const std::string &cmd, bool as_user) -{ - std::string prepend, append; - if (as_user && getuid() == 0) { - char *username = getenv ("USERNAME"); - if (username && *username && strcmp (username, "root") != 0) { - prepend.reserve (64); - prepend = "gnomesu -u "; - prepend += username; - prepend += " -c \""; - append = "\""; - } - } - system (((prepend + cmd + append) + " &").c_str()); -} - -void OPEN_URL (const char *uri) -{ - std::string command; - command.reserve (256); - command = BROWSER_PATH " --new-window "; - command += uri; - run (command, true); -} -void OPEN_DIRNAME (const char *uri) -{ - std::string command; - command.reserve (256); - command = GNOME_OPEN_PATH " "; - command += uri; - run (command, false); -} +#define BROWSER_BIN "/usr/bin/firefox" +#define GNOME_OPEN_BIN "/usr/bin/gnome-open" static const char *onlyInstalledMsg = _("Information only available for installed packages."); //** Detail & control -class YGtkDetailView::Impl -{ -private: - struct Versions : public Ypp::PkgList::Listener { - GtkWidget *m_box, *m_versions_box, *m_button, *m_undo_button; - Ypp::PkgList m_packages; // we keep a copy to test against modified... - bool m_onlineUpdate; - - GtkWidget *getWidget() { return m_box; } - - Versions (bool onlineUpdate) : m_onlineUpdate (onlineUpdate) - { - GtkWidget *label = gtk_label_new (_("Versions:")); - YGUtils::setWidgetFont (label, PANGO_STYLE_NORMAL, PANGO_WEIGHT_BOLD, PANGO_SCALE_MEDIUM); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); - - m_versions_box = gtk_vbox_new (FALSE, 2); - m_button = gtk_button_new_with_label (""); - g_signal_connect (G_OBJECT (m_button), "clicked", G_CALLBACK (button_clicked_cb), this); - GtkSettings *settings = gtk_settings_get_default(); - gboolean show_button_images; - g_object_get (settings, "gtk-button-images", &show_button_images, NULL); - if (show_button_images) { - m_undo_button = gtk_button_new_with_label (""); - gtk_button_set_image (GTK_BUTTON (m_undo_button), - gtk_image_new_from_stock (GTK_STOCK_UNDO, GTK_ICON_SIZE_BUTTON)); - gtk_widget_set_tooltip_text (m_undo_button, _("Undo")); - } - else - m_undo_button = gtk_button_new_with_label (_("Undo")); - g_signal_connect (G_OBJECT (m_undo_button), "clicked", G_CALLBACK (undo_clicked_cb), this); - GtkWidget *button_box = gtk_hbox_new (FALSE, 6); - gtk_box_pack_start (GTK_BOX (button_box), gtk_label_new(""), TRUE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (button_box), m_button, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (button_box), m_undo_button, FALSE, TRUE, 0); - - m_box = gtk_vbox_new (FALSE, 6); - gtk_box_pack_start (GTK_BOX (m_box), label, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (m_box), m_versions_box, TRUE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (m_box), button_box, FALSE, TRUE, 0); - - // PkgList::addListeners() isn't currently working for ordinary PkgList - // other than getPackages(), thus this hack. - if (!m_onlineUpdate) - Ypp::get()->getPackages (Ypp::Package::PACKAGE_TYPE).addListener (this); - } - - ~Versions() - { - if (!m_onlineUpdate) - Ypp::get()->getPackages (Ypp::Package::PACKAGE_TYPE).removeListener (this); - } - - void setPackages (Ypp::PkgList packages) - { - m_packages = packages; - - GList *children = gtk_container_get_children (GTK_CONTAINER (m_versions_box)); - for (GList *i = children; i; i = i->next) - gtk_container_remove (GTK_CONTAINER (m_versions_box), (GtkWidget *) i->data); - g_list_free (children); - - if (packages.size() == 0) { - gtk_widget_hide (m_box); - return; - } - gtk_widget_show (m_box); - if (packages.size() == 1) { - Ypp::Package *package = packages.get (0); +struct Versions { + GtkWidget *m_box, *m_versions_box, *m_button, *m_undo_button; + Ypp::PkgList m_packages; + + GtkWidget *getWidget() { return m_box; } + + Versions() + { + m_versions_box = gtk_vbox_new (FALSE, 2); + m_button = gtk_button_new_with_label (""); + g_signal_connect (G_OBJECT (m_button), "clicked", G_CALLBACK (button_clicked_cb), this); + GtkSettings *settings = gtk_settings_get_default(); + gboolean show_button_images; + g_object_get (settings, "gtk-button-images", &show_button_images, NULL); + if (show_button_images) { + m_undo_button = gtk_button_new_with_label (""); + gtk_button_set_image (GTK_BUTTON (m_undo_button), + gtk_image_new_from_stock (GTK_STOCK_UNDO, GTK_ICON_SIZE_BUTTON)); + gtk_widget_set_tooltip_text (m_undo_button, _("Undo")); + } + else + m_undo_button = gtk_button_new_with_label (_("Undo")); + g_signal_connect (G_OBJECT (m_undo_button), "clicked", G_CALLBACK (undo_clicked_cb), this); + GtkWidget *button_box = gtk_hbox_new (FALSE, 6); + gtk_box_pack_start (GTK_BOX (button_box), gtk_label_new(""), TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (button_box), m_button, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (button_box), m_undo_button, FALSE, TRUE, 0); + + m_box = gtk_vbox_new (FALSE, 6); + gtk_box_pack_start (GTK_BOX (m_box), m_versions_box, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (m_box), button_box, FALSE, TRUE, 0); + g_object_set_data (G_OBJECT (getWidget()), "class", this); + } - int children = 0; - GtkWidget *radio = 0; - const Ypp::Package::Version *version; - if ((version = package->getInstalledVersion())) { - std::string _version = YGUtils::truncate (version->number, 20, 0); - - bool italic = package->toRemove(); - char *text = g_strdup_printf ("%s%s (%s)\n%s%s", - italic ? "" : "", - _version.c_str(), version->arch.c_str(), _("Installed"), - italic ? "" : ""); - radio = gtk_radio_button_new_with_label (NULL, text); - gtk_label_set_use_markup (GTK_LABEL (GTK_BIN (radio)->child), TRUE); - if (version->number.size() > 20) { - char *text = g_strdup_printf ("%s (%s)\n%s", - version->number.c_str(), version->arch.c_str(), _("Installed")); - gtk_widget_set_tooltip_markup (radio, text); - g_free (text); - } - gtk_box_pack_start (GTK_BOX (m_versions_box), radio, FALSE, TRUE, 0); + void setPackages (Ypp::PkgList packages) + { + m_packages = packages; + + GList *children = gtk_container_get_children (GTK_CONTAINER (m_versions_box)); + for (GList *i = children; i; i = i->next) + gtk_container_remove (GTK_CONTAINER (m_versions_box), (GtkWidget *) i->data); + g_list_free (children); + + if (packages.size() == 0) { + gtk_widget_hide (m_box); + return; + } + gtk_widget_show (m_box); + if (packages.size() == 1) { + Ypp::Package *package = packages.get (0); + + int children = 0; + GtkWidget *radio = 0; + const Ypp::Package::Version *version; + if ((version = package->getInstalledVersion())) { + std::string _version = YGUtils::truncate (version->number, 20, 0); + + bool italic = package->toRemove(); + char *text = g_strdup_printf ("%s%s (%s)\n%s%s", + italic ? "" : "", + _version.c_str(), version->arch.c_str(), _("Installed"), + italic ? "" : ""); + radio = gtk_radio_button_new_with_label (NULL, text); + gtk_label_set_use_markup (GTK_LABEL (GTK_BIN (radio)->child), TRUE); + if (version->number.size() > 20) { + char *text = g_strdup_printf ("%s (%s)\n%s", + version->number.c_str(), version->arch.c_str(), _("Installed")); + gtk_widget_set_tooltip_markup (radio, text); g_free (text); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), TRUE); - g_object_set_data (G_OBJECT (radio), "version", (void *) version); - g_signal_connect (G_OBJECT (radio), "toggled", - G_CALLBACK (version_toggled_cb), this); - children++; } - bool activeSet = package->toRemove(); - const Ypp::Package::Version *toInstall = 0; - if (!package->toInstall (&toInstall)) - toInstall = 0; - const Ypp::Repository *favoriteRepo = Ypp::get()->favoriteRepository(); - for (int i = 0; (version = package->getAvailableVersion (i)); i++) { - std::string _version = YGUtils::truncate (version->number, 20, 0); - std::string repo; - if (version->repo) - repo = YGUtils::truncate (version->repo->name, 22, 0); - - bool italic = toInstall == version; - char *text = g_strdup_printf ("%s%s (%s)\n%s%s", - italic ? "" : "", - _version.c_str(), version->arch.c_str(), repo.c_str(), - italic ? "" : ""); - radio = gtk_radio_button_new_with_label_from_widget ( - GTK_RADIO_BUTTON (radio), text); - gtk_label_set_use_markup (GTK_LABEL (GTK_BIN (radio)->child), TRUE); + gtk_box_pack_start (GTK_BOX (m_versions_box), radio, FALSE, TRUE, 0); + g_free (text); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), TRUE); + g_object_set_data (G_OBJECT (radio), "version", (void *) version); + g_signal_connect (G_OBJECT (radio), "toggled", + G_CALLBACK (version_toggled_cb), this); + children++; + } + bool activeSet = package->toRemove(); + const Ypp::Package::Version *toInstall = 0; + if (!package->toInstall (&toInstall)) + toInstall = 0; + const Ypp::Repository *favoriteRepo = Ypp::get()->favoriteRepository(); + for (int i = 0; (version = package->getAvailableVersion (i)); i++) { + std::string _version = YGUtils::truncate (version->number, 20, 0); + std::string repo; + if (version->repo) + repo = YGUtils::truncate (version->repo->name, 22, 0); + + bool italic = toInstall == version; + char *text = g_strdup_printf ("%s%s (%s)\n%s%s", + italic ? "" : "", + _version.c_str(), version->arch.c_str(), repo.c_str(), + italic ? "" : ""); + radio = gtk_radio_button_new_with_label_from_widget ( + GTK_RADIO_BUTTON (radio), text); + gtk_label_set_use_markup (GTK_LABEL (GTK_BIN (radio)->child), TRUE); + g_free (text); + if (version->number.size() > 20 || + (version->repo && version->repo->name.size() > 22)) { + char *text = g_strdup_printf ("%s (%s)\n%s", + version->number.c_str(), version->arch.c_str(), + version->repo ? version->repo->name.c_str() : ""); + gtk_widget_set_tooltip_markup (radio, text); g_free (text); - if (version->number.size() > 20 || - (version->repo && version->repo->name.size() > 22)) { - char *text = g_strdup_printf ("%s (%s)\n%s", - version->number.c_str(), version->arch.c_str(), - version->repo ? version->repo->name.c_str() : ""); - gtk_widget_set_tooltip_markup (radio, text); - g_free (text); + } + gtk_box_pack_start (GTK_BOX (m_versions_box), radio, FALSE, TRUE, 0); + if (!activeSet) { + if (toInstall == version) { + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), TRUE); + activeSet = true; } - gtk_box_pack_start (GTK_BOX (m_versions_box), radio, FALSE, TRUE, 0); - if (!activeSet) { - if (toInstall == version) { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), TRUE); - activeSet = true; - } - else if (i == 0 && (!package->isInstalled() || version->cmp > 0)) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), TRUE); - else if (version->repo == favoriteRepo) { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), TRUE); - favoriteRepo = 0; // select only the 1st hit - } + else if (i == 0 && (!package->isInstalled() || version->cmp > 0)) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), TRUE); + else if (version->repo == favoriteRepo) { + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), TRUE); + favoriteRepo = 0; // select only the 1st hit } - g_object_set_data (G_OBJECT (radio), "version", (void *) version); - g_signal_connect (G_OBJECT (radio), "toggled", - G_CALLBACK (version_toggled_cb), this); - if ((children % 2) == 1) - g_signal_connect (G_OBJECT (radio), "expose-event", G_CALLBACK (draw_gray_cb), this); - children++; } - gtk_widget_show_all (m_versions_box); - } - - // is locked - if (packages.locked() || packages.unlocked()) - gtk_widget_set_sensitive (m_button, !packages.locked()); - else - gtk_widget_set_sensitive (m_button, TRUE); - syncButton(); + g_object_set_data (G_OBJECT (radio), "version", (void *) version); + g_signal_connect (G_OBJECT (radio), "toggled", + G_CALLBACK (version_toggled_cb), this); + if ((children % 2) == 1) + g_signal_connect (G_OBJECT (radio), "expose-event", G_CALLBACK (draw_gray_cb), this); + children++; + } + gtk_widget_show_all (m_versions_box); } - private: - virtual void entryChanged (const Ypp::PkgList list, int index, Ypp::Package *package) - { - if (m_packages.contains (package)) - setPackages (m_packages); // refresh ! - } - // won't happen: - virtual void entryInserted (const Ypp::PkgList list, int index, Ypp::Package *package) {} - virtual void entryDeleted (const Ypp::PkgList list, int index, Ypp::Package *package) {} - - static gboolean draw_gray_cb (GtkWidget *widget, GdkEventExpose *event, Versions *pThis) - { - GtkAllocation *alloc = &widget->allocation; - int x = alloc->x, y = alloc->y, w = alloc->width, h = alloc->height; - - cairo_t *cr = gdk_cairo_create (widget->window); - cairo_rectangle (cr, x, y, w, h); - cairo_set_source_rgb (cr, 245/255.0, 245/255.0, 245/255.0); - cairo_fill (cr); - cairo_destroy (cr); - return FALSE; - } + // is locked + if (packages.isLocked() || packages.isUnlocked()) + gtk_widget_set_sensitive (m_button, !packages.isLocked()); + else + gtk_widget_set_sensitive (m_button, TRUE); + syncButton(); + } - const Ypp::Package::Version *getVersion() - { - GtkWidget *radio = 0; - GList *children = gtk_container_get_children (GTK_CONTAINER (m_versions_box)); - for (GList *i = children; i; i = i->next) - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (i->data))) { - radio = (GtkWidget *) i->data; - break; - } - g_list_free (children); - if (radio) - return (Ypp::Package::Version *) g_object_get_data (G_OBJECT (radio), "version"); - return NULL; - } - - void syncButton() - { - const char *label = 0, *stock = 0; - bool modified = false; - if (m_packages.size() == 1) { - Ypp::Package *package = m_packages.get (0); - const Ypp::Package::Version *version = getVersion(); - const Ypp::Package::Version *installed = package->getInstalledVersion(); - if (installed == version) { - label = _("Remove"); - stock = GTK_STOCK_DELETE; - if (package->toRemove()) - modified = true; - } - else { - if (installed) { - if (version->cmp > 0) { - label = _("Upgrade"); - stock = GTK_STOCK_GO_UP; - } - else if (version->cmp < 0) { - label = _("Downgrade"); - stock = GTK_STOCK_GO_DOWN; - } - else { - label = _("Re-install"); - stock = GTK_STOCK_REFRESH; - } - } - else { - label = _("Install"); - stock = GTK_STOCK_SAVE; - } +private: + static gboolean draw_gray_cb (GtkWidget *widget, GdkEventExpose *event, Versions *pThis) + { + GtkAllocation *alloc = &widget->allocation; + int x = alloc->x, y = alloc->y, w = alloc->width, h = alloc->height; - const Ypp::Package::Version *toInstall = 0; - if (!package->toInstall (&toInstall)) - toInstall = 0; - if (toInstall == version) - modified = true; - } + cairo_t *cr = gdk_cairo_create (widget->window); + cairo_rectangle (cr, x, y, w, h); + cairo_set_source_rgb (cr, 245/255.0, 245/255.0, 245/255.0); + cairo_fill (cr); + cairo_destroy (cr); + return FALSE; + } + + const Ypp::Package::Version *getVersion() + { + GtkWidget *radio = 0; + GList *children = gtk_container_get_children (GTK_CONTAINER (m_versions_box)); + for (GList *i = children; i; i = i->next) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (i->data))) { + radio = (GtkWidget *) i->data; + break; } - else { - if (m_packages.modified()) + g_list_free (children); + if (radio) + return (Ypp::Package::Version *) g_object_get_data (G_OBJECT (radio), "version"); + return NULL; + } + + void syncButton() + { + const char *label = 0, *stock = 0; + bool modified = false; + if (m_packages.size() == 1) { + Ypp::Package *package = m_packages.get (0); + const Ypp::Package::Version *version = getVersion(); + const Ypp::Package::Version *installed = package->getInstalledVersion(); + if (installed == version) { + label = _("Remove"); + stock = GTK_STOCK_DELETE; + if (package->toRemove()) modified = true; - if (m_packages.upgradable()) { - label = _("Upgrade"); - stock = GTK_STOCK_GO_UP; - } - else if (m_packages.installed()) { - label = _("Remove"); - stock = GTK_STOCK_DELETE; + } + else { + if (installed) { + if (version->cmp > 0) { + label = _("Upgrade"); + stock = GTK_STOCK_GO_UP; + } + else if (version->cmp < 0) { + label = _("Downgrade"); + stock = GTK_STOCK_GO_DOWN; + } + else { + label = _("Re-install"); + stock = GTK_STOCK_REFRESH; + } } - else if (m_packages.notInstalled()) { + else { label = _("Install"); stock = GTK_STOCK_SAVE; } - else if (m_packages.modified()) { - label = _("Undo"); - stock = GTK_STOCK_UNDO; - modified = false; - } - } - if (label) { - gtk_button_set_label (GTK_BUTTON (m_button), label); - GtkWidget *image = gtk_image_new_from_stock ( - stock, GTK_ICON_SIZE_BUTTON); - gtk_button_set_image (GTK_BUTTON (m_button), image); - gtk_widget_show (m_button); + + const Ypp::Package::Version *toInstall = 0; + if (!package->toInstall (&toInstall)) + toInstall = 0; + if (toInstall == version) + modified = true; } + } + else { + if (m_packages.toModify()) + modified = true; + if (m_packages.hasUpgrade()) { + label = _("Upgrade"); + stock = GTK_STOCK_GO_UP; + } + else if (m_packages.isInstalled()) { + label = _("Remove"); + stock = GTK_STOCK_DELETE; + } + else if (m_packages.isNotInstalled()) { + label = _("Install"); + stock = GTK_STOCK_SAVE; + } + else if (m_packages.toModify()) { + label = _("Undo"); + stock = GTK_STOCK_UNDO; + modified = false; + } + } + if (label) { + gtk_button_set_label (GTK_BUTTON (m_button), label); + GtkWidget *image = gtk_image_new_from_stock ( + stock, GTK_ICON_SIZE_BUTTON); + gtk_button_set_image (GTK_BUTTON (m_button), image); + gtk_widget_show (m_button); + } + else + gtk_widget_hide (m_button); + gtk_widget_set_sensitive (m_button, !modified); + modified ? gtk_widget_show (m_undo_button) : gtk_widget_hide (m_undo_button); + } + + static void version_toggled_cb (GtkToggleButton *radio, Versions *pThis) + { if (gtk_toggle_button_get_active (radio)) pThis->syncButton(); } + + static void button_clicked_cb (GtkButton *button, Versions *pThis) + { + if (pThis->m_packages.size() == 1) { + Ypp::Package *package = pThis->m_packages.get (0); + const Ypp::Package::Version *version = pThis->getVersion(); + const Ypp::Package::Version *installed = package->getInstalledVersion(); + if (installed == version) + pThis->m_packages.remove(); else - gtk_widget_hide (m_button); - gtk_widget_set_sensitive (m_button, !modified); - modified ? gtk_widget_show (m_undo_button) : gtk_widget_hide (m_undo_button); - } - - static void version_toggled_cb (GtkToggleButton *radio, Versions *pThis) - { if (gtk_toggle_button_get_active (radio)) pThis->syncButton(); } - - static void button_clicked_cb (GtkButton *button, Versions *pThis) - { - if (pThis->m_packages.size() == 1) { - Ypp::Package *package = pThis->m_packages.get (0); - const Ypp::Package::Version *version = pThis->getVersion(); - const Ypp::Package::Version *installed = package->getInstalledVersion(); - if (installed == version) - pThis->m_packages.remove(); - else - package->install (version); - } - else { - if (pThis->m_packages.upgradable()) - pThis->m_packages.install(); - else if (pThis->m_packages.installed()) - pThis->m_packages.remove(); - else if (pThis->m_packages.notInstalled()) - pThis->m_packages.install(); - else if (pThis->m_packages.modified()) - pThis->m_packages.undo(); - } + package->install (version); } - - static void undo_clicked_cb (GtkButton *button, Versions *pThis) - { - pThis->m_packages.undo(); + else { + if (pThis->m_packages.hasUpgrade()) + pThis->m_packages.install(); + else if (pThis->m_packages.isInstalled()) + pThis->m_packages.remove(); + else if (pThis->m_packages.isNotInstalled()) + pThis->m_packages.install(); + else if (pThis->m_packages.toModify()) + pThis->m_packages.undo(); } - }; + } + + static void undo_clicked_cb (GtkButton *button, Versions *pThis) + { + pThis->m_packages.undo(); + } +}; -GtkWidget *m_scroll, *m_icon, *m_icon_frame, *m_description, *m_filelist, *m_changelog, - *m_authors, *m_support, *m_requires, *m_provides, *m_contents; +class YGtkDetailView::Impl : public Ypp::PkgList::Listener +{ +GtkWidget *m_scroll, *m_icon, *m_icon_frame, *m_name, *m_description, + *m_filelist, *m_changelog, *m_authors, *m_support, *m_dependencies, + *m_contents, *m_details, *m_versions_exp; +GtkWidget *m_link_popup; +std::string m_link_str; Versions *m_versions; bool m_verMode; +Ypp::PkgList m_packages; // we keep a copy to test against modified... +bool m_onlineUpdate; public: Impl (GtkWidget *scroll, bool onlineUpdate) - : m_verMode (false) + : m_verMode (false), m_onlineUpdate (onlineUpdate) { m_scroll = scroll; - m_versions = new Versions (onlineUpdate); + m_versions = new Versions(); GtkWidget *hbox = gtk_hbox_new (FALSE, 2); setupScrollAsWhite (scroll, hbox); - GtkWidget *versions_box = gtk_vbox_new (FALSE, 6); - gtk_box_pack_start (GTK_BOX (versions_box), - createIconWidget (&m_icon, &m_icon_frame), FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (versions_box), m_versions->getWidget(), FALSE, TRUE, 0); + GtkWidget *side_box = gtk_vbox_new (FALSE, 0); + m_versions_exp = appendExpander (side_box, _("Versions"), m_versions->getWidget(), versions_cb); + m_details = ygtk_rich_text_new(); + m_details = appendExpander (side_box, _("Details"), m_details, details_cb); + gtk_widget_set_size_request (m_details, 140, -1); + gtk_expander_set_expanded (GTK_EXPANDER (m_details), TRUE); GtkWidget *vbox = gtk_vbox_new (FALSE, 0); + m_name = ygtk_rich_text_new(); + GtkWidget *header_box = gtk_hbox_new (FALSE, 2); + gtk_box_pack_start (GTK_BOX (header_box), m_name, TRUE, TRUE, 0); + m_icon_frame = m_icon = gtk_image_new(); + gtk_box_pack_start (GTK_BOX (header_box), m_icon, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox), header_box, FALSE, TRUE, 0); + m_description = ygtk_rich_text_new(); g_signal_connect (G_OBJECT (m_description), "link-clicked", - G_CALLBACK (link_pressed_cb), this); + G_CALLBACK (link_clicked_cb), this); gtk_box_pack_start (GTK_BOX (vbox), m_description, FALSE, TRUE, 0); - m_filelist = m_changelog = m_authors = m_support = m_requires = m_provides = m_contents = 0; + m_filelist = m_changelog = m_authors = m_support = m_dependencies = m_contents = 0; if (!onlineUpdate) { m_filelist = ygtk_rich_text_new(); - if (CAN_OPEN_DIRNAME()) - g_signal_connect (G_OBJECT (m_filelist), "link-clicked", - G_CALLBACK (dirname_pressed_cb), this); - m_changelog = ygtk_rich_text_new(); - m_authors = ygtk_rich_text_new(); + g_signal_connect (G_OBJECT (m_filelist), "link-clicked", + G_CALLBACK (dirname_pressed_cb), this); m_support = ygtk_rich_text_new(); - GtkWidget *dependencies_box = gtk_hbox_new (TRUE, 0); - m_requires = ygtk_rich_text_new(); - m_provides = ygtk_rich_text_new(); - gtk_box_pack_start (GTK_BOX (dependencies_box), m_requires, TRUE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (dependencies_box), m_provides, TRUE, TRUE, 0); - - appendExpander (vbox, _("File List"), m_filelist); - appendExpander (vbox, _("Changelog"), m_changelog); - appendExpander (vbox, _("Authors"), m_authors); - appendExpander (vbox, _("Dependencies"), dependencies_box); - appendExpander (vbox, "", m_support); + m_dependencies = gtk_hbox_new (TRUE, 0); + gtk_box_pack_start (GTK_BOX (m_dependencies), ygtk_rich_text_new(), TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (m_dependencies), ygtk_rich_text_new(), TRUE, TRUE, 0); + + m_filelist = appendExpander (vbox, _("File List"), m_filelist, filelist_cb); + m_changelog = appendExpander (vbox, _("Changelog"), ygtk_rich_text_new(), changelog_cb); + m_authors = appendExpander (vbox, _("Authors"), ygtk_rich_text_new(), authors_cb); + m_dependencies = appendExpander (vbox, _("Dependencies"), m_dependencies, dependencies_cb); + m_support = appendExpander (vbox, "", m_support, NULL); } else { YGtkPackageView *contents; m_contents = GTK_WIDGET (contents = ygtk_package_view_new (TRUE)); gtk_widget_set_size_request (m_contents, -1, 150); - appendExpander (vbox, _("Applies to"), m_contents); + m_contents = appendExpander (vbox, _("Applies to"), m_contents, contents_cb); } gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (hbox), versions_box, FALSE, TRUE, 0); - gtk_widget_show_all (hbox); + gtk_box_pack_start (GTK_BOX (hbox), side_box, FALSE, TRUE, 0); g_signal_connect (G_OBJECT (scroll), "hierarchy-changed", G_CALLBACK (hierarchy_changed_cb), this); g_signal_connect (G_OBJECT (scroll), "realize", G_CALLBACK (realize_cb), this); + + // PkgList::addListeners() isn't currently working for ordinary PkgList + // other than getPackages(), thus this hack. + if (!m_onlineUpdate) + Ypp::get()->getPackages (Ypp::Package::PACKAGE_TYPE).addListener (this); + gtk_widget_show_all (hbox); } ~Impl() - { delete m_versions; } + { + delete m_versions; + if (!m_onlineUpdate) + Ypp::get()->getPackages (Ypp::Package::PACKAGE_TYPE).removeListener (this); + } + + void refreshPackages (Ypp::PkgList packages) + { + std::string name; + name.reserve (1024); + if (packages.size() > 0) { + name = ""; + if (packages.size() == 1) { + Ypp::Package *package = packages.get (0); + name += "" + package->name() + " - " + package->summary(); + } + else { + name += ""; + name += _("Several selected"); + name += ""; + } + name += ""; + } + ygtk_rich_text_set_text (YGTK_RICH_TEXT (m_name), name.c_str()); + ygtk_expander_update (m_versions_exp); + } void setPackages (Ypp::PkgList packages) { + m_packages = packages; + gtk_widget_hide (m_icon_frame); Ypp::Package *package = 0; if (packages.size() == 1) { package = packages.get (0); - std::string description = "" + package->name() + " "; - description += package->description (HTML_MARKUP); + std::string description (package->description (HTML_MARKUP)); ygtk_rich_text_set_text (YGTK_RICH_TEXT (m_description), description.c_str()); if (m_support) { std::string label ("" + std::string (_("Supportability:")) + " "); label += package->support(); - gtk_expander_set_label (GTK_EXPANDER (m_support->parent), label.c_str()); - ygtk_rich_text_set_text (YGTK_RICH_TEXT (m_support), + gtk_expander_set_label (GTK_EXPANDER (m_support), label.c_str()); + ygtk_rich_text_set_text (YGTK_RICH_TEXT (GTK_BIN (m_support)->child), package->supportText (HTML_MARKUP).c_str()); - gtk_widget_show (m_support->parent); + gtk_widget_show (m_support); } gtk_image_clear (GTK_IMAGE (m_icon)); GtkIconTheme *icons = gtk_icon_theme_get_default(); @@ -460,17 +439,10 @@ g_object_unref (G_OBJECT (pixbuf)); gtk_widget_show (m_icon_frame); } - setPassiveUpdate (m_filelist, filelist_cb, package); - setPassiveUpdate (m_changelog, changelog_cb, package); - setPassiveUpdate (m_authors, authors_cb, package); - setPassiveUpdate (m_requires, requires_cb, package); - setPassiveUpdate (m_provides, provides_cb, package); - setPassiveUpdate (m_contents, contents_cb, package); } else { std::string description; if (packages.size() > 0) { - description = _("Selected:"); description += "<ul>"; for (int i = 0; packages.get (i); i++) description += "<li>" + packages.get (i)->name() + "</li>"; @@ -478,23 +450,25 @@ } ygtk_rich_text_set_text (YGTK_RICH_TEXT (m_description), description.c_str()); if (m_support) - gtk_widget_hide (m_support->parent); - setPassiveUpdate (m_filelist, NULL, NULL); - setPassiveUpdate (m_changelog, NULL, NULL); - setPassiveUpdate (m_authors, NULL, NULL); - setPassiveUpdate (m_requires, NULL, NULL); - setPassiveUpdate (m_provides, NULL, NULL); - setPassiveUpdate (m_contents, NULL, NULL); + gtk_widget_hide (m_support); } - m_versions->setPackages (packages); + ygtk_expander_update (m_filelist); + ygtk_expander_update (m_changelog); + ygtk_expander_update (m_authors); + ygtk_expander_update (m_dependencies); + ygtk_expander_update (m_contents); + ygtk_expander_update (m_details); + + refreshPackages (packages); scrollTop(); } void setPackage (Ypp::Package *package) { Ypp::PkgList packages; - packages.append (package); + if (package) + packages.append (package); setPackages (packages); } @@ -506,6 +480,17 @@ } private: + virtual void entryChanged (const Ypp::PkgList list, int index, Ypp::Package *package) + { + if (m_packages.contains (package)) { + m_packages.refreshProps(); + refreshPackages (m_packages); + } + } + // won't happen: + virtual void entryInserted (const Ypp::PkgList list, int index, Ypp::Package *package) {} + virtual void entryDeleted (const Ypp::PkgList list, int index, Ypp::Package *package) {} + void scrollTop() { GtkScrolledWindow *scroll = GTK_SCROLLED_WINDOW (m_scroll); @@ -514,25 +499,6 @@ } // utilities: - static GtkWidget *createIconWidget (GtkWidget **icon_widget, GtkWidget **icon_frame) - { - *icon_widget = gtk_image_new(); - - GtkWidget *box, *align, *frame; - box = gtk_event_box_new(); - gtk_container_add (GTK_CONTAINER (box), *icon_widget); - gtk_container_set_border_width (GTK_CONTAINER (box), 2); - - frame = gtk_frame_new (NULL); - gtk_container_add (GTK_CONTAINER (frame), box); - - align = gtk_alignment_new (0, 0, 0, 0); - gtk_container_add (GTK_CONTAINER (align), frame); - gtk_container_set_border_width (GTK_CONTAINER (align), 6); - *icon_frame = align; - return align; - } - static void setupScrollAsWhite (GtkWidget *scroll, GtkWidget *box) { struct inner { @@ -556,38 +522,103 @@ gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scroll), box); } - static GtkWidget *appendExpander (GtkWidget *box, const char *label, GtkWidget *child) + typedef bool (*UpdateCb) (GtkWidget *widget, Ypp::PkgList list); + GtkWidget *appendExpander (GtkWidget *box, const char *label, GtkWidget *child, UpdateCb update_cb) { std::string str = std::string ("") + label + ""; GtkWidget *expander = gtk_expander_new (str.c_str()); gtk_expander_set_use_markup (GTK_EXPANDER (expander), TRUE); gtk_container_add (GTK_CONTAINER (expander), child); gtk_box_pack_start (GTK_BOX (box), expander, FALSE, TRUE, 0); + if (update_cb) { + g_object_set_data (G_OBJECT (expander), "update-cb", (gpointer) update_cb); + g_signal_connect_after (G_OBJECT (expander), "notify::expanded", + G_CALLBACK (ygtk_expander_expanded_cb), this); + } return expander; } // callbacks - static void link_pressed_cb (GtkWidget *text, const gchar *link, Impl *pThis) + static void link_clicked_cb (YGtkRichText *text, const gchar *link, Impl *pThis) { - if (!strncmp (link, "pkg://", 6)) { - const gchar *pkg_name = link + 6; - Ypp::Package *pkg = Ypp::get()->getPackages (Ypp::Package::PACKAGE_TYPE).find (pkg_name); - if (pkg) - pThis->setPackage (pkg); - else { - GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), - GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, _("Package '%s' was not found."), pkg_name); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - } + if (!pThis->m_link_popup) { + GtkWidget *menu = pThis->m_link_popup = gtk_menu_new(); + gtk_menu_attach_to_widget (GTK_MENU (menu), GTK_WIDGET (text), NULL); + + GtkWidget *item; + if (g_file_test (BROWSER_BIN, G_FILE_TEST_IS_EXECUTABLE)) { + std::string label; + if (getuid() == 0) { + const char *username = getenv ("USERNAME"); + if (!username || !(*username)) + username = "root"; + label = _("_Open (as "); + label += username; + label += ")"; + } + else + label = _("_Open"); + item = gtk_image_menu_item_new_with_mnemonic (label.c_str()); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), + gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU)); + gtk_widget_show (item); + g_signal_connect (G_OBJECT (item), "activate", + G_CALLBACK (open_link_cb), pThis); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + } + item = gtk_image_menu_item_new_from_stock (GTK_STOCK_COPY, NULL); + gtk_widget_show (item); + g_signal_connect (G_OBJECT (item), "activate", + G_CALLBACK (copy_link_cb), pThis); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + } + gtk_menu_popup (GTK_MENU (pThis->m_link_popup), NULL, NULL, NULL, NULL, + 0, gtk_get_current_event_time()); + pThis->m_link_str = link; + } + + static void open_link_cb (GtkMenuItem *item, Impl *pThis) + { + const std::string &link = pThis->m_link_str; + std::string command; + command.reserve (256); + + const char *username = 0; + if (getuid() == 0) { + username = getenv ("USERNAME"); + if (username && !(*username)) + username = 0; + } + + if (username) { + command += "gnomesu -u "; + command += username; + command += " -c \"" BROWSER_BIN " --new-window "; + command += link; + command += "\""; } - else - OPEN_URL (link); + else { + command += BROWSER_BIN " --new-window "; + command += link; + } + command += " &"; + system (command.c_str()); + } + + static void copy_link_cb (GtkMenuItem *item, Impl *pThis) + { + const std::string &link = pThis->m_link_str; + GtkClipboard *clipboard = + gtk_widget_get_clipboard (pThis->m_description, GDK_SELECTION_CLIPBOARD); + gtk_clipboard_set_text (clipboard, link.c_str(), -1); } static void dirname_pressed_cb (GtkWidget *text, const gchar *link, Impl *pThis) - { OPEN_DIRNAME (link); } + { + gchar *cmd = g_strdup_printf (GNOME_OPEN_BIN " %s &", link); + system (cmd); + g_free (cmd); + } static void hierarchy_changed_cb (GtkWidget *widget, GtkWidget *old, Impl *pThis) { @@ -598,55 +629,102 @@ } } - static void filelist_cb (GtkWidget *widget, gpointer pkg) + static bool versions_cb (GtkWidget *widget, Ypp::PkgList list) + { + Versions *versions = (Versions *) g_object_get_data (G_OBJECT (widget), "class"); + versions->setPackages (list); + return true; + } + + static bool details_cb (GtkWidget *widget, Ypp::PkgList list) + { + if (list.size() != 1) return false; + Ypp::Package *pkg = list.get (0); + std::string text; + std::string b (""), _b (" "), br (" "); + text.reserve (2048); + text += b + _("Size:") + _b + pkg->size(); + text += br + b + _("License:") + _b + pkg->license(); + std::string installed (pkg->installedDate()), candidate (pkg->candidateDate()); + if (!installed.empty()) + text += br + b + _("Installed at:") + _b + installed; + if (!candidate.empty()) + text += br + b + _("Latest build:") + _b + candidate; + ygtk_rich_text_set_text (YGTK_RICH_TEXT (widget), text.c_str()); + return true; + } + + static bool filelist_cb (GtkWidget *widget, Ypp::PkgList list) { - std::string str (((Ypp::Package *) pkg)->filelist (HTML_MARKUP)); + if (list.size() != 1) return false; + std::string str (list.get(0)->filelist (HTML_MARKUP)); if (str.empty()) ygtk_rich_text_set_text (YGTK_RICH_TEXT (widget), onlyInstalledMsg); else ygtk_rich_text_set_text (YGTK_RICH_TEXT (widget), str.c_str()); + return true; } - static void changelog_cb (GtkWidget *widget, gpointer pkg) + static bool changelog_cb (GtkWidget *widget, Ypp::PkgList list) { - std::string str (((Ypp::Package *) pkg)->changelog()); + if (list.size() != 1) return false; + std::string str (list.get(0)->changelog()); if (str.empty()) ygtk_rich_text_set_text (YGTK_RICH_TEXT (widget), onlyInstalledMsg); else ygtk_rich_text_set_text (YGTK_RICH_TEXT (widget), str.c_str()); + return true; } - static void authors_cb (GtkWidget *widget, gpointer pkg) + static bool authors_cb (GtkWidget *widget, Ypp::PkgList list) { - std::string str (((Ypp::Package *) pkg)->authors (HTML_MARKUP)); - ygtk_rich_text_set_text (YGTK_RICH_TEXT (widget), str.c_str()); - } - - static void requires_cb (GtkWidget *widget, gpointer pkg) - { - std::string str = _("Requires:"); - str += " <blockquote>"; - str += ((Ypp::Package *) pkg)->requires (HTML_MARKUP); - YGUtils::replace (str, "\n", 1, " "); - str += "</blockquote>"; - ygtk_rich_text_set_text (YGTK_RICH_TEXT (widget), str.c_str()); + if (list.size() != 1) return false; + std::string str (list.get(0)->authors (HTML_MARKUP)); + if (str.empty()) + ygtk_rich_text_set_text (YGTK_RICH_TEXT (widget), + _("Not specified.")); + else + ygtk_rich_text_set_text (YGTK_RICH_TEXT (widget), str.c_str()); + return true; } - static void provides_cb (GtkWidget *widget, gpointer pkg) + static bool dependencies_cb (GtkWidget *widget, Ypp::PkgList list) { - std::string str = _("Provides:"); - str += " <blockquote>"; - str += ((Ypp::Package *) pkg)->provides (HTML_MARKUP); - YGUtils::replace (str, "\n", 1, " "); - str += "</blockquote>"; - ygtk_rich_text_set_text (YGTK_RICH_TEXT (widget), str.c_str()); + if (list.size() != 1) return false; + Ypp::Package *pkg = list.get (0); + GList *children = gtk_container_get_children (GTK_CONTAINER (widget)); + int n = 0; + for (GList *i = children; i; i = i->next, n++) { + std::string str, label, text; + switch (n) { + case 0: + label = _("Requires:"); + text = pkg->requires (HTML_MARKUP); + break; + case 1: + label = _("Provides:"); + text = pkg->provides (HTML_MARKUP); + break; + } + YGUtils::replace (text, "\n", 1, " "); + str.reserve (1024); + str = label; + str += " <blockquote>"; + str += text; + str += "</blockquote>"; + ygtk_rich_text_set_text (YGTK_RICH_TEXT (i->data), str.c_str()); + } + g_list_free (children); + return true; } - static void contents_cb (GtkWidget *widget, gpointer pkg) + static bool contents_cb (GtkWidget *widget, Ypp::PkgList list) { + if (list.size() != 1) return false; YGtkPackageView *contents = YGTK_PACKAGE_VIEW (widget); - Ypp::QueryBase *query = new Ypp::QueryCollection ((Ypp::Package *) pkg); + Ypp::QueryBase *query = new Ypp::QueryCollection (list.get (0)); contents->setList (Ypp::PkgQuery (Ypp::Package::PACKAGE_TYPE, query), 0); + return true; } // fix cursor keys support @@ -681,9 +759,14 @@ static inline void fix_keybindings (Impl *pThis, GtkWidget *widget) { + g_signal_connect (G_OBJECT (widget), "move-cursor", + G_CALLBACK (move_cursor_cb), pThis); + } + + static inline void fix_expander_keybindings (Impl *pThis, GtkWidget *widget) + { if (widget) - g_signal_connect (G_OBJECT (widget), "move-cursor", - G_CALLBACK (move_cursor_cb), pThis); + fix_keybindings (pThis, gtk_bin_get_child (GTK_BIN (widget))); } static void realize_cb (GtkWidget *widget, Impl *pThis) @@ -693,41 +776,27 @@ fix_keybindings (pThis, pThis->m_changelog); fix_keybindings (pThis, pThis->m_authors); fix_keybindings (pThis, pThis->m_support); - fix_keybindings (pThis, pThis->m_requires); - fix_keybindings (pThis, pThis->m_provides); + fix_keybindings (pThis, pThis->m_dependencies); } // make the widget request data when/if necessary; speeds up expander children - typedef void (*UpdateCb) (GtkWidget *widget, gpointer data); - - static void ygtk_widget_passive_update (GtkWidget *widget, UpdateCb update_cb, gpointer data) - { - g_object_set_data (G_OBJECT (widget), "update-cb", (gpointer) update_cb); - g_object_set_data (G_OBJECT (widget), "user-data", data); - if (GTK_WIDGET_MAPPED (widget) || !update_cb) - ygtk_widget_passive_update_cb (widget); - else - g_signal_connect (G_OBJECT (widget), "map", - G_CALLBACK (ygtk_widget_passive_update_cb), NULL); - } - - static void ygtk_widget_passive_update_cb (GtkWidget *widget) + void ygtk_expander_update (GtkWidget *expander) { - g_signal_handlers_disconnect_by_func (widget, (gpointer) ygtk_widget_passive_update_cb, NULL); - UpdateCb update_cb = (UpdateCb) g_object_get_data (G_OBJECT (widget), "update-cb"); - gpointer data = g_object_get_data (G_OBJECT (widget), "user-data"); - if (update_cb) // could be set to null to disable - update_cb (widget, data); - } - - static void setPassiveUpdate (GtkWidget *widget, UpdateCb update_cb, Ypp::Package *pkg) - { // convinience method - if (widget) { - ygtk_widget_passive_update (widget, update_cb, (gpointer) pkg); - GtkWidget *expander = gtk_widget_get_ancestor (widget, GTK_TYPE_EXPANDER); - pkg ? gtk_widget_show (expander) : gtk_widget_hide (expander); + if (!expander) return; + if (m_packages.size() == 1) + gtk_widget_show (expander); + else { + gtk_widget_hide (expander); + return; } + UpdateCb update_cb = (UpdateCb) g_object_get_data (G_OBJECT (expander), "update-cb"); + GtkWidget *child = gtk_bin_get_child (GTK_BIN (expander)); + if (gtk_expander_get_expanded (GTK_EXPANDER (expander))) + update_cb (child, m_packages); } + + static void ygtk_expander_expanded_cb (GObject *object, GParamSpec *param_spec, Impl *pThis) + { pThis->ygtk_expander_update (GTK_WIDGET (object)); } }; G_DEFINE_TYPE (YGtkDetailView, ygtk_detail_view, GTK_TYPE_SCROLLED_WINDOW) 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 Tue Jan 26 17:10:22 2010 @@ -14,6 +14,7 @@ #include "ygtktreeview.h" #include "ygtktreemodel.h" #include "ygtkcellrendererbutton.h" +#include "ygtkcellrenderersidebutton.h" #include "YGi18n.h" #include "YGUtils.h" #include <gtk/gtk.h> @@ -105,29 +106,39 @@ } }; +//** General utilities + +const char *getRepositoryStockIcon (const std::string &url) +{ + const gchar *icon; + if (url.empty()) + icon = GTK_STOCK_MISSING_IMAGE; + else if (url.compare (0, 2, "cd", 2) == 0 || url.compare (0, 3, "dvd", 3) == 0) + icon = GTK_STOCK_CDROM; + else if (url.compare (0, 3, "iso", 3) == 0) + icon = GTK_STOCK_FILE; + else + icon = GTK_STOCK_NETWORK; + return icon; +} + //** Model -enum Property { - // pixbuf - ICON_PROP, - // text - NAME_PROP, SUMMARY_PROP, NAME_SUMMARY_PROP, REPOSITORY_PROP, SUPPORT_PROP, - SIZE_PROP, INSTALLED_VERSION_PROP, AVAILABLE_VERSION_PROP, - // checks - TO_INSTALL_PROP, TO_UPGRADE_PROP, TO_REMOVE_PROP, TO_MODIFY_PROP, - IS_INSTALLED_PROP, - // internal +enum ImplProperty { + // booleans + HAS_UPGRADE_PROP = TOTAL_PROPS, TO_UPGRADE_PROP, + // char STYLE_PROP, WEIGHT_PROP, SENSITIVE_PROP, CHECK_VISIBLE_PROP, FOREGROUND_PROP, VERSION_FOREGROUND_PROP, BACKGROUND_PROP, XPAD_PROP, - ACTION_LABEL_PROP, ACTION_STOCK_PROP, + ACTION_LABEL_PROP, ACTION_STOCK_PROP, REPOSITORY_STOCK_PROP, // misc - PTR_PROP, TOTAL_PROPS + PTR_PROP, TOTAL_IMPL_PROPS }; static GType _columnType (int col) { switch (col) { - case ICON_PROP: + case STATUS_ICON_PROP: return GDK_TYPE_PIXBUF; case NAME_PROP: case SUMMARY_PROP: @@ -137,17 +148,17 @@ case SIZE_PROP: case INSTALLED_VERSION_PROP: case AVAILABLE_VERSION_PROP: + case VERSION_PROP: case FOREGROUND_PROP: case VERSION_FOREGROUND_PROP: case BACKGROUND_PROP: case ACTION_LABEL_PROP: case ACTION_STOCK_PROP: + case REPOSITORY_STOCK_PROP: return G_TYPE_STRING; - case TO_INSTALL_PROP: + case INSTALLED_CHECK_PROP: + case HAS_UPGRADE_PROP: case TO_UPGRADE_PROP: - case TO_REMOVE_PROP: - case TO_MODIFY_PROP: - case IS_INSTALLED_PROP: case SENSITIVE_PROP: case CHECK_VISIBLE_PROP: return G_TYPE_BOOLEAN; @@ -164,7 +175,7 @@ static void _getValueDefault (int col, GValue *value) { switch (col) { - case ICON_PROP: + case STATUS_ICON_PROP: g_value_set_object (value, NULL); break; case NAME_PROP: @@ -175,6 +186,7 @@ case SIZE_PROP: case INSTALLED_VERSION_PROP: case AVAILABLE_VERSION_PROP: + case VERSION_PROP: case ACTION_LABEL_PROP: case ACTION_STOCK_PROP: g_value_set_string (value, g_strdup ("")); @@ -182,13 +194,12 @@ case FOREGROUND_PROP: case VERSION_FOREGROUND_PROP: case BACKGROUND_PROP: + case REPOSITORY_STOCK_PROP: g_value_set_string (value, NULL); break; - case TO_INSTALL_PROP: + case INSTALLED_CHECK_PROP: + case HAS_UPGRADE_PROP: case TO_UPGRADE_PROP: - case TO_REMOVE_PROP: - case TO_MODIFY_PROP: - case IS_INSTALLED_PROP: g_value_set_boolean (value, FALSE); break; case STYLE_PROP: @@ -326,7 +337,7 @@ { return block.sumSize(); } virtual int columnsNb() const - { return TOTAL_PROPS; } + { return TOTAL_IMPL_PROPS; } virtual bool showEmptyEntry() const { return true; } @@ -406,14 +417,6 @@ case FOREGROUND_PROP: g_value_set_string (value, g_strdup ("black")); break; - case TO_INSTALL_PROP: - case TO_UPGRADE_PROP: - case TO_REMOVE_PROP: - case TO_MODIFY_PROP: { - bool modified = segment->list.modified(); - g_value_set_boolean (value, modified); - break; - } case ACTION_LABEL_PROP: g_value_set_string (value, g_strdup (_("All"))); break; @@ -429,7 +432,7 @@ Ypp::Package *package = segment->list.get (index); switch (col) { - case ICON_PROP: { + case STATUS_ICON_PROP: { GdkPixbuf *pixbuf = 0; if (package->type() == Ypp::Package::PATTERN_TYPE) { std::string filename (package->icon()); @@ -472,10 +475,21 @@ if (package->toInstall (&version)) ; if (!version) version = package->getInstalledVersion(); - std::string repo; - if (version && version->repo) - repo = version->repo->name; - g_value_set_string (value, g_strdup (repo.c_str())); + std::string str; + if (version && version->repo) { + str = version->repo->name; + str += "\n" + version->repo->url + ""; + } + g_value_set_string (value, g_strdup (str.c_str())); + break; + } + case REPOSITORY_STOCK_PROP: { + const Ypp::Package::Version *version; + version = package->getAvailableVersion (0); + const char *stock = 0; + if (version) + stock = getRepositoryStockIcon (version->repo->url); + g_value_set_string (value, g_strdup (stock)); break; } case SUPPORT_PROP: @@ -496,22 +510,34 @@ g_value_set_string (value, g_strdup (version->number.c_str())); break; } - case TO_INSTALL_PROP: - g_value_set_boolean (value, package->toInstall()); - break; - case TO_UPGRADE_PROP: { - const Ypp::Package::Version *version = 0; - if (package->toInstall (&version)) - g_value_set_boolean (value, version->cmp > 0); + case VERSION_PROP: { + std::string str; + const Ypp::Package::Version *version; + version = package->getInstalledVersion(); + if (version) + str += version->number; + str += "\n"; + const Ypp::Repository *repo = Ypp::get()->favoriteRepository(); + if (repo) + version = package->fromRepository (repo); + else + version = package->getAvailableVersion (0); + if (version) { + // TODO: maybe hide when installed == candidate + str += ""; + if (version->cmp < 0) + str += ""; + else if (version->cmp > 0) + str += ""; + str += version->number; + if (version->cmp != 0) + str += ""; + str += ""; + } + g_value_set_string (value, g_strdup (str.c_str())); break; } - case TO_REMOVE_PROP: - g_value_set_boolean (value, package->toRemove()); - break; - case TO_MODIFY_PROP: - g_value_set_boolean (value, package->toModify()); - break; - case IS_INSTALLED_PROP: // if is-installed at the end + case INSTALLED_CHECK_PROP: // if is-installed at the end bool installed; if (package->toInstall()) installed = true; @@ -521,6 +547,12 @@ installed = package->isInstalled(); g_value_set_boolean (value, installed); break; + case HAS_UPGRADE_PROP: + g_value_set_boolean (value, package->hasUpgrade()); + break; + case TO_UPGRADE_PROP: + g_value_set_boolean (value, package->hasUpgrade() && package->toInstall()); + break; case SENSITIVE_PROP: { bool sensitive = !package->isLocked(); g_value_set_boolean (value, sensitive); @@ -543,10 +575,10 @@ if (colorful_rows) { if (!package->isInstalled()) color = "darkgray"; - if (col == VERSION_FOREGROUND_PROP) - if (package->hasUpgrade()) - color = "blue"; } +/* if (col == VERSION_FOREGROUND_PROP) + if (package->hasUpgrade()) + color = "blue";*/ g_value_set_string (value, color); break; } @@ -554,7 +586,7 @@ const char *color = 0; if (golden_changed_row) if (package->toModify()) - color = "yellow"; + color = "#f4f4b7"; g_value_set_string (value, color); break; } @@ -634,7 +666,7 @@ { virtual bool showEmptyEntry() const { return false; } virtual int rowsNb() { return 1; } - virtual int columnsNb() const { return TOTAL_PROPS; } + virtual int columnsNb() const { return TOTAL_IMPL_PROPS; } virtual GType columnType (int col) const { return _columnType (col); } virtual void getValue (int row, int col, GValue *value) @@ -660,39 +692,6 @@ //** View -struct Column { - const char *header; - std::string prop; - bool visibleDefault, allowHide, sortable; -}; -static const Column columns[] = { - { "Name", "name", true, false, true }, - { "Version", "available-version", true, true, false }, - { "Repository", "repository", false, true, false }, - { "Support", "support", false, true, false }, - { "Size", "size", false, true, true }, -}; -static int columns_size = sizeof (columns) / sizeof (Column); - -static Property translateProperty (const std::string &prop) -{ - if (prop == "name") - return single_line_rows ? NAME_PROP : NAME_SUMMARY_PROP; - if (prop == "available-version") - return AVAILABLE_VERSION_PROP; - if (prop == "repository") - return REPOSITORY_PROP; - if (prop == "support") - return SUPPORT_PROP; - if (prop == "size") - return SIZE_PROP; - if (prop == "to-install") - return TO_INSTALL_PROP; - if (prop == "is-installed") - return IS_INSTALLED_PROP; - return (Property) 0; -} - struct YGtkPackageView::Impl { Impl (GtkWidget *scroll, bool descriptiveTooltip) @@ -728,24 +727,6 @@ gtk_container_add (GTK_CONTAINER (scroll), m_view); gtk_widget_show_all (scroll); clear(); - - if (action_col) { - 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"); - - for (int i = 0; i < columns_size; i++) { - const Column *column = &columns[i]; - bool visible = column->visibleDefault; - if (column->prop == "available-version") - visible = version_col; - appendTextColumn (column->header, column->prop, - visible, column->sortable); - } } ~Impl() @@ -837,70 +818,85 @@ return packages; } - GtkTreeViewColumn *getColumn (const std::string &property) - { - GList *columns = gtk_tree_view_get_columns (GTK_TREE_VIEW (m_view)); - for (GList *i = columns; i; i = i->next) { - gchar *col_prop = (gchar *) g_object_get_data (G_OBJECT (i->data), "property"); - if (col_prop && property == col_prop) - return (GtkTreeViewColumn *) i->data; - } - return NULL; - } - - std::string getColumnProp (GtkTreeViewColumn *column) + void appendTextColumn (const char *header, int property, bool visible, int size, bool identAuto) { - gchar *prop = (gchar *) g_object_get_data (G_OBJECT (column), "property"); - return prop; - } - - void setVisible (const std::string &property, bool visible) - { gtk_tree_view_column_set_visible (getColumn (property), visible); } - - bool isVisible (const std::string &property) - { return gtk_tree_view_column_get_visible (getColumn (property)); } - - void appendIconColumn (const char *header, const std::string &prop) - { - int col = ICON_PROP; // 'prop' is ignored GtkTreeView *view = GTK_TREE_VIEW (m_view); if (header) gtk_tree_view_set_headers_visible (view, TRUE); - GtkCellRenderer *renderer = gtk_cell_renderer_pixbuf_new(); - int height = MAX (34, YGUtils::getCharsHeight (m_view, 2)); - gtk_cell_renderer_set_fixed_size (renderer, -1, height); - GtkTreeViewColumn *column = gtk_tree_view_column_new_with_attributes ( - header, renderer, "pixbuf", col, - "cell-background", BACKGROUND_PROP, NULL); - gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_fixed_width (column, 38); - gtk_tree_view_append_column (view, column); - } - static Action columnAction (int col) - { - switch (col) { - case TO_INSTALL_PROP: - case TO_UPGRADE_PROP: - default: - return INSTALL_ACTION; - case TO_REMOVE_PROP: - return REMOVE_ACTION; - case TO_MODIFY_PROP: - return UNDO_ACTION; - case IS_INSTALLED_PROP: - return TOGGLE_ACTION; + const char *text_type = "text"; + if (property == NAME_SUMMARY_PROP || property == VERSION_PROP || + property == REPOSITORY_PROP) + text_type = "markup"; + GtkCellRenderer *renderer; + if (property == VERSION_PROP) { + renderer = ygtk_cell_renderer_side_button_new(); + g_object_set (G_OBJECT (renderer), "stock-id", GTK_STOCK_GO_UP, NULL); } + else if (property == REPOSITORY_PROP) + renderer = ygtk_cell_renderer_text_pixbuf_new(); + else + renderer = gtk_cell_renderer_text_new(); + PangoEllipsizeMode ellipsize = PANGO_ELLIPSIZE_END; + if (size >= 0 && property != NAME_SUMMARY_PROP) + ellipsize = PANGO_ELLIPSIZE_MIDDLE; + g_object_set (G_OBJECT (renderer), "ellipsize", ellipsize, NULL); +/* gboolean reverse = gtk_widget_get_default_direction() == GTK_TEXT_DIR_RTL; + if (reverse) { // work-around: Pango ignored alignment flag on RTL + gtk_widget_set_direction (m_view, GTK_TEXT_DIR_LTR); + g_object_set (renderer, "alignment", PANGO_ALIGN_RIGHT, NULL); + }*/ + GtkTreeViewColumn *column; + column = gtk_tree_view_column_new_with_attributes ( + header, renderer, text_type, property, + "sensitive", SENSITIVE_PROP, + "style", STYLE_PROP, + "weight", WEIGHT_PROP, + "cell-background", BACKGROUND_PROP, + NULL); + int foregroundCol = FOREGROUND_PROP; + if (property == VERSION_PROP) { + foregroundCol = VERSION_FOREGROUND_PROP; + gtk_tree_view_column_add_attribute (column, renderer, + "button-visible", HAS_UPGRADE_PROP); + gtk_tree_view_column_add_attribute (column, renderer, + "active", TO_UPGRADE_PROP); + g_signal_connect (G_OBJECT (renderer), "toggled", + G_CALLBACK (upgrade_toggled_cb), this); + } + else if (property == REPOSITORY_PROP) + gtk_tree_view_column_add_attribute (column, renderer, + "stock-id", REPOSITORY_STOCK_PROP); + gtk_tree_view_column_add_attribute (column, renderer, "foreground", foregroundCol); + if (identAuto) + gtk_tree_view_column_add_attribute (column, renderer, "xpad", XPAD_PROP); + gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_resizable (column, TRUE); +// gtk_tree_view_column_set_reorderable (column, TRUE); + if (size >= 0) + gtk_tree_view_column_set_fixed_width (column, size); + else + gtk_tree_view_column_set_expand (column, TRUE); + gtk_tree_view_column_set_visible (column, visible); +// if (sortable) + gtk_tree_view_column_set_clickable (column, true); + g_signal_connect (G_OBJECT (column), "clicked", + G_CALLBACK (column_clicked_cb), this); + if (property == NAME_PROP || property == NAME_SUMMARY_PROP) { + gtk_tree_view_column_set_sort_indicator (column, TRUE); + gtk_tree_view_column_set_sort_order (column, GTK_SORT_ASCENDING); + } +// gtk_tree_view_insert_column (view, column, reverse ? 0 : -1); + gtk_tree_view_append_column (view, column); + g_object_set_data (G_OBJECT (column), "property", GINT_TO_POINTER (property+1)); } - void appendCheckColumn (const std::string &prop) + void appendCheckColumn (int property) { - int modelCol = translateProperty (prop); - GtkTreeView *view = GTK_TREE_VIEW (m_view); GtkCellRenderer *renderer = gtk_cell_renderer_toggle_new(); GtkTreeViewColumn *column = gtk_tree_view_column_new_with_attributes (NULL, - renderer, "active", modelCol, "visible", CHECK_VISIBLE_PROP, + renderer, "active", property, "visible", CHECK_VISIBLE_PROP, "sensitive", SENSITIVE_PROP, "cell-background", BACKGROUND_PROP, NULL); g_signal_connect (G_OBJECT (renderer), "toggled", @@ -911,14 +907,15 @@ gtk_tree_view_column_set_fixed_width (column, 25); gtk_tree_view_append_column (view, column); - Action action = columnAction (modelCol); + Action action = TOGGLE_ACTION; g_object_set_data (G_OBJECT (renderer), "action", GINT_TO_POINTER (action)); if (m_activate_action == NONE_ACTION) m_activate_action = action; g_object_set_data (G_OBJECT (column), "status-tooltip", GINT_TO_POINTER (1)); + g_object_set_data (G_OBJECT (column), "property", GINT_TO_POINTER (property+1)); } - void appendButtonColumn (const char *header, const std::string &prop) + void appendButtonColumn (const char *header, int property) { int labelCol = ACTION_LABEL_PROP, stockCol = ACTION_STOCK_PROP; @@ -963,66 +960,26 @@ gtk_tree_view_column_set_fixed_width (column, width); gtk_tree_view_append_column (view, column); - Action action = columnAction (TO_INSTALL_PROP); + Action action = INSTALL_ACTION; g_object_set_data (G_OBJECT (renderer), "action", GINT_TO_POINTER (action)); if (m_activate_action == NONE_ACTION) m_activate_action = action; g_object_set_data (G_OBJECT (column), "status-tooltip", GINT_TO_POINTER (1)); } - void appendTextColumn (const char *header, const std::string &prop, bool visible, bool sortable, bool identAuto = false) + void appendIconColumn (const char *header, int property) { - int col = translateProperty (prop); - int size = 100; - if (col == NAME_PROP || col == NAME_SUMMARY_PROP) - size = -1; - GtkTreeView *view = GTK_TREE_VIEW (m_view); if (header) gtk_tree_view_set_headers_visible (view, TRUE); - GtkCellRenderer *renderer = gtk_cell_renderer_text_new(); - PangoEllipsizeMode ellipsize = PANGO_ELLIPSIZE_END; - if (size >= 0 && col != NAME_SUMMARY_PROP) - ellipsize = PANGO_ELLIPSIZE_MIDDLE; - g_object_set (G_OBJECT (renderer), "ellipsize", ellipsize, NULL); -/* gboolean reverse = gtk_widget_get_default_direction() == GTK_TEXT_DIR_RTL; - if (reverse) { // work-around: Pango ignored alignment flag on RTL - gtk_widget_set_direction (m_view, GTK_TEXT_DIR_LTR); - g_object_set (renderer, "alignment", PANGO_ALIGN_RIGHT, NULL); - }*/ - const char *colType = col == NAME_SUMMARY_PROP ? "markup" : "text"; - GtkTreeViewColumn *column; - column = gtk_tree_view_column_new_with_attributes ( - header, renderer, colType, col, - "sensitive", SENSITIVE_PROP, - "style", STYLE_PROP, - "weight", WEIGHT_PROP, - "cell-background", BACKGROUND_PROP, - NULL); - int foregroundCol = FOREGROUND_PROP; - if (col == AVAILABLE_VERSION_PROP) - foregroundCol = VERSION_FOREGROUND_PROP; - gtk_tree_view_column_add_attribute (column, renderer, "foreground", foregroundCol); - g_object_set_data_full (G_OBJECT (column), "property", g_strdup (prop.c_str()), g_free); - if (identAuto) - gtk_tree_view_column_add_attribute (column, renderer, "xpad", XPAD_PROP); + GtkCellRenderer *renderer = gtk_cell_renderer_pixbuf_new(); + int height = MAX (34, YGUtils::getCharsHeight (m_view, 2)); + gtk_cell_renderer_set_fixed_size (renderer, -1, height); + GtkTreeViewColumn *column = gtk_tree_view_column_new_with_attributes ( + header, renderer, "pixbuf", property, + "cell-background", BACKGROUND_PROP, NULL); gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_resizable (column, TRUE); -// gtk_tree_view_column_set_reorderable (column, TRUE); - if (size >= 0) - gtk_tree_view_column_set_fixed_width (column, size); - else - gtk_tree_view_column_set_expand (column, TRUE); - gtk_tree_view_column_set_visible (column, visible); - gtk_tree_view_column_set_clickable (column, sortable); - if (sortable) - g_signal_connect (G_OBJECT (column), "clicked", - G_CALLBACK (column_clicked_cb), this); - if (col == NAME_PROP || col == NAME_SUMMARY_PROP) { - gtk_tree_view_column_set_sort_indicator (column, TRUE); - gtk_tree_view_column_set_sort_order (column, GTK_SORT_ASCENDING); - } -// gtk_tree_view_insert_column (view, column, reverse ? 0 : -1); + gtk_tree_view_column_set_fixed_width (column, 38); gtk_tree_view_append_column (view, column); } @@ -1035,12 +992,6 @@ gtk_tree_view_append_column (view, column); } - void removeColumn (const char *header) - { gtk_tree_view_remove_column (GTK_TREE_VIEW (m_view), getColumn (header)); } - - bool hasColumn (const char *header) - { return getColumn (header); } - void setRulesHint (bool hint) { gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (m_view), TRUE); } @@ -1101,68 +1052,66 @@ { pThis->selectAll(); } static void show_column_cb (GtkCheckMenuItem *item, Impl *pThis) { - GList *siblings = gtk_container_get_children (GTK_CONTAINER ( - gtk_widget_get_parent (GTK_WIDGET (item)))), *i; - for (i = siblings; i; i = i->next) - if (i->data == item) - break; - int index = g_list_position (siblings, i) + 1; - g_list_free (siblings); - bool visible = gtk_check_menu_item_get_active (item); + int col = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "column")); GtkTreeViewColumn *column = gtk_tree_view_get_column ( - GTK_TREE_VIEW (pThis->m_view), index); + GTK_TREE_VIEW (pThis->m_view), col); + bool visible = gtk_check_menu_item_get_active (item); gtk_tree_view_column_set_visible (column, visible); } }; Ypp::PkgList packages = getSelected(); - bool empty = true, canLock = packages.canLock(), unlocked = packages.unlocked(); + bool empty = true, canLock = packages.canLock(), unlocked = packages.isUnlocked(); bool locked = !unlocked && canLock; - if (packages.notInstalled()) + if (packages.isNotInstalled()) inner::appendItem (menu, _("_Install"), 0, GTK_STOCK_SAVE, !locked, inner::install_cb, this), empty = false; - if (packages.upgradable()) + if (packages.hasUpgrade()) inner::appendItem (menu, _("_Upgrade"), 0, GTK_STOCK_GOTO_TOP, !locked, inner::install_cb, this), empty = false; - if (packages.installed() && packages.canRemove()) + if (packages.isInstalled() && packages.canRemove()) inner::appendItem (menu, _("_Remove"), 0, GTK_STOCK_DELETE, !locked, inner::remove_cb, this), empty = false; - if (packages.modified()) + if (packages.toModify()) inner::appendItem (menu, _("_Undo"), 0, GTK_STOCK_UNDO, true, inner::undo_cb, this), empty = false; if (canLock) { static const char *lock_tooltip = "Package lock: prevents the package status from being modified by " "the solver (that is, it won't honour dependencies or collections ties.)"; - if (packages.locked()) - inner::appendItem (menu, _("_Unlock"), _(lock_tooltip), "pkg-unlocked.png", +// TODO: use lock and lock-open for the icons here + if (packages.isLocked()) + inner::appendItem (menu, _("_Unlock"), _(lock_tooltip), GTK_STOCK_DIALOG_AUTHENTICATION,//"pkg-unlocked.png", true, inner::unlock_cb, this), empty = false; if (unlocked) - inner::appendItem (menu, _("_Lock"), _(lock_tooltip), "pkg-locked.png", + inner::appendItem (menu, _("_Lock"), _(lock_tooltip), GTK_STOCK_DIALOG_AUTHENTICATION,//"pkg-locked.png", true, inner::lock_cb, this), empty = false; } if (!empty) gtk_menu_shell_append (GTK_MENU_SHELL (menu), gtk_separator_menu_item_new()); inner::appendItem (menu, NULL, NULL, GTK_STOCK_SELECT_ALL, true, inner::select_all_cb, this); - - GtkWidget *item = gtk_menu_item_new_with_mnemonic (_("_Show Column")); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), gtk_separator_menu_item_new()); + GtkWidget *item = gtk_menu_item_new_with_mnemonic (_("_Show column")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); GtkWidget *submenu = gtk_menu_new(); gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), submenu); - for (int i = 0; i < columns_size; i++) { - const Column *column = &columns[i]; - if (column->header) { - GtkWidget *item = gtk_check_menu_item_new_with_label (column->header); + GList *columns = gtk_tree_view_get_columns (GTK_TREE_VIEW (m_view)); + int n = 0; + for (GList *i = columns; i; i = i->next, n++) { + GtkTreeViewColumn *column = (GtkTreeViewColumn *) i->data; + const gchar *header = gtk_tree_view_column_get_title (column); + if (header) { + GtkWidget *item = gtk_check_menu_item_new_with_label (header); + g_object_set_data (G_OBJECT (item), "column", GINT_TO_POINTER (n)); gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), isVisible (column->prop)); - if (column->allowHide) - g_signal_connect (G_OBJECT (item), "toggled", - G_CALLBACK (inner::show_column_cb), this); - else - gtk_widget_set_sensitive (item, FALSE); + gboolean visible = gtk_tree_view_column_get_visible (column); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), visible); + g_signal_connect (G_OBJECT (item), "toggled", + G_CALLBACK (inner::show_column_cb), this); } } + g_list_free (columns); gtk_menu_attach_to_widget (GTK_MENU (menu), m_view, NULL); gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, button, event_time); @@ -1231,6 +1180,18 @@ return FALSE; } + static void upgrade_toggled_cb ( + GtkCellRenderer *renderer, gchar *path_str, Impl *pThis) + { + Ypp::Package *package = 0; + GtkTreeView *view = GTK_TREE_VIEW (pThis->m_view); + GtkTreeModel *model = gtk_tree_view_get_model (view); + GtkTreeIter iter; + gtk_tree_model_get_iter_from_string (model, &iter, path_str); + gtk_tree_model_get (model, &iter, PTR_PROP, &package, -1); + package->install (0); + } + static void renderer_toggled_cb (GtkCellRenderer *renderer, gchar *path_str, Impl *pThis) { @@ -1269,7 +1230,7 @@ case REMOVE_ACTION: packages.remove(); break; case UNDO_ACTION: packages.undo(); break; case TOGGLE_ACTION: - if (packages.installed()) + if (packages.isInstalled()) packages.remove(); else packages.install(); @@ -1343,7 +1304,7 @@ if (!filename.empty()) pixbuf = YGUtils::loadPixbuf (filename.c_str()); if (!pixbuf) - gtk_tree_model_get (model, &iter, ICON_PROP, &pixbuf, -1); + gtk_tree_model_get (model, &iter, STATUS_ICON_PROP, &pixbuf, -1); if (pixbuf) { gtk_tooltip_set_icon (tooltip, pixbuf); g_object_unref (G_OBJECT (pixbuf)); @@ -1356,7 +1317,49 @@ static void column_clicked_cb (GtkTreeViewColumn *column, Impl *pThis) { -fprintf (stderr, "column clicked\n"); + int property = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (column), "property"))-1; + const char *prop = 0; + bool as_int = false; + switch (property) { + case NAME_PROP: + case NAME_SUMMARY_PROP: + prop = "name"; + break; + case VERSION_PROP: + prop = "installed-version"; + break; + case REPOSITORY_PROP: + prop = "repository"; + as_int = true; + break; + case SUPPORT_PROP: + prop = "support"; + as_int = true; + break; + case SIZE_PROP: + prop = "size"; + as_int = true; + break; + case INSTALLED_CHECK_PROP: + prop = "installed"; + as_int = true; + break; + default: break; + } + + if (prop) { +fprintf (stderr, "sort list by %s as int? %d\n", prop, as_int); + Ypp::PkgList list (pThis->m_list); + pThis->clear(); + + list.sort_by_property (prop, as_int); + pThis->setList (list, NULL); + + gtk_tree_view_column_set_sort_indicator (column, TRUE); + gtk_tree_view_column_set_sort_order (column, GTK_SORT_ASCENDING); + } + +#if 0 GList *columns = gtk_tree_view_get_columns (GTK_TREE_VIEW (pThis->m_view)); for (GList *i = columns; i; i = i->next) { GtkTreeViewColumn *col = (GtkTreeViewColumn *) i->data; @@ -1382,6 +1385,7 @@ if (prop != "name") l = Ypp::PkgSort (pThis->m_list, prop.c_str(), sort == GTK_SORT_ASCENDING); pThis->setListImpl (l, NULL); +#endif } }; @@ -1420,11 +1424,20 @@ void YGtkPackageView::clear() { impl->clear(); } -void YGtkPackageView::setVisible (const std::string &property, bool visible) -{ impl->setVisible (property, visible); } +void YGtkPackageView::appendTextColumn (const char *header, int property, bool visible, int size, bool identAuto) +{ return impl->appendTextColumn (header, property, visible, size, identAuto); } + +void YGtkPackageView::appendCheckColumn (int property) +{ return impl->appendCheckColumn (property); } + +void YGtkPackageView::appendButtonColumn (const char *header, int property) +{ return impl->appendButtonColumn (header, property); } + +void YGtkPackageView::appendIconColumn (const char *header, int property) +{ return impl->appendIconColumn (header, property); } -bool YGtkPackageView::isVisible (const std::string &property) -{ return impl->isVisible (property); } +void YGtkPackageView::appendEmptyColumn (int size) +{ return impl->appendEmptyColumn (size); } void YGtkPackageView::setRulesHint (bool hint) { impl->setRulesHint (hint); } Modified: trunk/gtk/src/pkg/ygtkpackageview.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpackageview.h?re… ============================================================================== --- trunk/gtk/src/pkg/ygtkpackageview.h (original) +++ trunk/gtk/src/pkg/ygtkpackageview.h Tue Jan 26 17:10:22 2010 @@ -23,6 +23,12 @@ #define YGTK_PACKAGE_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), \ YGTK_TYPE_PACKAGE_VIEW, YGtkPackageViewClass)) +enum Property { NAME_PROP, SUMMARY_PROP, NAME_SUMMARY_PROP, VERSION_PROP, + AVAILABLE_VERSION_PROP, INSTALLED_VERSION_PROP, + REPOSITORY_PROP, SUPPORT_PROP, SIZE_PROP, + INSTALLED_CHECK_PROP, STATUS_ICON_PROP, TOTAL_PROPS +}; + struct YGtkPackageView { // use ygtk_package_view_new() to instance the object GtkScrolledWindow parent; @@ -31,8 +37,11 @@ void packList (const char *header, Ypp::PkgList list, const char *applyAllLabel); void clear(); - void setVisible (const std::string &property, bool visible); - bool isVisible (const std::string &property); + void appendTextColumn (const char *header, int property, bool visible, int size, bool identAuto = false); + void appendCheckColumn (int property); + void appendButtonColumn (const char *header, int property); + void appendIconColumn (const char *header, int property); + void appendEmptyColumn (int size); void setRulesHint (bool hint); enum Action { NONE_ACTION, INSTALL_ACTION, REMOVE_ACTION, UNDO_ACTION, TOGGLE_ACTION }; @@ -56,5 +65,7 @@ YGtkPackageView* ygtk_package_view_new (gboolean descriptiveTooltip); GType ygtk_package_view_get_type (void) G_GNUC_CONST; +const char *getRepositoryStockIcon (const std::string &url); + #endif /*YGTK_PACKAGE_VIEW_H*/ Modified: trunk/gtk/src/pkg/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/yzyppwrapper.cc?rev=… ============================================================================== --- trunk/gtk/src/pkg/yzyppwrapper.cc (original) +++ trunk/gtk/src/pkg/yzyppwrapper.cc Tue Jan 26 17:10:22 2010 @@ -236,6 +236,9 @@ virtual std::string support() { return ""; } virtual std::string supportText (MarkupType markup) { return ""; } virtual std::string size() { return ""; } + virtual std::string license() { return ""; } + virtual std::string installedDate() { return ""; } + virtual std::string candidateDate() { return ""; } virtual std::string icon() = 0; virtual bool isRecommended() const { return false; } virtual bool isSuggested() const { return false; } @@ -303,6 +306,9 @@ std::string Ypp::Package::support() { return impl->support(); } std::string Ypp::Package::supportText (MarkupType markup) { return impl->supportText (markup); } std::string Ypp::Package::size() { return impl->size(); } +std::string Ypp::Package::license() { return impl->license(); } +std::string Ypp::Package::installedDate() { return impl->installedDate(); } +std::string Ypp::Package::candidateDate() { return impl->candidateDate(); } std::string Ypp::Package::icon() { return impl->icon(); } bool Ypp::Package::isRecommended() const { return impl->isRecommended(); } bool Ypp::Package::isSuggested() const { return impl->isSuggested(); } @@ -366,6 +372,10 @@ return description (markup); if (prop == "filelist") return filelist (markup); + if (prop == "requires") + return requires (NO_MARKUP); + if (prop == "provides") + return provides (NO_MARKUP); if (prop == "support") return support(); if (prop == "size") @@ -599,6 +609,12 @@ text += br; } + ZyppPackage package = tryCastToZyppPkg (object); + std::string url = package->url(); + if (!url.empty()) + text += std::string ("") + _("Web site:") + " <a href=\"" + url + "\">" + url + "</a>"; + +#if 0 if (!isInstalled() && (isRecommended() || isSuggested())) { text += ""; if (isRecommended()) @@ -607,35 +623,6 @@ text += _("(As this package complements some installed packages, it is suggested it be installed.)"); text += "" + br; } - - // specific - ZyppPackage package = tryCastToZyppPkg (object); -#if ZYPP_VERSION >= 5013001 - text += br + "" + _("Size:") + " " + object->installSize().asString(); -#else - text += br + "" + _("Size:") + " " + object->installsize().asString(); -#endif - std::string url = package->url(), license = package->license(); - if (!url.empty()) - text += br + "" + _("Web site:") + " <a href=\"" + url + "\">" + url + "</a>"; - if (!license.empty()) - text += br + "" + _("License:") + " " + license; -#if 0 - text += br + "" + _("Category:") + " " + package->group(); -#endif -#if 0 // show "Installed at:" and "Last build:" info - bool hasCandidate = m_sel->hasCandidateObj(); - if (isInstalled()) { - text += br + "" + _("Installed at:") + " " + m_sel->installedObj()->installtime().form("%x"); - if (!hasUpgrade()) - hasCandidate = false; // only for upgrades - if (hasCandidate) - text += "   "; - } - else if (hasCandidate) - text += br; - if (hasCandidate) - text += std::string ("") + _("Last build:") + " " + m_sel->candidateObj()->buildtime().form("%x"); #endif break; } @@ -881,6 +868,15 @@ virtual std::string size() { return m_sel->theObj()->installSize().asString(); } + virtual std::string license() + { return tryCastToZyppPkg (m_sel->theObj())->license(); } + + virtual std::string installedDate() + { return isInstalled() ? m_sel->installedObj()->installtime().form("%x") : ""; } + + virtual std::string candidateDate() + { return m_sel->hasCandidateObj() ? m_sel->candidateObj()->buildtime().form("%x") : ""; } + virtual std::string icon() { if (type == Ypp::Package::PATTERN_TYPE) { @@ -1828,6 +1824,18 @@ void Ypp::PkgList::sort (bool (* compare) (Package *, Package *)) { std::sort (impl->pool.begin(), impl->pool.end(), compare ? compare : pkgorder); } +static std::string _prop; // HACK +static bool int_prop_order (Ypp::Package *a, Ypp::Package *b) +{ return a->getPropertyInt (_prop) < b->getPropertyInt (_prop); } +static bool str_prop_order (Ypp::Package *a, Ypp::Package *b) +{ return a->getPropertyStr (_prop) < b->getPropertyStr (_prop); } + +void Ypp::PkgList::sort_by_property (const std::string &prop, bool as_int) +{ + _prop = prop; + sort (as_int ? int_prop_order : str_prop_order); +} + void Ypp::PkgList::remove (int i) { impl->remove (i); } @@ -1876,22 +1884,22 @@ bool Ypp::PkgList::operator == (const Ypp::PkgList &other) const { return this->impl == other.impl; } -bool Ypp::PkgList::installed() const +bool Ypp::PkgList::isInstalled() const { impl->buildProps(); return impl->_allInstalled; } -bool Ypp::PkgList::notInstalled() const +bool Ypp::PkgList::isNotInstalled() const { impl->buildProps(); return impl->_allNotInstalled; } -bool Ypp::PkgList::upgradable() const +bool Ypp::PkgList::hasUpgrade() const { impl->buildProps(); return impl->_allUpgradable; } -bool Ypp::PkgList::modified() const +bool Ypp::PkgList::toModify() const { impl->buildProps(); return impl->_allModified; } -bool Ypp::PkgList::locked() const +bool Ypp::PkgList::isLocked() const { impl->buildProps(); return impl->_allLocked; } -bool Ypp::PkgList::unlocked() const +bool Ypp::PkgList::isUnlocked() const { impl->buildProps(); return impl->_allUnlocked; } bool Ypp::PkgList::canLock() const @@ -1900,6 +1908,9 @@ bool Ypp::PkgList::canRemove() const { impl->buildProps(); return impl->_allCanRemove; } +void Ypp::PkgList::refreshProps() +{ impl->inited = false; } + void Ypp::PkgList::install() { Ypp::get()->startTransactions(); @@ -2132,21 +2143,6 @@ : PkgList ((impl = new PkgQuery::Impl (Ypp::get()->getPackages (type), query))) { copy (Ypp::get()->getPackages (type)); } -//** PkgSort - -static std::string _prop; // hack -static bool _ascend; - -static bool prop_order (Ypp::Package *a, Ypp::Package *b) -{ - int r = strcasecmp (a->getPropertyStr (_prop).c_str(), b->getPropertyStr (_prop).c_str()); - return _ascend ? r < 0 : r >= 0; -} - -Ypp::PkgSort::PkgSort (PkgList list, const std::string &prop, bool ascend) -: PkgList() -{ copy (list); _prop = prop; _ascend = ascend; sort (prop_order); } - //** Misc struct Ypp::Disk::Impl Modified: trunk/gtk/src/pkg/yzyppwrapper.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/yzyppwrapper.h?rev=6… ============================================================================== --- trunk/gtk/src/pkg/yzyppwrapper.h (original) +++ trunk/gtk/src/pkg/yzyppwrapper.h Tue Jan 26 17:10:22 2010 @@ -63,6 +63,9 @@ std::string supportText (MarkupType markup); std::string size(); std::string icon(); + std::string license(); + std::string installedDate(); + std::string candidateDate(); bool isRecommended() const; bool isSuggested() const; int buildAge() const; // if < 0 , unsupported or error @@ -129,6 +132,7 @@ void reserve (int size); void append (Package *package); void sort (bool (* order) (Package *, Package *) = 0); + void sort_by_property (const std::string &prop, bool as_int); void remove (int index); void copy (const PkgList list); // will only copy entry for which match() == true @@ -139,16 +143,18 @@ // NOTE: checks if both lists point to the same memory space, not equal contents bool operator == (const PkgList &other) const; - // common properties + // common properties (nomenclature used from Ypp::Package) // NOTE: there is a hit first time one of these methods is used - bool installed() const; - bool notInstalled() const; - bool upgradable() const; - bool modified() const; - bool locked() const; - bool unlocked() const; + // FIXME: we might move these methods into some "ListProps" structure + bool isInstalled() const; + bool isNotInstalled() const; + bool hasUpgrade() const; + bool toModify() const; + bool isLocked() const; + bool isUnlocked() const; bool canRemove() const; bool canLock() const; + void refreshProps(); // actions // NOTE: can take time (depending on size); show busy cursor @@ -239,10 +245,6 @@ Impl *impl; }; - struct PkgSort : public PkgList { - PkgSort (PkgList list, const std::string &prop, bool ascending); - }; - // list primitives const PkgList getPackages (Package::Type type); Modified: trunk/gtk/src/ygtkrichtext.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkrichtext.c?rev=60541… ============================================================================== --- trunk/gtk/src/ygtkrichtext.c (original) +++ trunk/gtk/src/ygtkrichtext.c Tue Jan 26 17:10:22 2010 @@ -320,8 +320,7 @@ if (attribute_names[0] && !g_ascii_strcasecmp (attribute_names[0], "color")) { tag->tag = gtk_text_buffer_create_tag (state->buffer, NULL, - "foreground", attribute_values[0], - NULL); + "foreground", attribute_values[0], NULL); state->default_color = FALSE; } else @@ -331,8 +330,7 @@ if (attribute_names[0] && !g_ascii_strcasecmp (attribute_names[0], "href")) { tag->tag = gtk_text_buffer_create_tag (state->buffer, NULL, - "underline", PANGO_UNDERLINE_SINGLE, - NULL); + "underline", PANGO_UNDERLINE_SINGLE, NULL); if (state->default_color) g_object_set (tag->tag, "foreground-gdk", &link_color, NULL); g_object_set_data (G_OBJECT (tag->tag), "link", g_strdup (attribute_values[0])); @@ -361,7 +359,6 @@ HTMLList_init (list, !g_ascii_strcasecmp (element_name, "ol")); state->html_list = g_list_append (state->html_list, list); } - else if (!g_ascii_strcasecmp (element_name, "img")) { if (attribute_names[0] && !g_ascii_strcasecmp (attribute_names[0], "src")) { @@ -374,8 +371,7 @@ else g_warning ("Unknown img attribute: '%s'", attribute_names[0]); } - - // for tags like , GMarkup will pass them through the end + // tags like , GMarkup will pass them through the end // tag callback too, so we'll deal with them there else if (!g_ascii_strcasecmp (element_name, "br")) ; else if (!g_ascii_strcasecmp (element_name, "hr")) ; @@ -388,6 +384,15 @@ g_warning ("Unknown tag '%s'", element_name); } } + else if (attribute_names[0]) { // tags that may have extra attributes + if (!g_ascii_strcasecmp (element_name, "p")) { + if (!g_ascii_strcasecmp (attribute_names[0], "bgcolor")) + tag->tag = gtk_text_buffer_create_tag (state->buffer, NULL, + "paragraph-background", attribute_values[0], NULL); + else + g_warning ("Unknown p attribute: '%s'", attribute_names[0]); + } + } if (!tag->tag && isIdentTag (element_name)) { state->left_margin += IDENT_MARGIN; Modified: trunk/gtk/src/ygtkwizard.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.c?rev=60541&r… ============================================================================== --- trunk/gtk/src/ygtkwizard.c (original) +++ trunk/gtk/src/ygtkwizard.c Tue Jan 26 17:10:22 2010 @@ -920,7 +920,7 @@ { if (!wizard->menu) { wizard->menu = gtk_menu_bar_new(); - ygtk_wizard_set_custom_menu (wizard, wizard->menu); + ygtk_wizard_set_custom_menu (wizard, wizard->menu, TRUE); gtk_widget_show (wizard->menu); } @@ -1001,12 +1001,13 @@ } } -void ygtk_wizard_set_custom_menu (YGtkWizard *wizard, GtkWidget *menu_bar) +void ygtk_wizard_set_custom_menu (YGtkWizard *wizard, GtkWidget *menu_bar, gboolean hide_header) { 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); + if (hide_header) + gtk_widget_hide (wizard->m_title); } void ygtk_wizard_add_step_header (YGtkWizard *wizard, const char *text) Modified: trunk/gtk/src/ygtkwizard.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.h?rev=60541&r… ============================================================================== --- trunk/gtk/src/ygtkwizard.h (original) +++ trunk/gtk/src/ygtkwizard.h Tue Jan 26 17:10:22 2010 @@ -162,7 +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_set_custom_menu (YGtkWizard *wizard, GtkWidget *menu_bar, gboolean hide_header); 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

[yast-commit] r60540 - in /branches/SuSE-Code-11-Branch/wagon: package/yast2-wagon.changes src/clients/wagon.ycp src/modules/Wagon.ycp
by locilka＠svn.opensuse.org 26 Jan '10

26 Jan '10

Author: locilka Date: Tue Jan 26 15:16:11 2010 New Revision: 60540 URL: http://svn.opensuse.org/viewcvs/yast?rev=60540&view=rev Log: - Added support for migration hook scripts. Modified: branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-Branch/wagon/src/clients/wagon.ycp branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp Modified: branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/pac… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes Tue Jan 26 15:16:11 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jan 26 15:13:12 CET 2010 - locilka(a)suse.cz + +- Added support for migration hook scripts. + +------------------------------------------------------------------- Mon Jan 25 11:59:30 CET 2010 - locilka(a)suse.cz - Upgrading installed products moved after wagon self-update and Modified: branches/SuSE-Code-11-Branch/wagon/src/clients/wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/clients/wagon.ycp (original) +++ branches/SuSE-Code-11-Branch/wagon/src/clients/wagon.ycp Tue Jan 26 15:16:11 2010 @@ -269,6 +269,10 @@ return true; } + // Hooks for testing and manual changes + // --> /usr/lib/YaST2/bin/wagon_hook_init + Wagon::RunHook ("init"); + // main() HandleInit(); @@ -294,5 +298,9 @@ HandleRet (ret); + // Hooks for testing and manual changes + // --> /usr/lib/YaST2/bin/wagon_hook_finish + Wagon::RunHook ("finish"); + return ret; } Modified: branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp Tue Jan 26 15:16:11 2010 @@ -474,5 +474,31 @@ return (string) splitstring (cmd["stdout"]:"", "\n")[0]:nil; } + global boolean RunHook (string script_name) { + if (script_name == nil || script_name == "") { + y2error ("Script name '%1' is not supported", script_name); + } + + script_name = sformat ("/usr/lib/YaST2/bin/wagon_hook_%1", script_name); + + if (! FileUtils::Exists (script_name)) { + y2milestone ("Hook script %1 doesn't exist, nothing to run", script_name); + return false; + } + + y2milestone ("Running hook %1", script_name); + map cmd = (map) WFM::Execute (.local.bash_output, String::Quote (script_name)); + + if (cmd["exit"]:-1 != 0) { + y2error ("Hook script returned: %1", cmd); + Report::Error (sformat(_("Error running hook script %1."), script_name)); + return false; + } + + y2milestone ("Hook script returned: %1", cmd); + + return true; + } + /* EOF */ } -- 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] r60539 - in /branches/SuSE-Code-11-SP1-Branch/wagon: package/yast2-wagon.changes src/clients/wagon.ycp src/modules/Wagon.ycp
by locilka＠svn.opensuse.org 26 Jan '10

26 Jan '10

Author: locilka Date: Tue Jan 26 15:15:50 2010 New Revision: 60539 URL: http://svn.opensuse.org/viewcvs/yast?rev=60539&view=rev Log: - Added support for migration hook scripts. Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes Tue Jan 26 15:15:50 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jan 26 15:13:12 CET 2010 - locilka(a)suse.cz + +- Added support for migration hook scripts. + +------------------------------------------------------------------- Mon Jan 25 11:59:30 CET 2010 - locilka(a)suse.cz - Upgrading installed products moved after wagon self-update and Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon.ycp Tue Jan 26 15:15:50 2010 @@ -269,6 +269,10 @@ return true; } + // Hooks for testing and manual changes + // --> /usr/lib/YaST2/bin/wagon_hook_init + Wagon::RunHook ("init"); + // main() HandleInit(); @@ -294,5 +298,9 @@ HandleRet (ret); + // Hooks for testing and manual changes + // --> /usr/lib/YaST2/bin/wagon_hook_finish + Wagon::RunHook ("finish"); + return ret; } Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp Tue Jan 26 15:15:50 2010 @@ -474,5 +474,31 @@ return (string) splitstring (cmd["stdout"]:"", "\n")[0]:nil; } + global boolean RunHook (string script_name) { + if (script_name == nil || script_name == "") { + y2error ("Script name '%1' is not supported", script_name); + } + + script_name = sformat ("/usr/lib/YaST2/bin/wagon_hook_%1", script_name); + + if (! FileUtils::Exists (script_name)) { + y2milestone ("Hook script %1 doesn't exist, nothing to run", script_name); + return false; + } + + y2milestone ("Running hook %1", script_name); + map cmd = (map) WFM::Execute (.local.bash_output, String::Quote (script_name)); + + if (cmd["exit"]:-1 != 0) { + y2error ("Hook script returned: %1", cmd); + Report::Error (sformat(_("Error running hook script %1."), script_name)); + return false; + } + + y2milestone ("Hook script returned: %1", cmd); + + return true; + } + /* EOF */ } -- 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] r60538 - in /trunk/wagon: package/yast2-wagon.changes src/clients/wagon.ycp src/modules/Wagon.ycp
by locilka＠svn.opensuse.org 26 Jan '10

26 Jan '10

Author: locilka Date: Tue Jan 26 15:15:34 2010 New Revision: 60538 URL: http://svn.opensuse.org/viewcvs/yast?rev=60538&view=rev Log: - Added support for migration hook scripts. Modified: trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/clients/wagon.ycp trunk/wagon/src/modules/Wagon.ycp Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Tue Jan 26 15:15:34 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jan 26 15:13:12 CET 2010 - locilka(a)suse.cz + +- Added support for migration hook scripts. + +------------------------------------------------------------------- Mon Jan 25 11:59:30 CET 2010 - locilka(a)suse.cz - Upgrading installed products moved after wagon self-update and Modified: trunk/wagon/src/clients/wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon.ycp?rev=… ============================================================================== --- trunk/wagon/src/clients/wagon.ycp (original) +++ trunk/wagon/src/clients/wagon.ycp Tue Jan 26 15:15:34 2010 @@ -269,6 +269,10 @@ return true; } + // Hooks for testing and manual changes + // --> /usr/lib/YaST2/bin/wagon_hook_init + Wagon::RunHook ("init"); + // main() HandleInit(); @@ -294,5 +298,9 @@ HandleRet (ret); + // Hooks for testing and manual changes + // --> /usr/lib/YaST2/bin/wagon_hook_finish + Wagon::RunHook ("finish"); + return ret; } Modified: trunk/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/modules/Wagon.ycp?rev=… ============================================================================== --- trunk/wagon/src/modules/Wagon.ycp (original) +++ trunk/wagon/src/modules/Wagon.ycp Tue Jan 26 15:15:34 2010 @@ -474,5 +474,31 @@ return (string) splitstring (cmd["stdout"]:"", "\n")[0]:nil; } + global boolean RunHook (string script_name) { + if (script_name == nil || script_name == "") { + y2error ("Script name '%1' is not supported", script_name); + } + + script_name = sformat ("/usr/lib/YaST2/bin/wagon_hook_%1", script_name); + + if (! FileUtils::Exists (script_name)) { + y2milestone ("Hook script %1 doesn't exist, nothing to run", script_name); + return false; + } + + y2milestone ("Running hook %1", script_name); + map cmd = (map) WFM::Execute (.local.bash_output, String::Quote (script_name)); + + if (cmd["exit"]:-1 != 0) { + y2error ("Hook script returned: %1", cmd); + Report::Error (sformat(_("Error running hook script %1."), script_name)); + return false; + } + + y2milestone ("Hook script returned: %1", cmd); + + return true; + } + /* EOF */ } -- 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] r60537 - /branches/SuSE-Code-11-SP1-Branch/reipl/autodocs-ycp.ami
by jsrain＠svn.opensuse.org 26 Jan '10

26 Jan '10

Author: jsrain Date: Tue Jan 26 14:09:06 2010 New Revision: 60537 URL: http://svn.opensuse.org/viewcvs/yast?rev=60537&view=rev Log: removed autogenerated file Removed: branches/SuSE-Code-11-SP1-Branch/reipl/autodocs-ycp.ami -- 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] r60536 - /tags/branch-Code-11-SP1-2_17_4/reipl/
by jsrain＠svn.opensuse.org 26 Jan '10

26 Jan '10

Author: jsrain Date: Tue Jan 26 14:00:20 2010 New Revision: 60536 URL: http://svn.opensuse.org/viewcvs/yast?rev=60536&view=rev Log: Created tag branch-Code-11-SP1-2_17_4 for reipl Added: tags/branch-Code-11-SP1-2_17_4/reipl/ (props changed) - copied from r60535, branches/SuSE-Code-11-SP1-Branch/reipl/ -- 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] r60535 - in /branches/SuSE-Code-11-SP1-Branch/reipl: VERSION package/yast2-reipl.changes
by jsrain＠svn.opensuse.org 26 Jan '10

26 Jan '10

Author: jsrain Date: Tue Jan 26 14:00:13 2010 New Revision: 60535 URL: http://svn.opensuse.org/viewcvs/yast?rev=60535&view=rev Log: bump Modified: branches/SuSE-Code-11-SP1-Branch/reipl/VERSION branches/SuSE-Code-11-SP1-Branch/reipl/package/yast2-reipl.changes Modified: branches/SuSE-Code-11-SP1-Branch/reipl/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/reipl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/reipl/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/reipl/VERSION Tue Jan 26 14:00:13 2010 @@ -1 +1 @@ -2.17.3 +2.17.4 Modified: branches/SuSE-Code-11-SP1-Branch/reipl/package/yast2-reipl.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/reipl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/reipl/package/yast2-reipl.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/reipl/package/yast2-reipl.changes Tue Jan 26 14:00:13 2010 @@ -2,6 +2,7 @@ Mon Apr 20 12:01:39 CEST 2009 - jsrain(a)suse.cz - fixed handling of more than 26 disks (bnc #492326) +- 2.17.4 ------------------------------------------------------------------- Mon Feb 9 09:38:05 CET 2009 - hare(a)suse.de -- 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] r60534 - /tags/branch-Code-11-2_17_8_1/wagon/
by locilka＠svn.opensuse.org 26 Jan '10

26 Jan '10

Author: locilka Date: Tue Jan 26 12:49:03 2010 New Revision: 60534 URL: http://svn.opensuse.org/viewcvs/yast?rev=60534&view=rev Log: Created tag branch-Code-11-2_17_8_1 for wagon Added: tags/branch-Code-11-2_17_8_1/wagon/ - copied from r60533, branches/SuSE-Code-11-Branch/wagon/ -- 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] r60533 - /tags/branch-Code-11-2_17_8_1/
by locilka＠svn.opensuse.org 26 Jan '10

26 Jan '10

Author: locilka Date: Tue Jan 26 12:49:01 2010 New Revision: 60533 URL: http://svn.opensuse.org/viewcvs/yast?rev=60533&view=rev Log: Created tag branch-Code-11-2_17_8_1 Added: tags/branch-Code-11-2_17_8_1/ -- 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] r60532 - in /branches/SuSE-Code-11-Branch/wagon: ./ package/ src/ src/clients/ src/config/ src/include/ src/modules/
by locilka＠svn.opensuse.org 26 Jan '10

26 Jan '10

Author: locilka Date: Tue Jan 26 12:47:54 2010 New Revision: 60532 URL: http://svn.opensuse.org/viewcvs/yast?rev=60532&view=rev Log: - Upgrading installed products moved after wagon self-update and restart In some cases the newly added code was not executed (BNC #573084). - Wagon extended to read and use migration products from the <upgrade> section from product control files (BNC #559554). - 2.17.8.1 Added: branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_migration_products.ycp branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_point_of_no_return.ycp branches/SuSE-Code-11-Branch/wagon/src/include/ branches/SuSE-Code-11-Branch/wagon/src/include/Makefile.am branches/SuSE-Code-11-Branch/wagon/src/include/common_func.ycp Modified: branches/SuSE-Code-11-Branch/wagon/VERSION branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-Branch/wagon/src/Makefile.am branches/SuSE-Code-11-Branch/wagon/src/clients/wagon.ycp branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_selfupdate.ycp branches/SuSE-Code-11-Branch/wagon/src/config/online_migration.xml branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp branches/SuSE-Code-11-Branch/wagon/yast2-wagon.spec.in Modified: branches/SuSE-Code-11-Branch/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/VER… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/VERSION (original) +++ branches/SuSE-Code-11-Branch/wagon/VERSION Tue Jan 26 12:47:54 2010 @@ -1 +1 @@ -2.17.8 +2.17.8.1 Modified: branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/pac… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes Tue Jan 26 12:47:54 2010 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Mon Jan 25 11:59:30 CET 2010 - locilka(a)suse.cz + +- Upgrading installed products moved after wagon self-update and + restart In some cases the newly added code was not executed + (BNC #573084). +- 2.17.8.1 + +------------------------------------------------------------------- +Fri Jan 22 11:57:00 CET 2010 - locilka(a)suse.cz + +- Wagon extended to read and use migration products from the + <upgrade> section from product control files (BNC #559554). + +------------------------------------------------------------------- Mon Feb 9 10:10:05 CET 2009 - locilka(a)suse.cz - Added new wagon_congratulate client - an envelope that loads the Modified: branches/SuSE-Code-11-Branch/wagon/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/Makefile.am (original) +++ branches/SuSE-Code-11-Branch/wagon/src/Makefile.am Tue Jan 26 12:47:54 2010 @@ -2,5 +2,5 @@ # Makefile.am for wagon/src # -SUBDIRS = modules clients config +SUBDIRS = modules include clients config Modified: branches/SuSE-Code-11-Branch/wagon/src/clients/wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/clients/wagon.ycp (original) +++ branches/SuSE-Code-11-Branch/wagon/src/clients/wagon.ycp Tue Jan 26 12:47:54 2010 @@ -26,6 +26,10 @@ import "CommandLine"; import "PackageLock"; import "PackageCallbacks"; + import "Report"; + import "FileUtils"; + + include "wagon/common_func.ycp"; textdomain "wagon"; @@ -137,6 +141,134 @@ } } + boolean RevertToOldProducts () { + if (Wagon::abort_can_revert_products != true) { + y2warning ("Cannot revert the previous state of products, sorry. Installed products were: %1, Migration products were: %2", + Wagon::products_before_migration, Wagon::migration_products); + + Report::Warning (_("Cannot revert the previous state of installed products. +You will have to revert them manually.")); + + return false; + } + + Wizard::SetContents ( + _("Reverting Migration"), + `Label(_("Migration tool has to remove the temporary migration products, +install the previously installed ones and contact Novell Customer Center +to get update repositories.")), + _("Several tasks can be done by the migration tool. If you skip this step, +you will have to do them manually."), + false, true + ); + Wizard::EnableAbortButton (); + + boolean cont = true; + while (true) { + any ret = UI::UserInput(); + if (ret == `next) { + cont = true; + break; + } else if (ret == `abort || ret == `cancel) { + if (Popup::AnyQuestion ( + // popup dialog caption + _("Migration Has to Be Reverted"), + // popup dialog qustion + _("Are you sure you want to skip reverting the migration?"), + // button + _("&Yes, Skip It"), + // button + _("&No"), + `focus_no + )) { + cont = false; + break; + } + } + } + + if (cont != true) { + y2warning ("User decided not to rollback"); + return false; + } + + ResetPackager(); + + // Full paths to product files + list <string> removed_product_files = []; + // Product packages + list <string> removed_packages = []; + + Wizard::SetContents ( + _("Reverting Migration"), + `Label(_("Removing temporary migration products...")), + "", + false, true + ); + + // Remove all the migration products using packages approach manually + // Removing via ResolvableRemove + PkgSolve usually produces errors, + // dependency loops etc. + // + y2milestone ("Removing newly installed products: %1", Wagon::migration_products); + foreach (string migration_product, Wagon::migration_products, { + foreach (map <string, any> remove_product, Pkg::ResolvableProperties (migration_product, `product, ""), { + remove_product = Wagon::MinimizeProductMap (remove_product); + + string product_file = remove_product["product_file"]:""; + if (product_file == nil || product_file == "") { + y2error ("Cannot remove product: %1, no product file defined", remove_product); + Report::Error (sformat(_("Cannot remove product %1"), remove_product["name"]:_("Unknown product"))); + return; + } + + if (! regexpmatch (product_file, "^/etc/products\\.d/.+")) + product_file = sformat ("/etc/products.d/%1", product_file); + + if (contains (removed_product_files, product_file)) { + y2milestone ("Product file %1 has been already removed", product_file); + return; + } + + string package_name = Wagon::GetFileOwner (product_file); + + if (package_name == nil || package_name == "") { + y2error ("Cannot find out file owner %1", product_file); + Report::Error (sformat(_("Cannot remove product %1"), remove_product["name"]:_("Unknown product"))); + return; + } + + if (Pkg::TargetRemove (package_name) != true) { + y2error ("Cannot remove package %1", package_name); + Report::Error (sformat(_("Cannot remove product %1. +Remove package %2 manually"), remove_product["name"]:_("Unknown product"), package_name)); + return; + } + + y2milestone ("Product %1/%2 has been successfully removed", remove_product, package_name); + removed_product_files = add (removed_product_files, product_file); + removed_packages = add (removed_packages, package_name); + }); + }); + + if (size (removed_packages) > 0) { + y2milestone ("%1 products were removed, reseting packager", size (removed_packages)); + ResetPackager(); + + foreach (string one_package, removed_packages, { + y2milestone ("Removed product package check: %1", Pkg::ResolvableProperties (one_package, `package, "")); + }); + } + + y2milestone ("Running registration"); + if (WFM::call ("inst_suse_register") == `abort) { + y2error ("Unable to register"); + return false; + } + + return true; + } + // main() HandleInit(); @@ -152,6 +284,12 @@ ret = ProductControl::RunFrom (current_step, false); } + // Wagon has been aborted, revert to the previous products + // if possible + if (ret == `abort || ret == `cancel) { + RevertToOldProducts(); + } + Wizard::CloseDialog(); HandleRet (ret); Added: branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_migration_products.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_migration_products.ycp (added) +++ branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_migration_products.ycp Tue Jan 26 12:47:54 2010 @@ -0,0 +1,189 @@ +/** + * File: + * clients/wagon_migration_products.ycp + * + * Module: + * Wagon + * + * Authors: + * Lukas Ocilka <locilka(a)suse.cz> + * + * Summary: + * Online Migration Tool + * + * $Id$ + * + */ + +{ + /** + * Selects and installs all migration products. + */ + + textdomain "wagon"; + + import "Wagon"; + import "PackagesUI"; + import "GetInstArgs"; + import "Report"; + import "Popup"; + import "Label"; + + include "wagon/common_func.ycp"; + + if (GetInstArgs::going_back()) { + y2milestone ("Going back..."); + return `back; + } + + integer UpdateInstalledProducts () { + integer affected_products = 0; + + list <map <string,any> > products = Pkg::ResolvableProperties ("", `product, ""); + + foreach (map<string, any> p, products, { + // Product is not installed + if (p["status"]:`unknown != `installed) return; + + // Make the logs readable + p["license"] = "..."; + p["description"] = "..."; + + string product_name = p["name"]:""; + string product_version = p["version"]:""; + + if (product_name == nil || product_name == "") { + y2error ("Cannot distinguish product name: %1", product_name); + return; + } + + // Product version is the same but release can be different + // product map doesn't contain the release string. To be sure, product will be reinstalled + y2milestone ("Upgrading product %1 version %2", product_name, product_version); + // The version is the same, release can be different + if (Pkg::ResolvableInstall (product_name, `product) != true) { + Report::Error (sformat(_("Cannot update installed product %1."), product_name)); + return; + } + + affected_products = affected_products + 1; + }); + + return affected_products; + } + + boolean FindAndSelectMigrationProducts () { + if (Wagon::InitPkg() != true) { + Report::Error (_("Unable to initialize the package manager.")); + return false; + } + + list <map <string,any> > products = Pkg::ResolvableProperties ("", `product, ""); + + foreach (map<string, any> p, products, { + if (p["status"]:`unknown != `installed) { + y2milestone ("Product %1 (%2) is not installed, skipping...", + p["name"]:"not-defined", p["short_name"]:p["display_name"]:"not-defined"); + return; + } + + if (! haskey (p, "upgrades") || p["upgrades"]:[] == []) { + y2warning ("Product %1 (%2) does not contain 'upgrades' section...", + p["name"]:"not-defined", p["short_name"]:p["display_name"]:"not-defined"); + return; + } + + y2milestone ("Going to upgrade product %1 (%2)", + p["name"]:"not-defined", p["short_name"]:p["display_name"]:"not-defined"); + + if (p["name"]:"" == nil || p["name"]:"" == "") { + y2error ("Product %1 doesn't have a name, reverting will be impossible", p); + Report::Error (sformat(_("Product %1 does not have a machine-readable 'name'. +Automatic reverting of the product state will be impossible."), p["short_name"]:p["display_name"]:"not-defined")); + } + + foreach (map <string, any> supported_upgrade, (list <map <string, any> >) p["upgrades"]:[], { + if (! haskey (supported_upgrade, "product") || supported_upgrade["product"]:"" == "") { + y2error ("Erroneous product upgrades: %1 (%2)", p, supported_upgrade); + Report::Error (sformat (_("Cannot upgrade product %1 (%2). +Migration path is erroneous."), p["display_name"]:p["short_name"]:_("Unknown"), p["name"]:_("not-defined"))); + return; + } + + string old_product = p["name"]:""; + string migration_product = supported_upgrade["product"]:""; + + // Install the migration product + if ((size (Pkg::ResolvableProperties (migration_product, `product, "")) == 0) || (Pkg::ResolvableInstall (migration_product, `product) != true)) { + y2error ("Cannot select migration product for installation: %1", Pkg::ResolvableProperties (migration_product, `product, "")); + Report::Error (sformat (_("Cannot select product +%1 (%2) for installation."), supported_upgrade["name"]:"", migration_product)); + return; + } else { + Wagon::migration_products = add (Wagon::migration_products, migration_product); + } + +// Old products are removed automatically during the upgrade +// // Remove the old product +// if ((Pkg::ResolvableInstalled (old_product, `product) != true) || (Pkg::ResolvableRemove (migration_product, `product) == true)) { +// Report::Error (sformat (_("Cannot select product %1 for deinstallation."), migration_product)); +// return; +// } + }); + }); + + return true; + } + + Wagon::InitPkg(); + + Wagon::ReadProductsBeforeMigration(); + Wagon::StoreProductsBeforeMigration(); + + // BNC #573084: New code (upgrading products) can be added after + // wagon self-upgrade and restart + integer products_for_upgrade = UpdateInstalledProducts(); + + if (products_for_upgrade > 0) { + symbol ret = SolveDependencies(); + + if (ret != `abort && ret != `cancel) { + y2milestone ("Upgrading %1 product packages...", products_for_upgrade); + any inst_ret = WFM::call ("inst_rpmcopy"); + y2milestone ("Product package upgrade returned: %1", inst_ret); + ret = `auto; + } else { + return `abort; + } + + ResetPackager(); + } else { + y2warning ("No products selected for upgrade"); + } + + if (FindAndSelectMigrationProducts() != true) { + return `auto; + } + + symbol ret = SolveDependencies(); + + if (ret != `abort && ret != `cancel) { + // Solver ends with some resolvables changed + if (Pkg::IsAnyResolvable (`any, `to_install) == true || Pkg::IsAnyResolvable (`any, `to_remove) == true) { + y2milestone ("Installing packages..."); + // Everybody hold your breath 'cause we're gonna be sinkin' soon + any inst_ret = WFM::call ("inst_rpmcopy"); + y2milestone ("Package installation returned: %1", inst_ret); + ret = `auto; + } else { + y2milestone ("Nothing to install/remove"); + ret = `auto; + } + } + + ResetPackager(); + + y2milestone ("Returning: %1", ret); + + return ret; +} Added: branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_point_of_no_return.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_point_of_no_return.ycp (added) +++ branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_point_of_no_return.ycp Tue Jan 26 12:47:54 2010 @@ -0,0 +1,39 @@ +/** + * File: + * clients/wagon_custom_url.ycp + * + * Module: + * Wagon + * + * Authors: + * Lukas Ocilka <locilka(a)suse.cz> + * + * Summary: + * Online Migration Tool + * + * $Id$ + * + */ + +{ + textdomain "wagon"; + + import "GetInstArgs"; + import "Wagon"; + + if (GetInstArgs::going_back()) { + y2milestone ("Going back..."); + return `back; + } + + /** + * Point of no return. After this call, YaST will start removing + * and installing packages. In other words, the real migration + * will start. + */ + + y2warning ("From this point, wagon cannot revert products anymore!"); + Wagon::abort_can_revert_products = false; + + return `auto; +} Modified: branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_selfupdate.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_selfupdate.ycp (original) +++ branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_selfupdate.ycp Tue Jan 26 12:47:54 2010 @@ -28,20 +28,15 @@ import "Popup"; import "Label"; import "PackagesUI"; + import "Report"; + + include "wagon/common_func.ycp"; if (GetInstArgs::going_back()) { y2milestone ("Going back..."); return `back; } - boolean SolverRunWithFeedback () { - UI::OpenDialog (`Label (_("Solving the package dependencies..."))); - boolean ret = Pkg::PkgSolve (false); - UI::CloseDialog(); - - return ret; - } - /** * Tries to upgrade packages got as parameter. * @@ -142,9 +137,6 @@ Wagon::InitPkg(); - list <map <string, any> > products = Pkg::ResolvableProperties ("", `product, ""); - y2milestone ("All known products: %1", products); - symbol ret = `auto; // Patches need solver run @@ -174,65 +166,9 @@ return ret; } - boolean solved = nil; - - while (solved != true) { - // Trying to solve automatically - solved = SolverRunWithFeedback(); - symbol ret_sel = nil; - - // PkgSolve didn't report any problem - if (solved) { - y2milestone ("Solved automatically"); - // FIXME: inform user? - ret = `restart_same_step; - // There are some issues in selecting the patches - } else { - y2milestone ("Cannot be solved automatically"); - while (true) { - // Try to solve them manually - ret_sel = PackagesUI::RunPackageSelector ($["mode":`summaryMode]); - - // Cannot or don't want to accept the proposal - if (ret_sel == `cancel) { - // Confirmed - if (Popup::AnyQuestion ( - // TRANSLATORS: headline - _("Aborting the Upgrade"), - // TRANSLATORS: pop-up question - _("Cannot continue without installing the required patches. -Are sure you want to abort the upgrade process?"), - _("Abort Upgrade"), - Label::NoButton(), - `yes_button - )) { - ret = `abort; - break; - // Try again - } else { - continue; - } - // Solved manually - } else if (ret_sel == `accept) { - solved = true; - break; - } - } - } - - if (ret == `abort) { - solved = nil; - y2warning ("Aborting..."); - break; - } - - if (! Wagon::AcceptLicenses()) { - y2warning ("Some license(s) have been rejected, running solver again"); - solved = nil; - } - } + ret = SolveDependencies(); - if (solved == true) { + if (ret != `abort) { // Solver ends with some resolvables changed if (Pkg::IsAnyResolvable (`any, `to_install) == true || Pkg::IsAnyResolvable (`any, `to_remove) == true) { y2milestone ("Calling update..."); Modified: branches/SuSE-Code-11-Branch/wagon/src/config/online_migration.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/config/online_migration.xml (original) +++ branches/SuSE-Code-11-Branch/wagon/src/config/online_migration.xml Tue Jan 26 12:47:54 2010 @@ -29,8 +29,10 @@ <modules config:type="list"> <module>welcome</module> <module>update_online_mechanism</module> + <module>install_migration_products</module> <module>suse_register_workflow</module> <module>prepare_progress</module> + <module>point_of_no_return</module> <module>wagon_kickoff</module> <module>wagon_rpmcopy</module> <module>suseconfig_after_update</module> @@ -52,12 +54,14 @@ <modules config:type="list"> <module>welcome</module> <module>update_online_mechanism</module> + <module>install_migration_products</module>  <module>update_url_dialog</module> <module>suse_register_workflow</module> <module>wagon_custom_url</module> <module>wagon_selfupdate_from_url</module> <module>prepare_progress</module> + <module>point_of_no_return</module> <module>wagon_kickoff</module> <module>wagon_rpmcopy</module> <module>suseconfig_after_update</module> @@ -77,10 +81,12 @@ <modules config:type="list"> <module>welcome</module> <module>update_online_mechanism</module> + <module>install_migration_products</module>  <module>update_url_dialog</module> <module>suse_register_workflow</module> <module>prepare_progress</module> + <module>point_of_no_return</module> <module>wagon_kickoff</module> <module>wagon_rpmcopy</module> <module>suseconfig_after_update</module> @@ -100,11 +106,13 @@ <modules config:type="list"> <module>welcome</module> <module>update_online_mechanism</module> + <module>install_migration_products</module>  <module>update_url_dialog</module> <module>wagon_custom_url</module> <module>wagon_selfupdate_from_url</module> <module>prepare_progress</module> + <module>point_of_no_return</module> <module>wagon_kickoff</module> <module>wagon_rpmcopy</module> <module>suseconfig_after_update</module> @@ -126,6 +134,7 @@ <module>wagon_custom_url</module> <module>wagon_selfupdate_from_url</module> <module>prepare_progress</module> + <module>point_of_no_return</module> <module>wagon_kickoff</module> <module>wagon_rpmcopy</module> <module>suseconfig_after_update</module> @@ -198,16 +207,22 @@ <enable_back>no</enable_back> </module> -  +  <module> <label>Renew Update Stack</label> <name>update_online_mechanism</name> <execute>wagon_selfupdate</execute> </module> +  + <module> + <label>Migration Configuration</label> + <name>install_migration_products</name> + <execute>wagon_migration_products</execute> + </module> +  <module> - <label>Renew Update Stack</label> <name>update_url_dialog</name> <execute>wagon_update_url</execute> </module> @@ -218,7 +233,6 @@ (*) Offered in wagon_update_url if not running via applet --> <module> - <label>Renew Update Stack</label> <name>suse_register_workflow</name> <execute>inst_suse_register</execute> </module> @@ -228,7 +242,6 @@ (*) Offered in wagon_update_url if not running via applet --> <module> - <label>Renew Update Stack</label> <name>wagon_custom_url</name> <execute>wagon_custom_url</execute> </module> @@ -238,7 +251,6 @@ Follows the wagon_ownurl --> <module> - <label>Renew Update Stack</label> <name>wagon_selfupdate_from_url</name> <execute>wagon_selfupdate</execute> </module> @@ -265,6 +277,12 @@ <execute>inst_prepareprogress</execute> </module> +  + <module> + <name>point_of_no_return</name> + <execute>wagon_point_of_no_return</execute> + </module> + <module> <name>wagon_kickoff</name> <execute>inst_kickoff</execute> Added: branches/SuSE-Code-11-Branch/wagon/src/include/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/include/Makefile.am (added) +++ branches/SuSE-Code-11-Branch/wagon/src/include/Makefile.am Tue Jan 26 12:47:54 2010 @@ -0,0 +1,13 @@ +# +# Makefile.am for wagon/src/include +# + +yncludedir = @yncludedir@/wagon + +ynclude_DATA = $(wildcard *.ycp) + +YCPCFLAGS = -M ../modules + +EXTRA_DIST = $(ynclude_DATA) + +include $(top_srcdir)/Makefile.am.common Added: branches/SuSE-Code-11-Branch/wagon/src/include/common_func.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/include/common_func.ycp (added) +++ branches/SuSE-Code-11-Branch/wagon/src/include/common_func.ycp Tue Jan 26 12:47:54 2010 @@ -0,0 +1,128 @@ +/** + * File: + * include/wagon/common_func.ycp + * + * Module: + * Wagon + * + * Authors: + * Lukas Ocilka <locilka(a)suse.cz> + * + * Summary: + * Online Migration Tool + * + * $Id$ + * + */ + +{ + textdomain "wagon"; + + import "Label"; + import "Popup"; + import "PackagesUI"; + import "Wagon"; + import "Wizard"; + + boolean SolverRunWithFeedback () { + UI::OpenDialog (`Label (_("Solving the package dependencies..."))); + boolean ret = Pkg::PkgSolve (true); + UI::CloseDialog(); + + return ret; + } + + symbol SolveDependencies () { + symbol ret = `auto; + + boolean solved = nil; + + while (solved != true) { + // Trying to solve automatically + solved = SolverRunWithFeedback(); + symbol ret_sel = nil; + + // PkgSolve didn't report any problem + if (solved == true) { + y2milestone ("Solved automatically"); + ret = `auto; + // There are some issues in selecting the patches + } else { + y2milestone ("Cannot be solved automatically"); + while (true) { + // Try to solve them manually + ret_sel = PackagesUI::RunPackageSelector ($["mode":`summaryMode]); + + // Cannot or don't want to accept the proposal + if (ret_sel == `cancel) { + // Confirmed + if (Popup::AnyQuestion ( + // TRANSLATORS: headline + _("Aborting the Upgrade"), + // TRANSLATORS: pop-up question + _("Cannot continue without installing the required patches. +Are sure you want to abort the upgrade process?"), + _("Abort Upgrade"), + Label::NoButton(), + `yes_button + )) { + ret = `abort; + break; + // Try again + } else { + continue; + } + // Solved manually + } else if (ret_sel == `accept) { + ret = `auto; + solved = true; + break; + } + } + } + + if (ret == `abort) { + solved = nil; + y2warning ("Aborting..."); + break; + } + + if (! Wagon::AcceptLicenses()) { + y2warning ("Some license(s) have been rejected, running solver again"); + solved = nil; + } + } + + return ret; + } + + void ResetPackager () { + Wizard::SetContents ( + _("Reseting Package Manager"), + `Label(_("Reseting package manager...")), + "", + false, true + ); + + y2milestone ("Reseting Pkg"); + Pkg::PkgApplReset(); + Pkg::PkgReset(); + + symbol status = nil; + string name = nil; + + y2milestone ("Neutralizing all resolvables"); + foreach (symbol resolvable, [`pattern, `patch, `package, `product, `scrpackage], { + Pkg::ResolvableNeutral ("" /* all */, resolvable, true /* force */); + }); + + y2milestone ("Running solver"); + Pkg::PkgSolve (true); + + Pkg::TargetFinish(); + Pkg::SourceFinishAll(); + + Wagon::InitPkg(); + Pkg::PkgSolve (true); + } +} Modified: branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp Tue Jan 26 12:47:54 2010 @@ -29,11 +29,23 @@ import "Report"; import "ProductFeatures"; import "Update"; + import "FileUtils"; + import "String"; boolean running_by_applet = false; string update_workflow_type = "manual"; + // Products installed for the time of the migration + global list <string> migration_products = []; + + // Products installed before the migration + global list <map <string, string> > products_before_migration = []; + + // When aborting before the real migration starts, we can still + // revert to the old products + global boolean abort_can_revert_products = true; + global void SetUpdateWorkflow (string new_update_workflow_type) { // FIXME: check @@ -275,17 +287,192 @@ return true; } + global map <string,any> MinimizeProductMap (map <string,any> product) { + if (haskey (product, "license")) product["license"] = "..."; + if (haskey (product, "description")) product["description"] = "..."; + + return product; + } + + string GetDisplayName (string display_name, string name) { + if (display_name == name) + return display_name; + + // 'Product Long Name (product-libzypp-name)' + return sformat (_("%1 (%2)"), display_name, name); + } + + string GetDistributionUpgradeSummary () { + string ret = ""; + + list <map <string,any> > products = sort ( + map <string,any> x, map <string,any> y, Pkg::ResolvableProperties ("", `product, ""), + ``(x["display_name"]:x["short_name"]:x["name"]:"a" < y["display_name"]:x["short_name"]:x["name"]:"b") + ); + + // migration_products contains list of temporary products for migration process + + y2milestone ("All known migration products: %1", migration_products); + + string display_name = nil; + string name = nil; + + // list of all products that will be installed (are selected) + list <string> products_to_be_installed = []; + foreach (map <string,any> product, products, { + if (product["status"]:`unknown != `selected) return; + name = product["name"]:_("No short name defined"); + products_to_be_installed = add (products_to_be_installed, name); + }); + + // list of all products that will be upgraded + list <string> products_to_be_upgraded = []; + + // Products that are going to be removed + foreach (map <string,any> product, products, { + if (product["status"]:`unknown != `removed) return; + + product = MinimizeProductMap (product); + display_name = product["display_name"]:product["short_name"]:product["name"]:_("No name defined"); + name = product["name"]:_("No short name defined"); + + // Removing product and installing the same one (name) means -> upgrade + if (contains (products_to_be_installed, name)) { + products_to_be_upgraded = add (products_to_be_upgraded, name); + y2milestone ("Product to be upgraded: %1 (this is the removed one)", product); + // Do not list this product as 'to removed', list it as 'to upgrade' + return; + } + + // Removing a migration product is fine + if (contains (migration_products, product["name"]:"")) { + y2milestone ("Migration product will be removed: %1", product); + ret = ret + "<li>" + sformat ( + _("Temporary migration product %1 will be removed"), + GetDisplayName (display_name, name) + ) + "</li>\n"; + // Removing another product might be an issue + } else { + y2warning ("Product will be removed: %1", product); + ret = ret + "<li>" + sformat ( + _("Warning: Product %1 will be removed"), + GetDisplayName (display_name, name) + ) + "</li>\n"; + } + }); + + // Products that are going to be installed (new ones) or upgraded + foreach (map <string,any> product, products, { + if (product["status"]:`unknown != `selected) return; + + product = MinimizeProductMap (product); + display_name = product["display_name"]:product["short_name"]:product["name"]:_("No name defined"); + name = product["name"]:_("No short name defined"); + + // Product is going to be upgraded (removed + installed new version) + if (contains (products_to_be_upgraded, name)) { + y2milestone ("Product will be upgraded to: %1 (this is the installed one)", product); + ret = ret + "<li>" + sformat ( + _("Product %1 will be upgraded"), + GetDisplayName (display_name, name) + ) + "</li>\n"; + // Newly installed product + } else { + y2milestone ("Product will be upgraded: %1", product); + ret = ret + "<li>" + sformat ( + _("New product %1 will be installed"), + GetDisplayName (display_name, name) + ) + "</li>\n"; + } + }); + + // Products that will keep installed (unchanged) + foreach (map <string,any> product, products, { + if (product["status"]:`unknown != `installed) return; + + product = MinimizeProductMap (product); + display_name = product["display_name"]:product["short_name"]:product["name"]:_("No name defined"); + name = product["name"]:_("No short name defined"); + + y2milestone ("Product will keep: %1", product); + ret = ret + "<li>" + sformat ( + _("Product %1 will keep installed"), + GetDisplayName (display_name, name) + ) + "</li>\n"; + }); + + return "<ul>\n" + ret + "</ul>\n"; + } + global map <string, any> ProposalSummary () { map <string, any> ret = $[]; - // FIXME: create a useful summary ret = $[ - "preformatted_proposal" : "<ul><li>" + _("Distribution Upgrade") + "</li></ul>", - "help" : _("FIXME"), + "preformatted_proposal" : GetDistributionUpgradeSummary(), + // help text + "help" : _("To change update settings go to Software Proposal section."), ]; return ret; } + global list <map <string, string> > ReadProductsBeforeMigration () { + list <map <string, any> > products = Pkg::ResolvableProperties ("", `product, ""); + y2milestone ("All known products: %1", products); + + foreach (map<string, any> p, products, { + if (p["status"]:`unknown != `installed) + return; + + // Remember the 'old' product just for the case of reverting + products_before_migration = add ( + products_before_migration, + $["name" : p["name"]:"", "version" : p["version"]:""] + ); + }); + + return products_before_migration; + } + + // YaST can be restarted but some data have to be kept + string migration_products_store_file = sformat ("%1/wagon_products_before_migration", Directory::vardir); + + global boolean StoreProductsBeforeMigration () { + return (boolean) SCR::Write (.target.ycp, migration_products_store_file, products_before_migration); + } + + global boolean RestoreProductsBeforeMigration () { + products_before_migration = (list <map <string, string> >) SCR::Read (.target.ycp, migration_products_store_file); + + if (products_before_migration == nil) { + products_before_migration = []; + Report::Error (_("Error restoring the list of previously installed products.")); + return false; + } + + return true; + } + + global string GetFileOwner (string file) { + if (file == nil || file == "") { + y2error ("File not provided"); + return nil; + } + + if (! FileUtils::Exists (file)) { + y2error ("File %1 doesn't exist", file); + return nil; + } + + string command = sformat ("rpm -qf '%1'", String::Quote (file)) + " --queryformat \"%{NAME}\""; + map <string, any> cmd = (map <string, any>) SCR::Execute (.target.bash_output, command); + if (cmd["exit"]:-1 != 0) { + y2error ("Cannot get file owner %1: %2", command, cmd); + return nil; + } + + return (string) splitstring (cmd["stdout"]:"", "\n")[0]:nil; + } + /* EOF */ } Modified: branches/SuSE-Code-11-Branch/wagon/yast2-wagon.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/yas… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/yast2-wagon.spec.in (original) +++ branches/SuSE-Code-11-Branch/wagon/yast2-wagon.spec.in Tue Jan 26 12:47:54 2010 @@ -4,6 +4,8 @@ # PackagesUI::RunPackageSelector Requires: yast2 >= 2.17.40 Requires: yast2-online-update-frontend >= 2.17.9 +# <upgrades> section from product file +Requires: yast2-pkg-bindings >= 2.17.39.2 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-update @@ -36,6 +38,8 @@ @clientdir@/*.ycp @moduledir@/*.ycp @moduledir@/*.ybc +%dir @yncludedir@/wagon +@yncludedir@/wagon/*.ycp %dir /usr/share/YaST2/control @desktopdir@/*.desktop /usr/share/YaST2/control/*.xml -- 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] r60531 - /branches/SuSE-Code-11-SP1-Branch/network/src/installation/inst_hostname.ycp
by kmachalkova＠svn.opensuse.org 26 Jan '10

26 Jan '10

Author: kmachalkova Date: Tue Jan 26 11:29:53 2010 New Revision: 60531 URL: http://svn.opensuse.org/viewcvs/yast?rev=60531&view=rev Log: delayed writing Modified: branches/SuSE-Code-11-SP1-Branch/network/src/installation/inst_hostname.ycp Modified: branches/SuSE-Code-11-SP1-Branch/network/src/installation/inst_hostname.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/installation/inst_hostname.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/installation/inst_hostname.ycp Tue Jan 26 11:29:53 2010 @@ -59,7 +59,10 @@ { // do not let Lan override us, #152218 DNS::proposal_valid = true; - DNS::Write (); // handles NetworkConfig too + + // delay writing, write along with the rest of network configuration + // in lan_proposal + // DNS::Write (); } 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] r60530 - in /branches/SuSE-Code-11-SP1-Branch/network/src: modules/DNS.ycp services/dns.ycp
by kmachalkova＠svn.opensuse.org 26 Jan '10

26 Jan '10

Author: kmachalkova Date: Tue Jan 26 11:13:37 2010 New Revision: 60530 URL: http://svn.opensuse.org/viewcvs/yast?rev=60530&view=rev Log: Set modified flag for DNS settings correctly Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/DNS.ycp branches/SuSE-Code-11-SP1-Branch/network/src/services/dns.ycp Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/DNS.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/modules/DNS.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/modules/DNS.ycp Tue Jan 26 11:13:37 2010 @@ -70,7 +70,7 @@ if (ns == "" || ns == nil) return false; nameservers = [ ns ]; - modified = true; + //modified = true; return true; } @@ -85,7 +85,7 @@ return false; hostname = hn; domain = dn; - modified = true; + //modified = true; return true; } Modified: branches/SuSE-Code-11-SP1-Branch/network/src/services/dns.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/services/dns.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/services/dns.ycp Tue Jan 26 11:13:37 2010 @@ -47,6 +47,11 @@ boolean resolver_modifiable = false; /** + * original setup, used to determine whether data have been modified + */ +map settings_orig = $[]; + +/** * CWM buffer for both dialogs. Note that NAMESERVERS and SEARCHLIST * are lists and their widgets are suffixed. */ @@ -87,6 +92,8 @@ settings["NAMESERVER_2"] = DNS::nameservers[1]:""; settings["NAMESERVER_3"] = DNS::nameservers[2]:""; + settings_orig = settings; + return settings; } @@ -110,8 +117,8 @@ DNS::write_hostname = settings["WRITE_HOSTNAME"]:true; /* update modified flag */ - DNS::modified = true; - y2milestone("modified DNS"); + DNS::modified = DNS::modified || (settings != settings_orig); + y2milestone("Modified DNS: %1", DNS::modified ); } /** @@ -329,6 +336,7 @@ has_dhcp = Lan::AnyDHCPDevice (); hn_settings = InitSettings (); + foreach(string key, (list<string>)Map::Keys(hn_settings),{ InitHnWidget(key); }); -- 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] r60529 - /tags/stable-2_19_0/theme/
by jsrain＠svn.opensuse.org 26 Jan '10

26 Jan '10

Author: jsrain Date: Tue Jan 26 08:01:46 2010 New Revision: 60529 URL: http://svn.opensuse.org/viewcvs/yast?rev=60529&view=rev Log: Created tag stable-2_19_0 for theme Added: tags/stable-2_19_0/theme/ - copied from r60528, trunk/theme/ -- 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] r60528 - in /trunk/theme: VERSION package/yast2-theme.changes
by jsrain＠svn.opensuse.org 26 Jan '10

26 Jan '10

Author: jsrain Date: Tue Jan 26 07:58:18 2010 New Revision: 60528 URL: http://svn.opensuse.org/viewcvs/yast?rev=60528&view=rev Log: bump Modified: trunk/theme/VERSION trunk/theme/package/yast2-theme.changes Modified: trunk/theme/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/VERSION?rev=60528&r1=60527… ============================================================================== --- trunk/theme/VERSION (original) +++ trunk/theme/VERSION Tue Jan 26 07:58:18 2010 @@ -1 +1 @@ -2.18.11 +2.19.0 Modified: trunk/theme/package/yast2-theme.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/package/yast2-theme.change… ============================================================================== --- trunk/theme/package/yast2-theme.changes (original) +++ trunk/theme/package/yast2-theme.changes Tue Jan 26 07:58:18 2010 @@ -2,6 +2,7 @@ Fri Jan 15 13:27:26 CET 2010 - jsrain(a)suse.cz - added icons for the LXDE pattern +- 2.19.0 ------------------------------------------------------------------- Wed Dec 2 19:29:14 CET 2009 - jimmac(a)novell.com -- 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] r60527 - /tags/stable-2_19_2/product-creator/
by jsuchome＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: jsuchome Date: Mon Jan 25 20:03:14 2010 New Revision: 60527 URL: http://svn.opensuse.org/viewcvs/yast?rev=60527&view=rev Log: Created tag stable-2_19_2 for product-creator Added: tags/stable-2_19_2/product-creator/ - copied from r60526, trunk/product-creator/ -- 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] r60526 - in /trunk/product-creator: VERSION package/yast2-product-creator.changes src/dialogs.ycp src/kiwi_dialogs.ycp src/routines.ycp
by jsuchome＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: jsuchome Date: Mon Jan 25 20:03:05 2010 New Revision: 60526 URL: http://svn.opensuse.org/viewcvs/yast?rev=60526&view=rev Log: - when package cannot be installed, look if it is not provided by something else (bnc#571694) - if primary tag for the boot images is not defined, take the first one (bnc#572727) - 2.19.2 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/dialogs.ycp trunk/product-creator/src/kiwi_dialogs.ycp trunk/product-creator/src/routines.ycp Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=6052… ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Mon Jan 25 20:03:05 2010 @@ -1 +1 @@ -2.19.1 +2.19.2 Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Mon Jan 25 20:03:05 2010 @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Jan 25 19:41:02 CET 2010 - jsuchome(a)suse.cz + +- when package cannot be installed, look if it is not provided + by something else (bnc#571694) +- if primary tag for the boot images is not defined, take the first + one (bnc#572727) +- 2.19.2 + ------------------------------------------------------------------ Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz Modified: trunk/product-creator/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/dialogs.ycp?… ============================================================================== --- trunk/product-creator/src/dialogs.ycp (original) +++ trunk/product-creator/src/dialogs.ycp Mon Jan 25 20:03:05 2010 @@ -1342,7 +1342,20 @@ { foreach(string p, packages, { - y2milestone("selecting package for installation: %1 -> %2", p, Pkg::PkgInstall(p)); + boolean selected = Pkg::PkgInstall(p); + y2milestone("selecting package for installation: %1 -> %2", p, selected); + if (!selected) + { + list <list> provides = Pkg::PkgQueryProvides (p); + provides = filter (list l, provides, { + return l[1]:`NONE != `NONE; + }); + string pp = provides[0,0]:""; + if (pp != "") + { + y2milestone("selecting first package providing %1: %2 -> %3", p, pp, Pkg::PkgInstall (pp)); + } + } }); } Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs… ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Mon Jan 25 20:03:05 2010 @@ -2075,14 +2075,12 @@ UI::ChangeWidget(`id(`out_dir), `Value, Config["iso-directory"]:""); update_repo_table (); list type_its = supported_images != "template" ? default_type_items: []; - boolean primary = false; + kiwi_task = ""; foreach (map typemap, (list<map>) Config["preferences",0,"type"]:[], { string type = typemap[content_key]:""; - if (!primary) + if (typemap["primary"]:"false" == "true" || kiwi_task == "") kiwi_task = type; - if (typemap["primary"]:"false" == "true") - primary = true; if ((supported_images == "" && !contains (present_types, type)) || supported_images == "template") { @@ -2091,6 +2089,11 @@ present_types = union (present_types, [type]); } }); + if (kiwi_task == "") + { + kiwi_task = "iso"; + y2warning ("no task found, setting to 'iso'"); + } UI::ChangeWidget (`id (`type), `Items, type_its); UI::ChangeWidget (`id (`type), `Value, kiwi_task); return true; Modified: trunk/product-creator/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/routines.ycp… ============================================================================== --- trunk/product-creator/src/routines.ycp (original) +++ trunk/product-creator/src/routines.ycp Mon Jan 25 20:03:05 2010 @@ -38,12 +38,20 @@ // get the primary value of image type to be built ('type' from 'preferences') string get_current_task (map config) { - string task = "iso"; + string task = ""; foreach (map typemap, (list<map>) config["preferences",0,"type"]:[], { - task = typemap[Kiwi::content_key]:task; + if (task == "") // take the 1st one if none is default + task = typemap[Kiwi::content_key]:task; if (typemap["primary"]:"false" == "true") + { + task = typemap[Kiwi::content_key]:task; break; + } }); + if (task == "") + { + y2milestone ("no task found, setting to 'iso'"); + } return task; } -- 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] r60525 - /tags/branch-Code-11-SP1-2_17_28/product-creator/
by jsuchome＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: jsuchome Date: Mon Jan 25 20:02:56 2010 New Revision: 60525 URL: http://svn.opensuse.org/viewcvs/yast?rev=60525&view=rev Log: Created tag branch-Code-11-SP1-2_17_28 for product-creator Added: tags/branch-Code-11-SP1-2_17_28/product-creator/ (props changed) - copied from r60524, branches/SuSE-Code-11-SP1-Branch/product-creator/ -- 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] r60524 - /tags/branch-Code-11-SP1-2_17_28/
by jsuchome＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: jsuchome Date: Mon Jan 25 20:02:51 2010 New Revision: 60524 URL: http://svn.opensuse.org/viewcvs/yast?rev=60524&view=rev Log: Created tag branch-Code-11-SP1-2_17_28 Added: tags/branch-Code-11-SP1-2_17_28/ -- 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] r60523 - in /branches/SuSE-Code-11-SP1-Branch/product-creator: VERSION package/yast2-product-creator.changes src/dialogs.ycp src/kiwi_dialogs.ycp src/routines.ycp
by jsuchome＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: jsuchome Date: Mon Jan 25 20:02:45 2010 New Revision: 60523 URL: http://svn.opensuse.org/viewcvs/yast?rev=60523&view=rev Log: - when package cannot be installed, look if it is not provided by something else (bnc#571694) - if primary tag for the boot images is not defined, take the first one (bnc#572727) - 2.17.28 Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-Code-11-SP1-Branch/product-creator/src/dialogs.ycp branches/SuSE-Code-11-SP1-Branch/product-creator/src/kiwi_dialogs.ycp branches/SuSE-Code-11-SP1-Branch/product-creator/src/routines.ycp Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION Mon Jan 25 20:02:45 2010 @@ -1 +1 @@ -2.17.27 +2.17.28 Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes Mon Jan 25 20:02:45 2010 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Mon Jan 25 19:39:12 CET 2010 - jsuchome(a)suse.cz + +- when package cannot be installed, look if it is not provided + by something else (bnc#571694) +- if primary tag for the boot images is not defined, take the first + one (bnc#572727) +- 2.17.28 + +------------------------------------------------------------------- Tue Dec 22 15:43:41 CET 2009 - jsuchome(a)suse.cz - use menubutton for both iso image and directory tree (bnc#438223) Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/src/dialogs.ycp Mon Jan 25 20:02:45 2010 @@ -1342,7 +1342,20 @@ { foreach(string p, packages, { - y2milestone("selecting package for installation: %1 -> %2", p, Pkg::PkgInstall(p)); + boolean selected = Pkg::PkgInstall(p); + y2milestone("selecting package for installation: %1 -> %2", p, selected); + if (!selected) + { + list <list> provides = Pkg::PkgQueryProvides (p); + provides = filter (list l, provides, { + return l[1]:`NONE != `NONE; + }); + string pp = provides[0,0]:""; + if (pp != "") + { + y2milestone("selecting first package providing %1: %2 -> %3", p, pp, Pkg::PkgInstall (pp)); + } + } }); } Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/src/kiwi_dialogs.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/src/kiwi_dialogs.ycp Mon Jan 25 20:02:45 2010 @@ -2078,14 +2078,12 @@ UI::ChangeWidget(`id(`out_dir), `Value, Config["iso-directory"]:""); update_repo_table (); list type_its = supported_images != "template" ? default_type_items: []; - boolean primary = false; + kiwi_task = ""; foreach (map typemap, (list<map>) Config["preferences",0,"type"]:[], { string type = typemap[content_key]:""; - if (!primary) + if (typemap["primary"]:"false" == "true" || kiwi_task == "") kiwi_task = type; - if (typemap["primary"]:"false" == "true") - primary = true; if ((supported_images == "" && !contains (present_types, type)) || supported_images == "template") { @@ -2094,6 +2092,11 @@ present_types = union (present_types, [type]); } }); + if (kiwi_task == "") + { + kiwi_task = "iso"; + y2warning ("no task found, setting to 'iso'"); + } UI::ChangeWidget (`id (`type), `Items, type_its); UI::ChangeWidget (`id (`type), `Value, kiwi_task); return true; Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/src/routines.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/src/routines.ycp Mon Jan 25 20:02:45 2010 @@ -38,12 +38,20 @@ // get the primary value of image type to be built ('type' from 'preferences') string get_current_task (map config) { - string task = "iso"; + string task = ""; foreach (map typemap, (list<map>) config["preferences",0,"type"]:[], { - task = typemap[Kiwi::content_key]:task; + if (task == "") // take the 1st one if none is default + task = typemap[Kiwi::content_key]:task; if (typemap["primary"]:"false" == "true") + { + task = typemap[Kiwi::content_key]:task; break; + } }); + if (task == "") + { + y2milestone ("no task found, setting to 'iso'"); + } return task; } -- 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] r60522 - in /branches/SuSE-Code-11-SP1-Branch/storage: libstorage/src/Storage.cc package/yast2-storage.changes
by aschnell＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: aschnell Date: Mon Jan 25 17:32:59 2010 New Revision: 60522 URL: http://svn.opensuse.org/viewcvs/yast?rev=60522&view=rev Log: - fixed default mount-by for multipath (bnc #572209) Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc Mon Jan 25 17:32:59 2010 @@ -2523,11 +2523,33 @@ mby = defaultMountBy; pair<string,unsigned> dp = Disk::getDiskPartition(device); y2mil( "dp:" << dp ); - DiskIterator i = findDisk( dp.first ); - if( (i==dEnd()) || (mby == MOUNTBY_ID && i->udevId().empty()) || - (mby == MOUNTBY_PATH && i->udevPath().empty())) - mby = MOUNTBY_DEVICE; - ret = STORAGE_VOLUME_NOT_FOUND; + + DiskIterator i1 = findDisk(dp.first); + DmPartCoIterator i2 = findDmPartCo(dp.first); + MdPartCoIterator i3 = findMdPartCo(dp.first); + + if (i1 != dEnd()) + { + if ((mby == MOUNTBY_ID && i1->udevId().empty()) || + (mby == MOUNTBY_PATH && i1->udevPath().empty())) + mby = MOUNTBY_DEVICE; + } + else if (i2 != dmpCoEnd()) + { + if ((mby == MOUNTBY_ID && i2->udevId().empty()) || + (mby == MOUNTBY_PATH && i2->udevPath().empty())) + mby = MOUNTBY_DEVICE; + } + else if (i3 != mdpCoEnd()) + { + if ((mby == MOUNTBY_ID && i3->udevId().empty()) || + (mby == MOUNTBY_PATH && i3->udevPath().empty())) + mby = MOUNTBY_DEVICE; + } + else + { + ret = STORAGE_VOLUME_NOT_FOUND; + } } y2milestone( "ret:%d mby:%s", ret, Volume::mbyTypeString(mby).c_str()); return( ret ); Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Mon Jan 25 17:32:59 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jan 25 17:30:26 CET 2010 - aschnell(a)suse.de + +- fixed default mount-by for multipath (bnc #572209) + +------------------------------------------------------------------- Mon Jan 25 14:12:51 CET 2010 - aschnell(a)suse.de - fixed generation of device names in proposal for partitionable -- 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] r60521 - /trunk/wagon/yast2-wagon.spec.in
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 17:16:34 2010 New Revision: 60521 URL: http://svn.opensuse.org/viewcvs/yast?rev=60521&view=rev Log: More explicit RPM requirements Modified: trunk/wagon/yast2-wagon.spec.in Modified: trunk/wagon/yast2-wagon.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/yast2-wagon.spec.in?rev=60… ============================================================================== --- trunk/wagon/yast2-wagon.spec.in (original) +++ trunk/wagon/yast2-wagon.spec.in Mon Jan 25 17:16:34 2010 @@ -6,6 +6,8 @@ # PackagesUI::RunPackageSelector Requires: yast2 >= 2.17.40 Requires: yast2-online-update-frontend >= 2.17.9 +# BNC #571621, Returns <upgrades> section from product file +Requires: yast2-pkg-bindings >= 2.19.1 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-update -- 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] r60520 - /branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 17:14:08 2010 New Revision: 60520 URL: http://svn.opensuse.org/viewcvs/yast?rev=60520&view=rev Log: More explicit RPM requirements Modified: branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in Mon Jan 25 17:14:08 2010 @@ -4,6 +4,8 @@ # PackagesUI::RunPackageSelector Requires: yast2 >= 2.17.40 Requires: yast2-online-update-frontend >= 2.17.9 +# <upgrades> section from product file +Requires: yast2-pkg-bindings >= 2.17.44 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-update -- 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] r60519 - /tags/branch-Code-11-SP1-2_17_10/samba-server/
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 17:03:58 2010 New Revision: 60519 URL: http://svn.opensuse.org/viewcvs/yast?rev=60519&view=rev Log: Created tag branch-Code-11-SP1-2_17_10 for samba-server Added: tags/branch-Code-11-SP1-2_17_10/samba-server/ (props changed) - copied from r60518, branches/SuSE-Code-11-SP1-Branch/samba-server/ -- 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] r60518 - in /branches/SuSE-Code-11-SP1-Branch/samba-server: VERSION package/yast2-samba-server.changes src/SambaServer.pm
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 17:03:24 2010 New Revision: 60518 URL: http://svn.opensuse.org/viewcvs/yast?rev=60518&view=rev Log: - Import sets Modified to true (BNC #572670). - 2.17.10 Modified: branches/SuSE-Code-11-SP1-Branch/samba-server/VERSION branches/SuSE-Code-11-SP1-Branch/samba-server/package/yast2-samba-server.changes branches/SuSE-Code-11-SP1-Branch/samba-server/src/SambaServer.pm Modified: branches/SuSE-Code-11-SP1-Branch/samba-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/samba… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/samba-server/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/samba-server/VERSION Mon Jan 25 17:03:24 2010 @@ -1 +1 @@ -2.17.9 +2.17.10 Modified: branches/SuSE-Code-11-SP1-Branch/samba-server/package/yast2-samba-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/samba… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/samba-server/package/yast2-samba-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/samba-server/package/yast2-samba-server.changes Mon Jan 25 17:03:24 2010 @@ -1,3 +1,9 @@ +----------------------------------------------------------------- +Mon Jan 25 17:00:20 CET 2010 - locilka(a)suse.cz + +- Import sets Modified to true (BNC #572670). +- 2.17.10 + ------------------------------------------------------------------- Mon Mar 30 15:58:03 CEST 2009 - locilka(a)suse.cz Modified: branches/SuSE-Code-11-SP1-Branch/samba-server/src/SambaServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/samba… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/samba-server/src/SambaServer.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/samba-server/src/SambaServer.pm Mon Jan 25 17:03:24 2010 @@ -304,7 +304,7 @@ } else { $GlobalsConfigured = 0; } - $Modified = 0; + $Modified = 1; y2debug("Importing: ", Dumper($settings)); @@ -323,7 +323,8 @@ my ($self) = @_; $GlobalsConfigured = 1 if $self->GetModified(); - $Modified = 0; + # Export does not change the status, only Import and Write + # $Modified = 0; return { version => "2.11", -- 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] r60517 - in /branches/SuSE-Code-11-Branch/samba-server: package/yast2-samba-server.changes src/SambaServer.pm
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 17:02:48 2010 New Revision: 60517 URL: http://svn.opensuse.org/viewcvs/yast?rev=60517&view=rev Log: - Import sets Modified to true (BNC #572670). Modified: branches/SuSE-Code-11-Branch/samba-server/package/yast2-samba-server.changes branches/SuSE-Code-11-Branch/samba-server/src/SambaServer.pm Modified: branches/SuSE-Code-11-Branch/samba-server/package/yast2-samba-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/samba-ser… ============================================================================== --- branches/SuSE-Code-11-Branch/samba-server/package/yast2-samba-server.changes (original) +++ branches/SuSE-Code-11-Branch/samba-server/package/yast2-samba-server.changes Mon Jan 25 17:02:48 2010 @@ -1,3 +1,8 @@ +----------------------------------------------------------------- +Mon Jan 25 17:00:20 CET 2010 - locilka(a)suse.cz + +- Import sets Modified to true (BNC #572670). + ------------------------------------------------------------------- Mon Mar 30 15:58:03 CEST 2009 - locilka(a)suse.cz Modified: branches/SuSE-Code-11-Branch/samba-server/src/SambaServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/samba-ser… ============================================================================== --- branches/SuSE-Code-11-Branch/samba-server/src/SambaServer.pm (original) +++ branches/SuSE-Code-11-Branch/samba-server/src/SambaServer.pm Mon Jan 25 17:02:48 2010 @@ -304,7 +304,7 @@ } else { $GlobalsConfigured = 0; } - $Modified = 0; + $Modified = 1; y2debug("Importing: ", Dumper($settings)); @@ -323,7 +323,8 @@ my ($self) = @_; $GlobalsConfigured = 1 if $self->GetModified(); - $Modified = 0; + # Export does not change the status, only Import and Write + # $Modified = 0; return { version => "2.11", -- 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] r60516 - in /trunk/samba-server: package/yast2-samba-server.changes src/SambaServer.pm
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 17:01:54 2010 New Revision: 60516 URL: http://svn.opensuse.org/viewcvs/yast?rev=60516&view=rev Log: - Import sets Modified to true (BNC #572670). Modified: trunk/samba-server/package/yast2-samba-server.changes trunk/samba-server/src/SambaServer.pm Modified: trunk/samba-server/package/yast2-samba-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/package/yast2-samba… ============================================================================== --- trunk/samba-server/package/yast2-samba-server.changes (original) +++ trunk/samba-server/package/yast2-samba-server.changes Mon Jan 25 17:01:54 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------ +Mon Jan 25 17:00:20 CET 2010 - locilka(a)suse.cz + +- Import sets Modified to true (BNC #572670). + +------------------------------------------------------------------ Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz - Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su Modified: trunk/samba-server/src/SambaServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/src/SambaServer.pm?… ============================================================================== --- trunk/samba-server/src/SambaServer.pm (original) +++ trunk/samba-server/src/SambaServer.pm Mon Jan 25 17:01:54 2010 @@ -304,7 +304,7 @@ } else { $GlobalsConfigured = 0; } - $Modified = 0; + $Modified = 1; y2debug("Importing: ", Dumper($settings)); @@ -323,7 +323,8 @@ my ($self) = @_; $GlobalsConfigured = 1 if $self->GetModified(); - $Modified = 0; + # Export does not change the status, only Import and Write + # $Modified = 0; return { version => "2.11", -- 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] r60515 - /tags/branch-Code-11-SP1-2_17_8/backup/
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 16:44:03 2010 New Revision: 60515 URL: http://svn.opensuse.org/viewcvs/yast?rev=60515&view=rev Log: Created tag branch-Code-11-SP1-2_17_8 for backup Added: tags/branch-Code-11-SP1-2_17_8/backup/ (props changed) - copied from r60514, branches/SuSE-Code-11-SP1-Branch/backup/ -- 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] r60514 - in /branches/SuSE-Code-11-Branch/backup: package/yast2-backup.changes src/ui.ycp
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 16:42:29 2010 New Revision: 60514 URL: http://svn.opensuse.org/viewcvs/yast?rev=60514&view=rev Log: - Fixed low speed of automatic backup (BNC #568615). Modified: branches/SuSE-Code-11-Branch/backup/package/yast2-backup.changes branches/SuSE-Code-11-Branch/backup/src/ui.ycp Modified: branches/SuSE-Code-11-Branch/backup/package/yast2-backup.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/backup/pa… ============================================================================== --- branches/SuSE-Code-11-Branch/backup/package/yast2-backup.changes (original) +++ branches/SuSE-Code-11-Branch/backup/package/yast2-backup.changes Mon Jan 25 16:42:29 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jan 25 16:36:47 CET 2010 - locilka(a)suse.cz + +- Fixed low speed of automatic backup (BNC #568615). + +------------------------------------------------------------------- Wed Dec 2 15:41:11 CET 2009 - locilka(a)suse.cz - Fixed infinite loop in case of old archives to keep set to zero Modified: branches/SuSE-Code-11-Branch/backup/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/backup/sr… ============================================================================== --- branches/SuSE-Code-11-Branch/backup/src/ui.ycp (original) +++ branches/SuSE-Code-11-Branch/backup/src/ui.ycp Mon Jan 25 16:42:29 2010 @@ -181,7 +181,7 @@ if ((boolean) SCR::Read (.process.running, backup_PID)) { - sleep(wait); + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait); ret = (symbol) UI::PollInput(); @@ -1956,7 +1956,8 @@ } if (Backup::cron_mode) { - sleep(wait_time); + // BNC #568615: yast2 backup takes much longer when scheduled + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait_time); ret = nil; } else { @@ -2073,7 +2074,8 @@ if (Backup::cron_mode == true) { - sleep(wait_time); + // BNC #568615: yast2 backup takes much longer when scheduled + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait_time); ret = nil; } @@ -2826,7 +2828,7 @@ if (Backup::cron_mode) { ret = nil; - sleep(wait_time); + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait_time); CheckFreeSpace(); } else { ret = waitForUserOrProcess(wait_time, `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] r60513 - in /branches/SuSE-Code-11-SP1-Branch/backup: VERSION package/yast2-backup.changes src/ui.ycp
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 16:41:55 2010 New Revision: 60513 URL: http://svn.opensuse.org/viewcvs/yast?rev=60513&view=rev Log: - Fixed low speed of automatic backup (BNC #568615). - 2.17.8 Modified: branches/SuSE-Code-11-SP1-Branch/backup/VERSION branches/SuSE-Code-11-SP1-Branch/backup/package/yast2-backup.changes branches/SuSE-Code-11-SP1-Branch/backup/src/ui.ycp Modified: branches/SuSE-Code-11-SP1-Branch/backup/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/backu… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/backup/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/backup/VERSION Mon Jan 25 16:41:55 2010 @@ -1 +1 @@ -2.17.7 +2.17.8 Modified: branches/SuSE-Code-11-SP1-Branch/backup/package/yast2-backup.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/backu… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/backup/package/yast2-backup.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/backup/package/yast2-backup.changes Mon Jan 25 16:41:55 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 25 16:36:47 CET 2010 - locilka(a)suse.cz + +- Fixed low speed of automatic backup (BNC #568615). +- 2.17.8 + +------------------------------------------------------------------- Mon Dec 7 11:27:04 CET 2009 - locilka(a)suse.cz - Fixed RPM dependencies Modified: branches/SuSE-Code-11-SP1-Branch/backup/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/backu… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/backup/src/ui.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/backup/src/ui.ycp Mon Jan 25 16:41:55 2010 @@ -181,7 +181,7 @@ if ((boolean) SCR::Read (.process.running, backup_PID)) { - sleep(wait); + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait); ret = (symbol) UI::PollInput(); @@ -1956,7 +1956,8 @@ } if (Backup::cron_mode) { - sleep(wait_time); + // BNC #568615: yast2 backup takes much longer when scheduled + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait_time); ret = nil; } else { @@ -2073,7 +2074,8 @@ if (Backup::cron_mode == true) { - sleep(wait_time); + // BNC #568615: yast2 backup takes much longer when scheduled + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait_time); ret = nil; } @@ -2826,7 +2828,7 @@ if (Backup::cron_mode) { ret = nil; - sleep(wait_time); + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait_time); CheckFreeSpace(); } else { ret = waitForUserOrProcess(wait_time, `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] r60512 - in /trunk/backup: package/yast2-backup.changes src/ui.ycp
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 16:39:07 2010 New Revision: 60512 URL: http://svn.opensuse.org/viewcvs/yast?rev=60512&view=rev Log: - Fixed low speed of automatic backup (BNC #568615). Modified: trunk/backup/package/yast2-backup.changes trunk/backup/src/ui.ycp Modified: trunk/backup/package/yast2-backup.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/package/yast2-backup.chan… ============================================================================== --- trunk/backup/package/yast2-backup.changes (original) +++ trunk/backup/package/yast2-backup.changes Mon Jan 25 16:39:07 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------ +Mon Jan 25 16:36:47 CET 2010 - locilka(a)suse.cz + +- Fixed low speed of automatic backup (BNC #568615). + +------------------------------------------------------------------ Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz - Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su Modified: trunk/backup/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/src/ui.ycp?rev=60512&r1=6… ============================================================================== --- trunk/backup/src/ui.ycp (original) +++ trunk/backup/src/ui.ycp Mon Jan 25 16:39:07 2010 @@ -181,7 +181,7 @@ if (backup_PID != nil && (boolean) SCR::Read (.process.running, backup_PID)) { - sleep(wait); + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait); ret = (symbol) UI::PollInput(); @@ -1950,7 +1950,7 @@ } if (Backup::cron_mode) { - sleep (wait_time); + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep (wait_time); } else { ret = UI::PollInput(); @@ -1966,7 +1966,7 @@ } if (line == nil && errline == nil) - sleep (ui_wait_time); + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep (ui_wait_time); } } @@ -2093,7 +2093,8 @@ } if (Backup::cron_mode) { - sleep(wait_time); + // BNC #568615: yast2 backup takes much longer when scheduled + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait_time); ret = nil; } else { @@ -2210,7 +2211,8 @@ if (Backup::cron_mode == true) { - sleep(wait_time); + // BNC #568615: yast2 backup takes much longer when scheduled + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait_time); ret = nil; } @@ -2963,7 +2965,7 @@ if (Backup::cron_mode) { ret = nil; - sleep(wait_time); + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait_time); CheckFreeSpace(); } else { ret = waitForUserOrProcess(wait_time, `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] r60511 - in /branches/SuSE-Code-11-SP1-Branch/support: package/yast2-support.changes src/Support.ycp
by mzugec＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: mzugec Date: Mon Jan 25 15:39:42 2010 New Revision: 60511 URL: http://svn.opensuse.org/viewcvs/yast?rev=60511&view=rev Log: bnc#447588 - remove progress dialog on start of support module Modified: branches/SuSE-Code-11-SP1-Branch/support/package/yast2-support.changes branches/SuSE-Code-11-SP1-Branch/support/src/Support.ycp Modified: branches/SuSE-Code-11-SP1-Branch/support/package/yast2-support.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/suppo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/support/package/yast2-support.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/support/package/yast2-support.changes Mon Jan 25 15:39:42 2010 @@ -2,6 +2,7 @@ Mon Jan 18 09:51:55 CET 2010 - mzugec(a)suse.cz - fixed desktop file (Categories) +- bnc#447588 - remove progress dialog on start of support module - 2.17.19 ------------------------------------------------------------------- Modified: branches/SuSE-Code-11-SP1-Branch/support/src/Support.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/suppo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/support/src/Support.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/support/src/Support.ycp Mon Jan 25 15:39:42 2010 @@ -244,52 +244,20 @@ /* Support read dialog caption */ string caption = _("Initializing support Configuration"); - // TODO FIXME Set the right number of stages - integer steps = 2; - - integer sl = 500; - sleep(sl); - - // TODO FIXME Names of real stages - // We do not set help text here, because it was set outside - Progress::New( caption, " ", steps, [ - /* Progress stage 1/3 */ - _("Read the configuration") - ], [ - /* Progress step 1/3 */ - _("Reading the database..."), - /* Progress step 2/3 */ - _("Reading the previous settings..."), - /* Progress step 3/3 */ - _("Detecting the devices..."), - /* Progress finished */ - _("Finished") - ], - "" - ); - - // read database - if(Abort()) return false; - Progress::NextStage(); configuration = (map)SCR::Read(.etc.supportconfig.all); foreach(map<string, any> row, configuration["value"]:[], { options[row["name"]:""]=row["value"]:""; }); /* Error message */ if(false) Report::Error(Message::CannotReadCurrentSettings()); - sleep(sl); - // read current settings - if(Abort()) return false; - Progress::NextStage(); if (PackageSystem::Installed("MozillaFirefox")) browser="firefox"; else if (PackageSystem::Installed("kde4-konqueror")||PackageSystem::Installed("kdebase3")) browser="konqueror"; else if (PackageSystem::Installed("opera")) browser="opera"; else y2error("Couldn't find any supported browser installed."); /* Error message */ if(false) Report::Error(Message::CannotReadCurrentSettings()); - sleep(sl); if(Abort()) return false; log_files=$[ "tmp_dir":(string)SCR::Read(.target.tmpdir) ]; -- 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] r60510 - /tags/branch-Code-11-SP1-2_17_10/wagon/
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 15:37:16 2010 New Revision: 60510 URL: http://svn.opensuse.org/viewcvs/yast?rev=60510&view=rev Log: Created tag branch-Code-11-SP1-2_17_10 for wagon Added: tags/branch-Code-11-SP1-2_17_10/wagon/ (props changed) - copied from r60509, branches/SuSE-Code-11-SP1-Branch/wagon/ -- 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] r60509 - in /trunk/wagon: package/yast2-wagon.changes src/clients/wagon_migration_products.ycp src/clients/wagon_selfupdate.ycp
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 15:35:45 2010 New Revision: 60509 URL: http://svn.opensuse.org/viewcvs/yast?rev=60509&view=rev Log: - Upgrading installed products moved after wagon self-update and restart In some cases the newly added code was not executed (BNC #573084). Modified: trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/clients/wagon_migration_products.ycp trunk/wagon/src/clients/wagon_selfupdate.ycp Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Mon Jan 25 15:35:45 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jan 25 11:59:30 CET 2010 - locilka(a)suse.cz + +- Upgrading installed products moved after wagon self-update and + restart In some cases the newly added code was not executed + (BNC #573084). + +------------------------------------------------------------------- Fri Jan 22 11:57:00 CET 2010 - locilka(a)suse.cz - Wagon extended to read and use migration products from the Modified: trunk/wagon/src/clients/wagon_migration_products.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_migratio… ============================================================================== --- trunk/wagon/src/clients/wagon_migration_products.ycp (original) +++ trunk/wagon/src/clients/wagon_migration_products.ycp Mon Jan 25 15:35:45 2010 @@ -36,6 +36,42 @@ return `back; } + integer UpdateInstalledProducts () { + integer affected_products = 0; + + list <map <string,any> > products = Pkg::ResolvableProperties ("", `product, ""); + + foreach (map<string, any> p, products, { + // Product is not installed + if (p["status"]:`unknown != `installed) return; + + // Make the logs readable + p["license"] = "..."; + p["description"] = "..."; + + string product_name = p["name"]:""; + string product_version = p["version"]:""; + + if (product_name == nil || product_name == "") { + y2error ("Cannot distinguish product name: %1", product_name); + return; + } + + // Product version is the same but release can be different + // product map doesn't contain the release string. To be sure, product will be reinstalled + y2milestone ("Upgrading product %1 version %2", product_name, product_version); + // The version is the same, release can be different + if (Pkg::ResolvableInstall (product_name, `product) != true) { + Report::Error (sformat(_("Cannot update installed product %1."), product_name)); + return; + } + + affected_products = affected_products + 1; + }); + + return affected_products; + } + boolean FindAndSelectMigrationProducts () { if (Wagon::InitPkg() != true) { Report::Error (_("Unable to initialize the package manager.")); @@ -99,13 +135,39 @@ return true; } + Wagon::InitPkg(); + + Wagon::ReadProductsBeforeMigration(); + Wagon::StoreProductsBeforeMigration(); + + // BNC #573084: New code (upgrading products) can be added after + // wagon self-upgrade and restart + integer products_for_upgrade = UpdateInstalledProducts(); + + if (products_for_upgrade > 0) { + symbol ret = SolveDependencies(); + + if (ret != `abort && ret != `cancel) { + y2milestone ("Upgrading %1 product packages...", products_for_upgrade); + any inst_ret = WFM::call ("inst_rpmcopy"); + y2milestone ("Product package upgrade returned: %1", inst_ret); + ret = `auto; + } else { + return `abort; + } + + ResetPackager(); + } else { + y2warning ("No products selected for upgrade"); + } + if (FindAndSelectMigrationProducts() != true) { return `auto; } symbol ret = SolveDependencies(); - if (ret != `abort) { + if (ret != `abort && ret != `cancel) { // Solver ends with some resolvables changed if (Pkg::IsAnyResolvable (`any, `to_install) == true || Pkg::IsAnyResolvable (`any, `to_remove) == true) { y2milestone ("Installing packages..."); Modified: trunk/wagon/src/clients/wagon_selfupdate.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_selfupda… ============================================================================== --- trunk/wagon/src/clients/wagon_selfupdate.ycp (original) +++ trunk/wagon/src/clients/wagon_selfupdate.ycp Mon Jan 25 15:35:45 2010 @@ -135,50 +135,8 @@ return pkgs_affected; } - integer UpdateInstalledProducts () { - integer affected_products = 0; - - list <map <string,any> > products = Pkg::ResolvableProperties ("", `product, ""); - - foreach (map<string, any> p, products, { - // Product is not installed - if (p["status"]:`unknown != `installed) return; - - // Make the logs readable - p["license"] = "..."; - p["description"] = "..."; - - string product_name = p["name"]:""; - string product_version = p["version"]:""; - - if (product_name == nil || product_name == "") { - y2error ("Cannot distinguish product name: %1", product_name); - return; - } - - // Product version is the same but release can be different - // product map doesn't contain the release string. To be sure, product will be reinstalled - y2milestone ("Upgrading product %1 version %2", product_name, product_version); - // The version is the same, release can be different - if (Pkg::ResolvableInstall (product_name, `product) != true) { - Report::Error (sformat(_("Cannot update installed product %1."), product_name)); - return; - } - - affected_products = affected_products + 1; - }); - - return affected_products; - } - Wagon::InitPkg(); - list <map <string, any> > products = Pkg::ResolvableProperties ("", `product, ""); - y2milestone ("All known products: %1", products); - - Wagon::ReadProductsBeforeMigration(); - Wagon::StoreProductsBeforeMigration(); - symbol ret = `auto; // Patches need solver run @@ -202,12 +160,6 @@ } } - integer products_selected_for_update = UpdateInstalledProducts(); - if (products_selected_for_update > 0) { - y2milestone ("%1 products were selected for update", products_selected_for_update); - selected = products_selected_for_update; - } - y2milestone ("Selected resolvables: %1", selected); if (selected < 1) { y2milestone ("Neither patches nor packages for self-update have been selected"); -- 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] r60508 - in /branches/SuSE-Code-11-SP1-Branch/wagon: VERSION package/yast2-wagon.changes src/clients/wagon_migration_products.ycp src/clients/wagon_selfupdate.ycp
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 15:35:25 2010 New Revision: 60508 URL: http://svn.opensuse.org/viewcvs/yast?rev=60508&view=rev Log: - Upgrading installed products moved after wagon self-update and restart In some cases the newly added code was not executed (BNC #573084). - 2.17.10 Modified: branches/SuSE-Code-11-SP1-Branch/wagon/VERSION branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_migration_products.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_selfupdate.ycp Modified: branches/SuSE-Code-11-SP1-Branch/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/VERSION Mon Jan 25 15:35:25 2010 @@ -1 +1 @@ -2.17.9 +2.17.10 Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes Mon Jan 25 15:35:25 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Jan 25 11:59:30 CET 2010 - locilka(a)suse.cz + +- Upgrading installed products moved after wagon self-update and + restart In some cases the newly added code was not executed + (BNC #573084). +- 2.17.10 + +------------------------------------------------------------------- Fri Jan 22 11:57:00 CET 2010 - locilka(a)suse.cz - Wagon extended to read and use migration products from the Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_migration_products.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_migration_products.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_migration_products.ycp Mon Jan 25 15:35:25 2010 @@ -36,6 +36,42 @@ return `back; } + integer UpdateInstalledProducts () { + integer affected_products = 0; + + list <map <string,any> > products = Pkg::ResolvableProperties ("", `product, ""); + + foreach (map<string, any> p, products, { + // Product is not installed + if (p["status"]:`unknown != `installed) return; + + // Make the logs readable + p["license"] = "..."; + p["description"] = "..."; + + string product_name = p["name"]:""; + string product_version = p["version"]:""; + + if (product_name == nil || product_name == "") { + y2error ("Cannot distinguish product name: %1", product_name); + return; + } + + // Product version is the same but release can be different + // product map doesn't contain the release string. To be sure, product will be reinstalled + y2milestone ("Upgrading product %1 version %2", product_name, product_version); + // The version is the same, release can be different + if (Pkg::ResolvableInstall (product_name, `product) != true) { + Report::Error (sformat(_("Cannot update installed product %1."), product_name)); + return; + } + + affected_products = affected_products + 1; + }); + + return affected_products; + } + boolean FindAndSelectMigrationProducts () { if (Wagon::InitPkg() != true) { Report::Error (_("Unable to initialize the package manager.")); @@ -99,13 +135,39 @@ return true; } + Wagon::InitPkg(); + + Wagon::ReadProductsBeforeMigration(); + Wagon::StoreProductsBeforeMigration(); + + // BNC #573084: New code (upgrading products) can be added after + // wagon self-upgrade and restart + integer products_for_upgrade = UpdateInstalledProducts(); + + if (products_for_upgrade > 0) { + symbol ret = SolveDependencies(); + + if (ret != `abort && ret != `cancel) { + y2milestone ("Upgrading %1 product packages...", products_for_upgrade); + any inst_ret = WFM::call ("inst_rpmcopy"); + y2milestone ("Product package upgrade returned: %1", inst_ret); + ret = `auto; + } else { + return `abort; + } + + ResetPackager(); + } else { + y2warning ("No products selected for upgrade"); + } + if (FindAndSelectMigrationProducts() != true) { return `auto; } symbol ret = SolveDependencies(); - if (ret != `abort) { + if (ret != `abort && ret != `cancel) { // Solver ends with some resolvables changed if (Pkg::IsAnyResolvable (`any, `to_install) == true || Pkg::IsAnyResolvable (`any, `to_remove) == true) { y2milestone ("Installing packages..."); Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_selfupdate.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_selfupdate.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_selfupdate.ycp Mon Jan 25 15:35:25 2010 @@ -135,50 +135,8 @@ return pkgs_affected; } - integer UpdateInstalledProducts () { - integer affected_products = 0; - - list <map <string,any> > products = Pkg::ResolvableProperties ("", `product, ""); - - foreach (map<string, any> p, products, { - // Product is not installed - if (p["status"]:`unknown != `installed) return; - - // Make the logs readable - p["license"] = "..."; - p["description"] = "..."; - - string product_name = p["name"]:""; - string product_version = p["version"]:""; - - if (product_name == nil || product_name == "") { - y2error ("Cannot distinguish product name: %1", product_name); - return; - } - - // Product version is the same but release can be different - // product map doesn't contain the release string. To be sure, product will be reinstalled - y2milestone ("Upgrading product %1 version %2", product_name, product_version); - // The version is the same, release can be different - if (Pkg::ResolvableInstall (product_name, `product) != true) { - Report::Error (sformat(_("Cannot update installed product %1."), product_name)); - return; - } - - affected_products = affected_products + 1; - }); - - return affected_products; - } - Wagon::InitPkg(); - list <map <string, any> > products = Pkg::ResolvableProperties ("", `product, ""); - y2milestone ("All known products: %1", products); - - Wagon::ReadProductsBeforeMigration(); - Wagon::StoreProductsBeforeMigration(); - symbol ret = `auto; // Patches need solver run @@ -202,12 +160,6 @@ } } - integer products_selected_for_update = UpdateInstalledProducts(); - if (products_selected_for_update > 0) { - y2milestone ("%1 products were selected for update", products_selected_for_update); - selected = products_selected_for_update; - } - y2milestone ("Selected resolvables: %1", selected); if (selected < 1) { y2milestone ("Neither patches nor packages for self-update have been selected"); -- 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] r60507 - /tags/branch-Code-11-SP1-2_17_89/storage/
by aschnell＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: aschnell Date: Mon Jan 25 14:34:39 2010 New Revision: 60507 URL: http://svn.opensuse.org/viewcvs/yast?rev=60507&view=rev Log: Created tag branch-Code-11-SP1-2_17_89 for storage Added: tags/branch-Code-11-SP1-2_17_89/storage/ (props changed) - copied from r60506, branches/SuSE-Code-11-SP1-Branch/storage/ -- 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] r60506 - /tags/branch-Code-11-SP1-2_17_89/
by aschnell＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: aschnell Date: Mon Jan 25 14:34:38 2010 New Revision: 60506 URL: http://svn.opensuse.org/viewcvs/yast?rev=60506&view=rev Log: Created tag branch-Code-11-SP1-2_17_89 Added: tags/branch-Code-11-SP1-2_17_89/ -- 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] r60505 - /branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes
by aschnell＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: aschnell Date: Mon Jan 25 14:33:26 2010 New Revision: 60505 URL: http://svn.opensuse.org/viewcvs/yast?rev=60505&view=rev Log: - fixed bug number Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Mon Jan 25 14:33:26 2010 @@ -2,7 +2,7 @@ Mon Jan 25 14:12:51 CET 2010 - aschnell(a)suse.de - fixed generation of device names in proposal for partitionable - MDs (bnc #573088) + MDs (bnc #573070) - 2.17.89 ------------------------------------------------------------------- -- 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] r60504 - in /branches/SuSE-Code-11-SP1-Branch/storage: VERSION package/yast2-storage.changes storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: aschnell Date: Mon Jan 25 14:23:53 2010 New Revision: 60504 URL: http://svn.opensuse.org/viewcvs/yast?rev=60504&view=rev Log: - fixed generation of device names in proposal for partitionable MDs (bnc #573088) Modified: branches/SuSE-Code-11-SP1-Branch/storage/VERSION branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp Modified: branches/SuSE-Code-11-SP1-Branch/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/VERSION Mon Jan 25 14:23:53 2010 @@ -1 +1 @@ -2.17.88 +2.17.89 Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Mon Jan 25 14:23:53 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jan 25 14:12:51 CET 2010 - aschnell(a)suse.de + +- fixed generation of device names in proposal for partitionable + MDs (bnc #573088) +- 2.17.89 + +------------------------------------------------------------------- Tue Jan 19 17:49:33 CET 2010 - aschnell(a)suse.de - zero newly created partitions on DASDs (bnc #571828) Modified: branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp Mon Jan 25 14:23:53 2010 @@ -204,6 +204,7 @@ search( disk, "/dev/ida/" )==0 || search( disk, "/dev/ataraid/" )==0 || search( disk, "/dev/etherd/" )==0 || + (search(disk, "/dev/md") == 0 && disk != "/dev/md") || search( disk, "/dev/rd/" )==0 ) { ret = ret + "p"; -- 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] r60503 - /tags/branch-Code-11-SP1-2_17_33/autoinstallation/
by ug＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: ug Date: Mon Jan 25 12:54:12 2010 New Revision: 60503 URL: http://svn.opensuse.org/viewcvs/yast?rev=60503&view=rev Log: Created tag branch-Code-11-SP1-2_17_33 for autoinstallation Added: tags/branch-Code-11-SP1-2_17_33/autoinstallation/ (props changed) - copied from r60502, branches/SuSE-Code-11-SP1-Branch/autoinstallation/ -- 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] r60502 - in /branches/SuSE-Code-11-SP1-Branch/autoinstallation: VERSION package/autoyast2.changes
by ug＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: ug Date: Mon Jan 25 12:54:06 2010 New Revision: 60502 URL: http://svn.opensuse.org/viewcvs/yast?rev=60502&view=rev Log: 2.17.33 Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/VERSION branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/VERSION Mon Jan 25 12:54:06 2010 @@ -1 +1 @@ -2.17.32 +2.17.33 Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes Mon Jan 25 12:54:06 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jan 25 12:41:40 CET 2010 - ug(a)suse.de + +- 2.17.33 + +------------------------------------------------------------------- Fri Jan 22 11:49:06 CET 2010 - ug(a)suse.de - the regex match for rules only worked for substring, not -- 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] r60501 - /trunk/autoinstallation/doc/RulesAndClasses.xml
by ug＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: ug Date: Mon Jan 25 11:32:13 2010 New Revision: 60501 URL: http://svn.opensuse.org/viewcvs/yast?rev=60501&view=rev Log: docu update Modified: trunk/autoinstallation/doc/RulesAndClasses.xml Modified: trunk/autoinstallation/doc/RulesAndClasses.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/RulesAndCla… ============================================================================== --- trunk/autoinstallation/doc/RulesAndClasses.xml (original) +++ trunk/autoinstallation/doc/RulesAndClasses.xml Mon Jan 25 11:32:13 2010 @@ -269,7 +269,7 @@ </listitem> <listitem> <para> - regex (available since 10.1 and SLES10) + regex (available since 10.1 and SLES10). It's a simple "=~" operator like in bash </para> </listitem> </itemizedlist> @@ -858,6 +858,17 @@ <element>partition</element> </dont_merge> </result> + <board_vendor> + <match>PowerEdge [12]850</match> + <match_type>regex</match_type> + </board_vendor> + <result> + <profile>classes/smallswap.xml</profile> + <continue config:type="boolean">true</continue> + <dont_merge config:type="list"> + <element>partition</element> + </dont_merge> + </result> </rule> </screen> </para> -- 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] r60500 - /trunk/storage/storage/src/modules/FileSystems.ycp
by aschnell＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: aschnell Date: Mon Jan 25 11:01:22 2010 New Revision: 60500 URL: http://svn.opensuse.org/viewcvs/yast?rev=60500&view=rev Log: - simplified GetMountString and GetNeededModules Modified: trunk/storage/storage/src/modules/FileSystems.ycp 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 25 11:01:22 2010 @@ -18,9 +18,7 @@ import "Arch"; import "String"; import "Partitions"; - import "Popup"; import "Encoding"; - import "Mode"; import "Stage"; import "LibStorage"; @@ -1018,38 +1016,22 @@ * Return the mount option for each used_fs (-t) * @return string */ - global define string GetMountString(symbol used_fs, string defaultv )``{ - map<symbol,any> fsmap = GetFsMap( used_fs); - string ret = fsmap[`mount_string ]:""; - if( size(ret)==0 ) - { - if( used_fs == `vfat ) - { - ret = "vfat"; - } - else if( used_fs == `ntfs ) - { - ret = "ntfs-3g"; - } - } - if( ret == "" ) ret = defaultv; - y2milestone( "used_fs:%1 ret:%2", used_fs, ret ); - return ret; - } + global string GetMountString(symbol used_fs, string defaultv) + { + map<symbol, any> fsmap = GetFsMap(used_fs); + string ret = fsmap[`mount_string ]:defaultv; + y2milestone("GetMountString used_fs:%1 ret:%2", used_fs, ret); + return ret; + } - global define list<string> GetNeededModules( symbol used_fs )``{ - list<string> ret = []; - map<symbol,any> fsmap = GetFsMap( used_fs); - if( used_fs==`ntfs && size(fsmap)==0 ) - { - ret = ["ntfs"]; - } - else - { - ret = fsmap[`needed_modules ]:[]; - } - return ret; - } + + global list<string> GetNeededModules(symbol used_fs) + { + map<symbol, any> fsmap = GetFsMap(used_fs); + list<string> ret = fsmap[`needed_modules ]:[]; + y2milestone("GetNeededModules used_fs:%1 ret:%2", used_fs, ret); + return ret; + } global integer MinFsSizeK(symbol fsys) -- 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] r60499 - in /trunk/installation: package/yast2-installation.changes startup/YaST2.ssh
by aschnell＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: aschnell Date: Fri Jan 22 15:57:59 2010 New Revision: 60499 URL: http://svn.opensuse.org/viewcvs/yast?rev=60499&view=rev Log: - fixed message during ssh installation (bnc #518616) Modified: trunk/installation/package/yast2-installation.changes trunk/installation/startup/YaST2.ssh Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Fri Jan 22 15:57:59 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Jan 22 15:56:07 CET 2010 - aschnell(a)suse.de + +- fixed message during ssh installation (bnc #518616) + +------------------------------------------------------------------- Fri Jan 15 17:29:45 CET 2010 - aschnell(a)suse.de - updated control.rnc Modified: trunk/installation/startup/YaST2.ssh URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/YaST2.ssh?r… ============================================================================== --- trunk/installation/startup/YaST2.ssh (original) +++ trunk/installation/startup/YaST2.ssh Fri Jan 22 15:57:59 2010 @@ -62,11 +62,15 @@ # running the second stage installation /usr/lib/YaST2/startup/YaST2.call installation continue - # second stage installation needs to reboot - if [ -f /var/lib/YaST2/reboot ]; then + if [ -f /etc/install.inf ] ; then + SecondStageRequired=$(awk ' /^SecondStageRequired:/ { print $2 }' < /etc/install.inf) + fi + + if [ -n "$SecondStageRequired" -a "$SecondStageRequired" = "1" ] ; then + # second stage installation needs to reboot reboot_during_second_stage - # second stage has just finished else + # second stage has just finished continue_after_second_stage fi 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] r60498 - in /trunk/printer: VERSION package/yast2-printer.changes
by jsmeix＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: jsmeix Date: Fri Jan 22 15:39:33 2010 New Revision: 60498 URL: http://svn.opensuse.org/viewcvs/yast?rev=60498&view=rev Log: - Fixed search usability in basicadd.ycp and basicmodify.ycp in each run of the user input while loop before UI::UserInput() by first replacing the [Search for] button with itself with `opt(`default) to enforce this default regardless whatever function call or UI bug (see bnc#558900) may have changed it and then additionally but only when the user is already searching drivers, set the focus to the InputField for the search string so that the user can just type in another search string. In contrast when the user is not already searching drivers, it is annoying in particular in the text-only ncurses UI when the focus becomes always set to the search string InputField for each run of the user input while loop. - In basicadd.ycp and basicmodify.ycp re-rename the PushButton to launch the DriverAdd dialog from "Install Driver" to "Driver Packages" because the former can be confused by the user with the functionality what the [OK] button in basicadd.ycp and basicmodify.ycp does i.e. to install the print queue with the selected driver. - Improved help text 'regarding firewall' and added link to 'SDB:CUPS and SANE Firewall settings' at http://en.opensuse.org/SDB:CUPS_and_SANE_Firewall_settings - 2.19.4 Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=60498&r1=604… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Fri Jan 22 15:39:33 2010 @@ -1 +1 @@ -2.19.3 +2.19.4 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Fri Jan 22 15:39:33 2010 @@ -1,7 +1,41 @@ ------------------------------------------------------------------- +Fri Jan 22 15:23:18 CET 2010 - jsmeix(a)suse.de + +- Fixed search usability in basicadd.ycp and basicmodify.ycp + in each run of the user input while loop before UI::UserInput() + by first replacing the [Search for] button with itself + with `opt(`default) to enforce this default regardless + whatever function call or UI bug (see bnc#558900) + may have changed it and then additionally + but only when the user is already searching drivers, + set the focus to the InputField for the search string + so that the user can just type in another search string. + In contrast when the user is not already searching drivers, + it is annoying in particular in the text-only ncurses UI + when the focus becomes always set to the search string + InputField for each run of the user input while loop. +- In basicadd.ycp and basicmodify.ycp re-rename + the PushButton to launch the DriverAdd dialog + from "Install Driver" to "Driver Packages" + because the former can be confused by the user + with the functionality what the [OK] button + in basicadd.ycp and basicmodify.ycp does i.e. to + install the print queue with the selected driver. +- Improved help text 'regarding firewall' and + added link to 'SDB:CUPS and SANE Firewall settings' at + http://en.opensuse.org/SDB:CUPS_and_SANE_Firewall_settings +- 2.19.4 + +------------------------------------------------------------------- Tue Jan 19 16:21:03 CET 2010 - jsmeix(a)suse.de -- More meaningful wording in BasicAdd and BasicModify dialogs. +- More meaningful wording in BasicAdd and BasicModify dialogs + in particular the following PushButton renames: + From "More Connections" to "Detect More", + from "Search" to "Search for", + from "More Drivers" to "Find More", + from "Add Driver" to "Install Driver", + from "Set Name" to "Set Arbitrary Name". - 2.19.3 ------------------------------------------------------------------ -- 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] r60497 - in /trunk/storage: VERSION package/yast2-storage.changes yast2-storage.spec.in
by aschnell＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: aschnell Date: Fri Jan 22 14:30:13 2010 New Revision: 60497 URL: http://svn.opensuse.org/viewcvs/yast?rev=60497&view=rev Log: - increased version Modified: trunk/storage/VERSION trunk/storage/package/yast2-storage.changes trunk/storage/yast2-storage.spec.in Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=60497&r1=604… ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Fri Jan 22 14:30:13 2010 @@ -1 +1 @@ -2.19.3 +2.19.4 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 Fri Jan 22 14:30:13 2010 @@ -2,6 +2,7 @@ Thu Jan 21 17:28:48 CET 2010 - aschnell(a)suse.de - implemented moving of newly created partitions (see bnc #541034) +- 2.19.4 ------------------------------------------------------------------- Tue Jan 19 14:14:26 CET 2010 - fehr(a)suse.de Modified: trunk/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/yast2-storage.spec.in?re… ============================================================================== --- trunk/storage/yast2-storage.spec.in (original) +++ trunk/storage/yast2-storage.spec.in Fri Jan 22 14:30:13 2010 @@ -5,7 +5,7 @@ License: GPL v2 or later BuildRequires: blocxx-devel boost-devel gcc-c++ libxcrypt-devel openssl-devel sablot swig BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files -BuildRequires: libstorage-devel >= 2.19.5 yast2 >= 2.19.4 yast2-core-devel >= 2.18.1 yast2-devtools +BuildRequires: libstorage-devel >= 2.19.6 yast2 >= 2.19.4 yast2-core-devel >= 2.18.1 yast2-devtools BuildRequires: yast2-testsuite >= 2.19.0 yast2-perl-bindings Requires: libstorage = %(echo `rpm -q --queryformat '%{VERSION}' libstorage`) Requires: yast2-perl-bindings yast2-core >= 2.18.3 yast2 >= 2.19.4 yast2-libyui >= 2.18.7 -- 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] r60496 - /tags/branch-Code-11-SP1-2_17_88/storage/
by aschnell＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: aschnell Date: Fri Jan 22 14:23:27 2010 New Revision: 60496 URL: http://svn.opensuse.org/viewcvs/yast?rev=60496&view=rev Log: Created tag branch-Code-11-SP1-2_17_88 for storage Added: tags/branch-Code-11-SP1-2_17_88/storage/ (props changed) - copied from r60495, branches/SuSE-Code-11-SP1-Branch/storage/ -- 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] r60495 - /tags/branch-Code-11-SP1-2_17_88/
by aschnell＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: aschnell Date: Fri Jan 22 14:23:27 2010 New Revision: 60495 URL: http://svn.opensuse.org/viewcvs/yast?rev=60495&view=rev Log: Created tag branch-Code-11-SP1-2_17_88 Added: tags/branch-Code-11-SP1-2_17_88/ -- 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] r60494 - /tags/branch-Code-11-SP1-2_17_18/theme/
by jsrain＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: jsrain Date: Fri Jan 22 13:45:22 2010 New Revision: 60494 URL: http://svn.opensuse.org/viewcvs/yast?rev=60494&view=rev Log: Created tag branch-Code-11-SP1-2_17_18 for theme Added: tags/branch-Code-11-SP1-2_17_18/theme/ (props changed) - copied from r60493, branches/SuSE-Code-11-SP1-Branch/theme/ -- 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] r60493 - /branches/SuSE-Code-11-SP1-Branch/theme/VERSION
by jsrain＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: jsrain Date: Fri Jan 22 13:42:55 2010 New Revision: 60493 URL: http://svn.opensuse.org/viewcvs/yast?rev=60493&view=rev Log: bump Modified: branches/SuSE-Code-11-SP1-Branch/theme/VERSION Modified: branches/SuSE-Code-11-SP1-Branch/theme/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/theme… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/theme/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/theme/VERSION Fri Jan 22 13:42:55 2010 @@ -1 +1 @@ -2.17.17 +2.17.18 -- 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] r60492 - in /branches/SuSE-Code-11-SP1-Branch/theme: openSUSE-Crystal/icons/22x22/apps/ openSUSE-Crystal/icons/32x32/apps/ openSUSE-Crystal/icons/48x48/apps/ openSUSE-Oxygen/icons/22x22/apps/ openS...
by jsrain＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: jsrain Date: Fri Jan 22 13:42:39 2010 New Revision: 60492 URL: http://svn.opensuse.org/viewcvs/yast?rev=60492&view=rev Log: added icons for openvas module (fate#307440) Added: branches/SuSE-Code-11-SP1-Branch/theme/openSUSE-Crystal/icons/22x22/apps/yast-openvas.png (with props) branches/SuSE-Code-11-SP1-Branch/theme/openSUSE-Crystal/icons/32x32/apps/yast-openvas.png (with props) branches/SuSE-Code-11-SP1-Branch/theme/openSUSE-Crystal/icons/48x48/apps/yast-openvas.png (with props) branches/SuSE-Code-11-SP1-Branch/theme/openSUSE-Oxygen/icons/22x22/apps/yast-openvas.png (with props) branches/SuSE-Code-11-SP1-Branch/theme/openSUSE-Oxygen/icons/32x32/apps/yast-openvas.png (with props) branches/SuSE-Code-11-SP1-Branch/theme/openSUSE-Oxygen/icons/48x48/apps/yast-openvas.png (with props) branches/SuSE-Code-11-SP1-Branch/theme/openSUSE/icons/16x16/apps/yast-openvas.png (with props) branches/SuSE-Code-11-SP1-Branch/theme/openSUSE/icons/22x22/apps/yast-openvas.png (with props) branches/SuSE-Code-11-SP1-Branch/theme/openSUSE/icons/32x32/apps/yast-openvas.png (with props) branches/SuSE-Code-11-SP1-Branch/theme/openSUSE/icons/48x48/apps/yast-openvas.png (with props) branches/SuSE-Code-11-SP1-Branch/theme/openSUSE/icons/64x64/apps/yast-openvas.png (with props) Modified: branches/SuSE-Code-11-SP1-Branch/theme/package/yast2-theme.changes Added: branches/SuSE-Code-11-SP1-Branch/theme/openSUSE-Crystal/icons/22x22/apps/yast-openvas.png URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/theme… ============================================================================== Binary file - no diff available. Added: branches/SuSE-Code-11-SP1-Branch/theme/openSUSE-Crystal/icons/32x32/apps/yast-openvas.png URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/theme… ============================================================================== Binary file - no diff available. Added: branches/SuSE-Code-11-SP1-Branch/theme/openSUSE-Crystal/icons/48x48/apps/yast-openvas.png URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/theme… ============================================================================== Binary file - no diff available. Added: branches/SuSE-Code-11-SP1-Branch/theme/openSUSE-Oxygen/icons/22x22/apps/yast-openvas.png URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/theme… ============================================================================== Binary file - no diff available. Added: branches/SuSE-Code-11-SP1-Branch/theme/openSUSE-Oxygen/icons/32x32/apps/yast-openvas.png URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/theme… ============================================================================== Binary file - no diff available. Added: branches/SuSE-Code-11-SP1-Branch/theme/openSUSE-Oxygen/icons/48x48/apps/yast-openvas.png URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/theme… ============================================================================== Binary file - no diff available. Added: branches/SuSE-Code-11-SP1-Branch/theme/openSUSE/icons/16x16/apps/yast-openvas.png URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/theme… ============================================================================== Binary file - no diff available. Added: branches/SuSE-Code-11-SP1-Branch/theme/openSUSE/icons/22x22/apps/yast-openvas.png URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/theme… ============================================================================== Binary file - no diff available. Added: branches/SuSE-Code-11-SP1-Branch/theme/openSUSE/icons/32x32/apps/yast-openvas.png URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/theme… ============================================================================== Binary file - no diff available. Added: branches/SuSE-Code-11-SP1-Branch/theme/openSUSE/icons/48x48/apps/yast-openvas.png URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/theme… ============================================================================== Binary file - no diff available. Added: branches/SuSE-Code-11-SP1-Branch/theme/openSUSE/icons/64x64/apps/yast-openvas.png URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/theme… ============================================================================== Binary file - no diff available. Modified: branches/SuSE-Code-11-SP1-Branch/theme/package/yast2-theme.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/theme… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/theme/package/yast2-theme.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/theme/package/yast2-theme.changes Fri Jan 22 13:42:39 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 22 13:11:08 CET 2010 - jsrain(a)suse.cz + +- added icons for openvas module (fate#307440) +- 2.17.18 + +------------------------------------------------------------------- Thu Jan 22 12:24:56 CET 2009 - jimmac(a)novell.com - set the SLE green for links (a) as well. bug #446588 -- 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] r60491 - /tags/branch-Code-11-SP1-2_17_9/wagon/
by locilka＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: locilka Date: Fri Jan 22 13:42:24 2010 New Revision: 60491 URL: http://svn.opensuse.org/viewcvs/yast?rev=60491&view=rev Log: Created tag branch-Code-11-SP1-2_17_9 for wagon Added: tags/branch-Code-11-SP1-2_17_9/wagon/ (props changed) - copied from r60490, branches/SuSE-Code-11-SP1-Branch/wagon/ -- 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] r60489 - in /branches/SuSE-Code-11-SP1-Branch/wagon/src/include: ./ Makefile.am common_func.ycp
by locilka＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: locilka Date: Fri Jan 22 13:38:59 2010 New Revision: 60489 URL: http://svn.opensuse.org/viewcvs/yast?rev=60489&view=rev Log: Missing files Added: branches/SuSE-Code-11-SP1-Branch/wagon/src/include/ branches/SuSE-Code-11-SP1-Branch/wagon/src/include/Makefile.am branches/SuSE-Code-11-SP1-Branch/wagon/src/include/common_func.ycp Added: branches/SuSE-Code-11-SP1-Branch/wagon/src/include/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/include/Makefile.am (added) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/include/Makefile.am Fri Jan 22 13:38:59 2010 @@ -0,0 +1,13 @@ +# +# Makefile.am for wagon/src/include +# + +yncludedir = @yncludedir@/wagon + +ynclude_DATA = $(wildcard *.ycp) + +YCPCFLAGS = -M ../modules + +EXTRA_DIST = $(ynclude_DATA) + +include $(top_srcdir)/Makefile.am.common Added: branches/SuSE-Code-11-SP1-Branch/wagon/src/include/common_func.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/include/common_func.ycp (added) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/include/common_func.ycp Fri Jan 22 13:38:59 2010 @@ -0,0 +1,128 @@ +/** + * File: + * include/wagon/common_func.ycp + * + * Module: + * Wagon + * + * Authors: + * Lukas Ocilka <locilka(a)suse.cz> + * + * Summary: + * Online Migration Tool + * + * $Id$ + * + */ + +{ + textdomain "wagon"; + + import "Label"; + import "Popup"; + import "PackagesUI"; + import "Wagon"; + import "Wizard"; + + boolean SolverRunWithFeedback () { + UI::OpenDialog (`Label (_("Solving the package dependencies..."))); + boolean ret = Pkg::PkgSolve (true); + UI::CloseDialog(); + + return ret; + } + + symbol SolveDependencies () { + symbol ret = `auto; + + boolean solved = nil; + + while (solved != true) { + // Trying to solve automatically + solved = SolverRunWithFeedback(); + symbol ret_sel = nil; + + // PkgSolve didn't report any problem + if (solved == true) { + y2milestone ("Solved automatically"); + ret = `auto; + // There are some issues in selecting the patches + } else { + y2milestone ("Cannot be solved automatically"); + while (true) { + // Try to solve them manually + ret_sel = PackagesUI::RunPackageSelector ($["mode":`summaryMode]); + + // Cannot or don't want to accept the proposal + if (ret_sel == `cancel) { + // Confirmed + if (Popup::AnyQuestion ( + // TRANSLATORS: headline + _("Aborting the Upgrade"), + // TRANSLATORS: pop-up question + _("Cannot continue without installing the required patches. +Are sure you want to abort the upgrade process?"), + _("Abort Upgrade"), + Label::NoButton(), + `yes_button + )) { + ret = `abort; + break; + // Try again + } else { + continue; + } + // Solved manually + } else if (ret_sel == `accept) { + ret = `auto; + solved = true; + break; + } + } + } + + if (ret == `abort) { + solved = nil; + y2warning ("Aborting..."); + break; + } + + if (! Wagon::AcceptLicenses()) { + y2warning ("Some license(s) have been rejected, running solver again"); + solved = nil; + } + } + + return ret; + } + + void ResetPackager () { + Wizard::SetContents ( + _("Reseting Package Manager"), + `Label(_("Reseting package manager...")), + "", + false, true + ); + + y2milestone ("Reseting Pkg"); + Pkg::PkgApplReset(); + Pkg::PkgReset(); + + symbol status = nil; + string name = nil; + + y2milestone ("Neutralizing all resolvables"); + foreach (symbol resolvable, [`pattern, `patch, `package, `product, `scrpackage], { + Pkg::ResolvableNeutral ("" /* all */, resolvable, true /* force */); + }); + + y2milestone ("Running solver"); + Pkg::PkgSolve (true); + + Pkg::TargetFinish(); + Pkg::SourceFinishAll(); + + Wagon::InitPkg(); + Pkg::PkgSolve (true); + } +} -- 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] r60490 - /tags/branch-Code-11-SP1-2_17_0/openvas-security-scanner/
by jsrain＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: jsrain Date: Fri Jan 22 13:39:00 2010 New Revision: 60490 URL: http://svn.opensuse.org/viewcvs/yast?rev=60490&view=rev Log: Created tag branch-Code-11-SP1-2_17_0 for openvas-security-scanner Added: tags/branch-Code-11-SP1-2_17_0/openvas-security-scanner/ (props changed) - copied from r60488, branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/ -- 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] r60488 - in /branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner: VERSION package/yast2-openvas-security-scanner.changes
by jsrain＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: jsrain Date: Fri Jan 22 13:38:53 2010 New Revision: 60488 URL: http://svn.opensuse.org/viewcvs/yast?rev=60488&view=rev Log: bump Added: branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/package/yast2-openvas-security-scanner.changes Modified: branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/VERSION Modified: branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/openv… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/VERSION Fri Jan 22 13:38:53 2010 @@ -1 +1 @@ -2.15.0 +2.17.0 Added: branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/package/yast2-openvas-security-scanner.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/openv… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/package/yast2-openvas-security-scanner.changes (added) +++ branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/package/yast2-openvas-security-scanner.changes Fri Jan 22 13:38:53 2010 @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Fri Jan 22 13:12:20 CET 2010 - jsrain(a)suse.cz + +- initial release (fate#307440) +- 2.17.0 + -- 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] r60487 - /branches/SuSE-Code-11-SP1-Branch/autoinstallation/doc/CreateProfileDetails.xml
by ug＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: ug Date: Fri Jan 22 12:56:10 2010 New Revision: 60487 URL: http://svn.opensuse.org/viewcvs/yast?rev=60487&view=rev Log: little docu fix Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/doc/CreateProfileDetails.xml Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/doc/CreateProfileDetails.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/doc/CreateProfileDetails.xml (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/doc/CreateProfileDetails.xml Fri Jan 22 12:56:10 2010 @@ -350,7 +350,7 @@ <tbody> <row> <entry>device</entry> - <entry>the device you want to configure in this section. Since SUSE Linux 10.1 and SLES10, you can use persistent device names via id, like <emphasis>/dev/disk/by-id/edd-int13_dev80</emphasis>. With SLES10 SP1 and SUSE Linux 10.2, <emphasis>by-path</emphasis> is possible too like <emphasis>/dev/disk/by-path/pci-0001:00:03.0-scsi-0:0:0:0</emphasis>. + <entry>the device you want to configure in this section. Since SUSE Linux 10.1 and SLES10, you can use persistent device names via id, like <emphasis>/dev/disk/by-id/ata-WDC_WD3200AAKS-75L9A0_WD-WMAV27368122</emphasis>. With SLES10 SP1 and SUSE Linux 10.2, <emphasis>by-path</emphasis> is possible too like <emphasis>/dev/disk/by-path/pci-0001:00:03.0-scsi-0:0:0:0</emphasis>. <para><screen><device>/dev/hda</device></screen></para> </entry> <entry>optional. If left out, autoyast tries to guess the device. A RAID must always have "/dev/md" as device</entry> -- 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] r60486 - /trunk/autoinstallation/doc/CreateProfileDetails.xml
by ug＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: ug Date: Fri Jan 22 12:55:48 2010 New Revision: 60486 URL: http://svn.opensuse.org/viewcvs/yast?rev=60486&view=rev Log: little docu fix Modified: trunk/autoinstallation/doc/CreateProfileDetails.xml Modified: trunk/autoinstallation/doc/CreateProfileDetails.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/CreateProfi… ============================================================================== --- trunk/autoinstallation/doc/CreateProfileDetails.xml (original) +++ trunk/autoinstallation/doc/CreateProfileDetails.xml Fri Jan 22 12:55:48 2010 @@ -795,7 +795,7 @@ <tbody> <row> <entry>device</entry> - <entry>the device you want to configure in this section. Since SUSE Linux 10.1 and SLES10, you can use persistent device names via id, like <emphasis>/dev/disk/by-id/edd-int13_dev80</emphasis>. With SLES10 SP1 and SUSE Linux 10.2, <emphasis>by-path</emphasis> is possible too like <emphasis>/dev/disk/by-path/pci-0001:00:03.0-scsi-0:0:0:0</emphasis>. + <entry>the device you want to configure in this section. Since SUSE Linux 10.1 and SLES10, you can use persistent device names via id, like <emphasis>/dev/disk/by-id/ata-WDC_WD3200AAKS-75L9A0_WD-WMAV27368122</emphasis>. With SLES10 SP1 and SUSE Linux 10.2, <emphasis>by-path</emphasis> is possible too like <emphasis>/dev/disk/by-path/pci-0001:00:03.0-scsi-0:0:0:0</emphasis>. <para><screen><device>/dev/hda</device></screen></para> </entry> <entry>optional. If left out, autoyast tries to guess the device. A RAID must always have "/dev/md" as device</entry> -- 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] r60485 - in /branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner: src/Makefile.am yast2-openvas-security-scanner.spec.in
by jsrain＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: jsrain Date: Fri Jan 22 12:44:03 2010 New Revision: 60485 URL: http://svn.opensuse.org/viewcvs/yast?rev=60485&view=rev Log: updates to build Modified: branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/src/Makefile.am branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/yast2-openvas-security-scanner.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/openv… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/src/Makefile.am (original) +++ branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/src/Makefile.am Fri Jan 22 12:44:03 2010 @@ -15,9 +15,7 @@ openvas-security-scanner.desktop module_DATA = \ - OpenvasSecurityScanner.ycp \ - OpenvasSecurityScanner2.pm \ - OpenvasSecurityScanner3.py + OpenvasSecurityScanner.ycp # create a symlink for local build, #145327 openvas-security-scanner: Modified: branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/yast2-openvas-security-scanner.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/openv… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/yast2-openvas-security-scanner.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/yast2-openvas-security-scanner.spec.in Fri Jan 22 12:44:03 2010 @@ -24,8 +24,7 @@ %dir @yncludedir@/openvas-security-scanner @yncludedir@/openvas-security-scanner/* @clientdir@/openvas-security-scanner.ycp -@clientdir@/openvas-security-scanner_*.ycp @moduledir@/OpenvasSecurityScanner.* -@moduledir@/OpenvasSecurityScanner2.* @desktopdir@/openvas-security-scanner.desktop +@scrconfdir@/* %doc @docdir@ -- 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] r60484 - in /trunk/wagon: package/ src/clients/ src/config/ src/include/ src/modules/
by locilka＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: locilka Date: Fri Jan 22 12:08:50 2010 New Revision: 60484 URL: http://svn.opensuse.org/viewcvs/yast?rev=60484&view=rev Log: - Wagon extended to read and use migration products from the <upgrade> section from product control files (BNC #559554). Added: trunk/wagon/src/clients/wagon_migration_products.ycp trunk/wagon/src/clients/wagon_point_of_no_return.ycp trunk/wagon/src/include/ trunk/wagon/src/include/Makefile.am trunk/wagon/src/include/common_func.ycp Modified: trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/clients/wagon.ycp trunk/wagon/src/clients/wagon_selfupdate.ycp trunk/wagon/src/config/online_migration.xml trunk/wagon/src/modules/Wagon.ycp Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Fri Jan 22 12:08:50 2010 @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jan 22 11:57:00 CET 2010 - locilka(a)suse.cz + +- Wagon extended to read and use migration products from the + <upgrade> section from product control files (BNC #559554). + ------------------------------------------------------------------ Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz Modified: trunk/wagon/src/clients/wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon.ycp?rev=… ============================================================================== --- trunk/wagon/src/clients/wagon.ycp (original) +++ trunk/wagon/src/clients/wagon.ycp Fri Jan 22 12:08:50 2010 @@ -26,6 +26,10 @@ import "CommandLine"; import "PackageLock"; import "PackageCallbacks"; + import "Report"; + import "FileUtils"; + + include "wagon/common_func.ycp"; textdomain "wagon"; @@ -137,6 +141,134 @@ } } + boolean RevertToOldProducts () { + if (Wagon::abort_can_revert_products != true) { + y2warning ("Cannot revert the previous state of products, sorry. Installed products were: %1, Migration products were: %2", + Wagon::products_before_migration, Wagon::migration_products); + + Report::Warning (_("Cannot revert the previous state of installed products. +You will have to revert them manually.")); + + return false; + } + + Wizard::SetContents ( + _("Reverting Migration"), + `Label(_("Migration tool has to remove the temporary migration products, +install the previously installed ones and contact Novell Customer Center +to get update repositories.")), + _("Several tasks can be done by the migration tool. If you skip this step, +you will have to do them manually."), + false, true + ); + Wizard::EnableAbortButton (); + + boolean cont = true; + while (true) { + any ret = UI::UserInput(); + if (ret == `next) { + cont = true; + break; + } else if (ret == `abort || ret == `cancel) { + if (Popup::AnyQuestion ( + // popup dialog caption + _("Migration Has to Be Reverted"), + // popup dialog qustion + _("Are you sure you want to skip reverting the migration?"), + // button + _("&Yes, Skip It"), + // button + _("&No"), + `focus_no + )) { + cont = false; + break; + } + } + } + + if (cont != true) { + y2warning ("User decided not to rollback"); + return false; + } + + ResetPackager(); + + // Full paths to product files + list <string> removed_product_files = []; + // Product packages + list <string> removed_packages = []; + + Wizard::SetContents ( + _("Reverting Migration"), + `Label(_("Removing temporary migration products...")), + "", + false, true + ); + + // Remove all the migration products using packages approach manually + // Removing via ResolvableRemove + PkgSolve usually produces errors, + // dependency loops etc. + // + y2milestone ("Removing newly installed products: %1", Wagon::migration_products); + foreach (string migration_product, Wagon::migration_products, { + foreach (map <string, any> remove_product, Pkg::ResolvableProperties (migration_product, `product, ""), { + remove_product = Wagon::MinimizeProductMap (remove_product); + + string product_file = remove_product["product_file"]:""; + if (product_file == nil || product_file == "") { + y2error ("Cannot remove product: %1, no product file defined", remove_product); + Report::Error (sformat(_("Cannot remove product %1"), remove_product["name"]:_("Unknown product"))); + return; + } + + if (! regexpmatch (product_file, "^/etc/products\\.d/.+")) + product_file = sformat ("/etc/products.d/%1", product_file); + + if (contains (removed_product_files, product_file)) { + y2milestone ("Product file %1 has been already removed", product_file); + return; + } + + string package_name = Wagon::GetFileOwner (product_file); + + if (package_name == nil || package_name == "") { + y2error ("Cannot find out file owner %1", product_file); + Report::Error (sformat(_("Cannot remove product %1"), remove_product["name"]:_("Unknown product"))); + return; + } + + if (Pkg::TargetRemove (package_name) != true) { + y2error ("Cannot remove package %1", package_name); + Report::Error (sformat(_("Cannot remove product %1. +Remove package %2 manually"), remove_product["name"]:_("Unknown product"), package_name)); + return; + } + + y2milestone ("Product %1/%2 has been successfully removed", remove_product, package_name); + removed_product_files = add (removed_product_files, product_file); + removed_packages = add (removed_packages, package_name); + }); + }); + + if (size (removed_packages) > 0) { + y2milestone ("%1 products were removed, reseting packager", size (removed_packages)); + ResetPackager(); + + foreach (string one_package, removed_packages, { + y2milestone ("Removed product package check: %1", Pkg::ResolvableProperties (one_package, `package, "")); + }); + } + + y2milestone ("Running registration"); + if (WFM::call ("inst_suse_register") == `abort) { + y2error ("Unable to register"); + return false; + } + + return true; + } + // main() HandleInit(); @@ -152,6 +284,12 @@ ret = ProductControl::RunFrom (current_step, false); } + // Wagon has been aborted, revert to the previous products + // if possible + if (ret == `abort || ret == `cancel) { + RevertToOldProducts(); + } + Wizard::CloseDialog(); HandleRet (ret); Added: trunk/wagon/src/clients/wagon_migration_products.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_migratio… ============================================================================== --- trunk/wagon/src/clients/wagon_migration_products.ycp (added) +++ trunk/wagon/src/clients/wagon_migration_products.ycp Fri Jan 22 12:08:50 2010 @@ -0,0 +1,127 @@ +/** + * File: + * clients/wagon_migration_products.ycp + * + * Module: + * Wagon + * + * Authors: + * Lukas Ocilka <locilka(a)suse.cz> + * + * Summary: + * Online Migration Tool + * + * $Id$ + * + */ + +{ + /** + * Selects and installs all migration products. + */ + + textdomain "wagon"; + + import "Wagon"; + import "PackagesUI"; + import "GetInstArgs"; + import "Report"; + import "Popup"; + import "Label"; + + include "wagon/common_func.ycp"; + + if (GetInstArgs::going_back()) { + y2milestone ("Going back..."); + return `back; + } + + boolean FindAndSelectMigrationProducts () { + if (Wagon::InitPkg() != true) { + Report::Error (_("Unable to initialize the package manager.")); + return false; + } + + list <map <string,any> > products = Pkg::ResolvableProperties ("", `product, ""); + + foreach (map<string, any> p, products, { + if (p["status"]:`unknown != `installed) { + y2milestone ("Product %1 (%2) is not installed, skipping...", + p["name"]:"not-defined", p["short_name"]:p["display_name"]:"not-defined"); + return; + } + + if (! haskey (p, "upgrades") || p["upgrades"]:[] == []) { + y2warning ("Product %1 (%2) does not contain 'upgrades' section...", + p["name"]:"not-defined", p["short_name"]:p["display_name"]:"not-defined"); + return; + } + + y2milestone ("Going to upgrade product %1 (%2)", + p["name"]:"not-defined", p["short_name"]:p["display_name"]:"not-defined"); + + if (p["name"]:"" == nil || p["name"]:"" == "") { + y2error ("Product %1 doesn't have a name, reverting will be impossible", p); + Report::Error (sformat(_("Product %1 does not have a machine-readable 'name'. +Automatic reverting of the product state will be impossible."), p["short_name"]:p["display_name"]:"not-defined")); + } + + foreach (map <string, any> supported_upgrade, (list <map <string, any> >) p["upgrades"]:[], { + if (! haskey (supported_upgrade, "product") || supported_upgrade["product"]:"" == "") { + y2error ("Erroneous product upgrades: %1 (%2)", p, supported_upgrade); + Report::Error (sformat (_("Cannot upgrade product %1 (%2). +Migration path is erroneous."), p["display_name"]:p["short_name"]:_("Unknown"), p["name"]:_("not-defined"))); + return; + } + + string old_product = p["name"]:""; + string migration_product = supported_upgrade["product"]:""; + + // Install the migration product + if ((size (Pkg::ResolvableProperties (migration_product, `product, "")) == 0) || (Pkg::ResolvableInstall (migration_product, `product) != true)) { + y2error ("Cannot select migration product for installation: %1", Pkg::ResolvableProperties (migration_product, `product, "")); + Report::Error (sformat (_("Cannot select product +%1 (%2) for installation."), supported_upgrade["name"]:"", migration_product)); + return; + } else { + Wagon::migration_products = add (Wagon::migration_products, migration_product); + } + +// Old products are removed automatically during the upgrade +// // Remove the old product +// if ((Pkg::ResolvableInstalled (old_product, `product) != true) || (Pkg::ResolvableRemove (migration_product, `product) == true)) { +// Report::Error (sformat (_("Cannot select product %1 for deinstallation."), migration_product)); +// return; +// } + }); + }); + + return true; + } + + if (FindAndSelectMigrationProducts() != true) { + return `auto; + } + + symbol ret = SolveDependencies(); + + if (ret != `abort) { + // Solver ends with some resolvables changed + if (Pkg::IsAnyResolvable (`any, `to_install) == true || Pkg::IsAnyResolvable (`any, `to_remove) == true) { + y2milestone ("Installing packages..."); + // Everybody hold your breath 'cause we're gonna be sinkin' soon + any inst_ret = WFM::call ("inst_rpmcopy"); + y2milestone ("Package installation returned: %1", inst_ret); + ret = `auto; + } else { + y2milestone ("Nothing to install/remove"); + ret = `auto; + } + } + + ResetPackager(); + + y2milestone ("Returning: %1", ret); + + return ret; +} Added: trunk/wagon/src/clients/wagon_point_of_no_return.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_point_of… ============================================================================== --- trunk/wagon/src/clients/wagon_point_of_no_return.ycp (added) +++ trunk/wagon/src/clients/wagon_point_of_no_return.ycp Fri Jan 22 12:08:50 2010 @@ -0,0 +1,39 @@ +/** + * File: + * clients/wagon_custom_url.ycp + * + * Module: + * Wagon + * + * Authors: + * Lukas Ocilka <locilka(a)suse.cz> + * + * Summary: + * Online Migration Tool + * + * $Id$ + * + */ + +{ + textdomain "wagon"; + + import "GetInstArgs"; + import "Wagon"; + + if (GetInstArgs::going_back()) { + y2milestone ("Going back..."); + return `back; + } + + /** + * Point of no return. After this call, YaST will start removing + * and installing packages. In other words, the real migration + * will start. + */ + + y2warning ("From this point, wagon cannot revert products anymore!"); + Wagon::abort_can_revert_products = false; + + return `auto; +} Modified: trunk/wagon/src/clients/wagon_selfupdate.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_selfupda… ============================================================================== --- trunk/wagon/src/clients/wagon_selfupdate.ycp (original) +++ trunk/wagon/src/clients/wagon_selfupdate.ycp Fri Jan 22 12:08:50 2010 @@ -28,20 +28,15 @@ import "Popup"; import "Label"; import "PackagesUI"; + import "Report"; + + include "wagon/common_func.ycp"; if (GetInstArgs::going_back()) { y2milestone ("Going back..."); return `back; } - boolean SolverRunWithFeedback () { - UI::OpenDialog (`Label (_("Solving the package dependencies..."))); - boolean ret = Pkg::PkgSolve (false); - UI::CloseDialog(); - - return ret; - } - /** * Tries to upgrade packages got as parameter. * @@ -140,11 +135,50 @@ return pkgs_affected; } + integer UpdateInstalledProducts () { + integer affected_products = 0; + + list <map <string,any> > products = Pkg::ResolvableProperties ("", `product, ""); + + foreach (map<string, any> p, products, { + // Product is not installed + if (p["status"]:`unknown != `installed) return; + + // Make the logs readable + p["license"] = "..."; + p["description"] = "..."; + + string product_name = p["name"]:""; + string product_version = p["version"]:""; + + if (product_name == nil || product_name == "") { + y2error ("Cannot distinguish product name: %1", product_name); + return; + } + + // Product version is the same but release can be different + // product map doesn't contain the release string. To be sure, product will be reinstalled + y2milestone ("Upgrading product %1 version %2", product_name, product_version); + // The version is the same, release can be different + if (Pkg::ResolvableInstall (product_name, `product) != true) { + Report::Error (sformat(_("Cannot update installed product %1."), product_name)); + return; + } + + affected_products = affected_products + 1; + }); + + return affected_products; + } + Wagon::InitPkg(); list <map <string, any> > products = Pkg::ResolvableProperties ("", `product, ""); y2milestone ("All known products: %1", products); + Wagon::ReadProductsBeforeMigration(); + Wagon::StoreProductsBeforeMigration(); + symbol ret = `auto; // Patches need solver run @@ -168,71 +202,21 @@ } } + integer products_selected_for_update = UpdateInstalledProducts(); + if (products_selected_for_update > 0) { + y2milestone ("%1 products were selected for update", products_selected_for_update); + selected = products_selected_for_update; + } + y2milestone ("Selected resolvables: %1", selected); if (selected < 1) { y2milestone ("Neither patches nor packages for self-update have been selected"); return ret; } - boolean solved = nil; - - while (solved != true) { - // Trying to solve automatically - solved = SolverRunWithFeedback(); - symbol ret_sel = nil; - - // PkgSolve didn't report any problem - if (solved) { - y2milestone ("Solved automatically"); - // FIXME: inform user? - ret = `restart_same_step; - // There are some issues in selecting the patches - } else { - y2milestone ("Cannot be solved automatically"); - while (true) { - // Try to solve them manually - ret_sel = PackagesUI::RunPackageSelector ($["mode":`summaryMode]); - - // Cannot or don't want to accept the proposal - if (ret_sel == `cancel) { - // Confirmed - if (Popup::AnyQuestion ( - // TRANSLATORS: headline - _("Aborting the Upgrade"), - // TRANSLATORS: pop-up question - _("Cannot continue without installing the required patches. -Are sure you want to abort the upgrade process?"), - _("Abort Upgrade"), - Label::NoButton(), - `yes_button - )) { - ret = `abort; - break; - // Try again - } else { - continue; - } - // Solved manually - } else if (ret_sel == `accept) { - solved = true; - break; - } - } - } - - if (ret == `abort) { - solved = nil; - y2warning ("Aborting..."); - break; - } - - if (! Wagon::AcceptLicenses()) { - y2warning ("Some license(s) have been rejected, running solver again"); - solved = nil; - } - } + ret = SolveDependencies(); - if (solved == true) { + if (ret != `abort) { // Solver ends with some resolvables changed if (Pkg::IsAnyResolvable (`any, `to_install) == true || Pkg::IsAnyResolvable (`any, `to_remove) == true) { y2milestone ("Calling update..."); Modified: trunk/wagon/src/config/online_migration.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/config/online_migratio… ============================================================================== --- trunk/wagon/src/config/online_migration.xml (original) +++ trunk/wagon/src/config/online_migration.xml Fri Jan 22 12:08:50 2010 @@ -29,8 +29,10 @@ <modules config:type="list"> <module>welcome</module> <module>update_online_mechanism</module> + <module>install_migration_products</module> <module>suse_register_workflow</module> <module>prepare_progress</module> + <module>point_of_no_return</module> <module>wagon_kickoff</module> <module>wagon_rpmcopy</module> <module>suseconfig_after_update</module> @@ -52,12 +54,14 @@ <modules config:type="list"> <module>welcome</module> <module>update_online_mechanism</module> + <module>install_migration_products</module>  <module>update_url_dialog</module> <module>suse_register_workflow</module> <module>wagon_custom_url</module> <module>wagon_selfupdate_from_url</module> <module>prepare_progress</module> + <module>point_of_no_return</module> <module>wagon_kickoff</module> <module>wagon_rpmcopy</module> <module>suseconfig_after_update</module> @@ -77,10 +81,12 @@ <modules config:type="list"> <module>welcome</module> <module>update_online_mechanism</module> + <module>install_migration_products</module>  <module>update_url_dialog</module> <module>suse_register_workflow</module> <module>prepare_progress</module> + <module>point_of_no_return</module> <module>wagon_kickoff</module> <module>wagon_rpmcopy</module> <module>suseconfig_after_update</module> @@ -100,11 +106,13 @@ <modules config:type="list"> <module>welcome</module> <module>update_online_mechanism</module> + <module>install_migration_products</module>  <module>update_url_dialog</module> <module>wagon_custom_url</module> <module>wagon_selfupdate_from_url</module> <module>prepare_progress</module> + <module>point_of_no_return</module> <module>wagon_kickoff</module> <module>wagon_rpmcopy</module> <module>suseconfig_after_update</module> @@ -126,6 +134,7 @@ <module>wagon_custom_url</module> <module>wagon_selfupdate_from_url</module> <module>prepare_progress</module> + <module>point_of_no_return</module> <module>wagon_kickoff</module> <module>wagon_rpmcopy</module> <module>suseconfig_after_update</module> @@ -199,16 +208,22 @@ <enable_back>no</enable_back> </module> -  +  <module> <label>Renew Update Stack</label> <name>update_online_mechanism</name> <execute>wagon_selfupdate</execute> </module> +  + <module> + <label>Migration Configuration</label> + <name>install_migration_products</name> + <execute>wagon_migration_products</execute> + </module> +  <module> - <label>Renew Update Stack</label> <name>update_url_dialog</name> <execute>wagon_update_url</execute> </module> @@ -219,7 +234,6 @@ (*) Offered in wagon_update_url if not running via applet --> <module> - <label>Renew Update Stack</label> <name>suse_register_workflow</name> <execute>inst_suse_register</execute> </module> @@ -229,7 +243,6 @@ (*) Offered in wagon_update_url if not running via applet --> <module> - <label>Renew Update Stack</label> <name>wagon_custom_url</name> <execute>wagon_custom_url</execute> </module> @@ -239,7 +252,6 @@ Follows the wagon_ownurl --> <module> - <label>Renew Update Stack</label> <name>wagon_selfupdate_from_url</name> <execute>wagon_selfupdate</execute> </module> @@ -266,6 +278,12 @@ <execute>inst_prepareprogress</execute> </module> +  + <module> + <name>point_of_no_return</name> + <execute>wagon_point_of_no_return</execute> + </module> + <module> <name>wagon_kickoff</name> <execute>inst_kickoff</execute> Added: trunk/wagon/src/include/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/include/Makefile.am?re… ============================================================================== --- trunk/wagon/src/include/Makefile.am (added) +++ trunk/wagon/src/include/Makefile.am Fri Jan 22 12:08:50 2010 @@ -0,0 +1,13 @@ +# +# Makefile.am for wagon/src/include +# + +yncludedir = @yncludedir@/wagon + +ynclude_DATA = $(wildcard *.ycp) + +YCPCFLAGS = -M ../modules + +EXTRA_DIST = $(ynclude_DATA) + +include $(top_srcdir)/Makefile.am.common Added: trunk/wagon/src/include/common_func.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/include/common_func.yc… ============================================================================== --- trunk/wagon/src/include/common_func.ycp (added) +++ trunk/wagon/src/include/common_func.ycp Fri Jan 22 12:08:50 2010 @@ -0,0 +1,128 @@ +/** + * File: + * include/wagon/common_func.ycp + * + * Module: + * Wagon + * + * Authors: + * Lukas Ocilka <locilka(a)suse.cz> + * + * Summary: + * Online Migration Tool + * + * $Id$ + * + */ + +{ + textdomain "wagon"; + + import "Label"; + import "Popup"; + import "PackagesUI"; + import "Wagon"; + import "Wizard"; + + boolean SolverRunWithFeedback () { + UI::OpenDialog (`Label (_("Solving the package dependencies..."))); + boolean ret = Pkg::PkgSolve (true); + UI::CloseDialog(); + + return ret; + } + + symbol SolveDependencies () { + symbol ret = `auto; + + boolean solved = nil; + + while (solved != true) { + // Trying to solve automatically + solved = SolverRunWithFeedback(); + symbol ret_sel = nil; + + // PkgSolve didn't report any problem + if (solved == true) { + y2milestone ("Solved automatically"); + ret = `auto; + // There are some issues in selecting the patches + } else { + y2milestone ("Cannot be solved automatically"); + while (true) { + // Try to solve them manually + ret_sel = PackagesUI::RunPackageSelector ($["mode":`summaryMode]); + + // Cannot or don't want to accept the proposal + if (ret_sel == `cancel) { + // Confirmed + if (Popup::AnyQuestion ( + // TRANSLATORS: headline + _("Aborting the Upgrade"), + // TRANSLATORS: pop-up question + _("Cannot continue without installing the required patches. +Are sure you want to abort the upgrade process?"), + _("Abort Upgrade"), + Label::NoButton(), + `yes_button + )) { + ret = `abort; + break; + // Try again + } else { + continue; + } + // Solved manually + } else if (ret_sel == `accept) { + ret = `auto; + solved = true; + break; + } + } + } + + if (ret == `abort) { + solved = nil; + y2warning ("Aborting..."); + break; + } + + if (! Wagon::AcceptLicenses()) { + y2warning ("Some license(s) have been rejected, running solver again"); + solved = nil; + } + } + + return ret; + } + + void ResetPackager () { + Wizard::SetContents ( + _("Reseting Package Manager"), + `Label(_("Reseting package manager...")), + "", + false, true + ); + + y2milestone ("Reseting Pkg"); + Pkg::PkgApplReset(); + Pkg::PkgReset(); + + symbol status = nil; + string name = nil; + + y2milestone ("Neutralizing all resolvables"); + foreach (symbol resolvable, [`pattern, `patch, `package, `product, `scrpackage], { + Pkg::ResolvableNeutral ("" /* all */, resolvable, true /* force */); + }); + + y2milestone ("Running solver"); + Pkg::PkgSolve (true); + + Pkg::TargetFinish(); + Pkg::SourceFinishAll(); + + Wagon::InitPkg(); + Pkg::PkgSolve (true); + } +} Modified: trunk/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/modules/Wagon.ycp?rev=… ============================================================================== --- trunk/wagon/src/modules/Wagon.ycp (original) +++ trunk/wagon/src/modules/Wagon.ycp Fri Jan 22 12:08:50 2010 @@ -29,11 +29,23 @@ import "Report"; import "ProductFeatures"; import "Update"; + import "FileUtils"; + import "String"; boolean running_by_applet = false; string update_workflow_type = "manual"; + // Products installed for the time of the migration + global list <string> migration_products = []; + + // Products installed before the migration + global list <map <string, string> > products_before_migration = []; + + // When aborting before the real migration starts, we can still + // revert to the old products + global boolean abort_can_revert_products = true; + global void SetUpdateWorkflow (string new_update_workflow_type) { // FIXME: check @@ -275,17 +287,192 @@ return true; } + global map <string,any> MinimizeProductMap (map <string,any> product) { + if (haskey (product, "license")) product["license"] = "..."; + if (haskey (product, "description")) product["description"] = "..."; + + return product; + } + + string GetDisplayName (string display_name, string name) { + if (display_name == name) + return display_name; + + // 'Product Long Name (product-libzypp-name)' + return sformat (_("%1 (%2)"), display_name, name); + } + + string GetDistributionUpgradeSummary () { + string ret = ""; + + list <map <string,any> > products = sort ( + map <string,any> x, map <string,any> y, Pkg::ResolvableProperties ("", `product, ""), + ``(x["display_name"]:x["short_name"]:x["name"]:"a" < y["display_name"]:x["short_name"]:x["name"]:"b") + ); + + // migration_products contains list of temporary products for migration process + + y2milestone ("All known migration products: %1", migration_products); + + string display_name = nil; + string name = nil; + + // list of all products that will be installed (are selected) + list <string> products_to_be_installed = []; + foreach (map <string,any> product, products, { + if (product["status"]:`unknown != `selected) return; + name = product["name"]:_("No short name defined"); + products_to_be_installed = add (products_to_be_installed, name); + }); + + // list of all products that will be upgraded + list <string> products_to_be_upgraded = []; + + // Products that are going to be removed + foreach (map <string,any> product, products, { + if (product["status"]:`unknown != `removed) return; + + product = MinimizeProductMap (product); + display_name = product["display_name"]:product["short_name"]:product["name"]:_("No name defined"); + name = product["name"]:_("No short name defined"); + + // Removing product and installing the same one (name) means -> upgrade + if (contains (products_to_be_installed, name)) { + products_to_be_upgraded = add (products_to_be_upgraded, name); + y2milestone ("Product to be upgraded: %1 (this is the removed one)", product); + // Do not list this product as 'to removed', list it as 'to upgrade' + return; + } + + // Removing a migration product is fine + if (contains (migration_products, product["name"]:"")) { + y2milestone ("Migration product will be removed: %1", product); + ret = ret + "<li>" + sformat ( + _("Temporary migration product %1 will be removed"), + GetDisplayName (display_name, name) + ) + "</li>\n"; + // Removing another product might be an issue + } else { + y2warning ("Product will be removed: %1", product); + ret = ret + "<li>" + sformat ( + _("Warning: Product %1 will be removed"), + GetDisplayName (display_name, name) + ) + "</li>\n"; + } + }); + + // Products that are going to be installed (new ones) or upgraded + foreach (map <string,any> product, products, { + if (product["status"]:`unknown != `selected) return; + + product = MinimizeProductMap (product); + display_name = product["display_name"]:product["short_name"]:product["name"]:_("No name defined"); + name = product["name"]:_("No short name defined"); + + // Product is going to be upgraded (removed + installed new version) + if (contains (products_to_be_upgraded, name)) { + y2milestone ("Product will be upgraded to: %1 (this is the installed one)", product); + ret = ret + "<li>" + sformat ( + _("Product %1 will be upgraded"), + GetDisplayName (display_name, name) + ) + "</li>\n"; + // Newly installed product + } else { + y2milestone ("Product will be upgraded: %1", product); + ret = ret + "<li>" + sformat ( + _("New product %1 will be installed"), + GetDisplayName (display_name, name) + ) + "</li>\n"; + } + }); + + // Products that will keep installed (unchanged) + foreach (map <string,any> product, products, { + if (product["status"]:`unknown != `installed) return; + + product = MinimizeProductMap (product); + display_name = product["display_name"]:product["short_name"]:product["name"]:_("No name defined"); + name = product["name"]:_("No short name defined"); + + y2milestone ("Product will keep: %1", product); + ret = ret + "<li>" + sformat ( + _("Product %1 will keep installed"), + GetDisplayName (display_name, name) + ) + "</li>\n"; + }); + + return "<ul>\n" + ret + "</ul>\n"; + } + global map <string, any> ProposalSummary () { map <string, any> ret = $[]; - // FIXME: create a useful summary ret = $[ - "preformatted_proposal" : "<ul><li>" + _("Distribution Upgrade") + "</li></ul>", - "help" : _("FIXME"), + "preformatted_proposal" : GetDistributionUpgradeSummary(), + // help text + "help" : _("To change update settings go to Software Proposal section."), ]; return ret; } + global list <map <string, string> > ReadProductsBeforeMigration () { + list <map <string, any> > products = Pkg::ResolvableProperties ("", `product, ""); + y2milestone ("All known products: %1", products); + + foreach (map<string, any> p, products, { + if (p["status"]:`unknown != `installed) + return; + + // Remember the 'old' product just for the case of reverting + products_before_migration = add ( + products_before_migration, + $["name" : p["name"]:"", "version" : p["version"]:""] + ); + }); + + return products_before_migration; + } + + // YaST can be restarted but some data have to be kept + string migration_products_store_file = sformat ("%1/wagon_products_before_migration", Directory::vardir); + + global boolean StoreProductsBeforeMigration () { + return (boolean) SCR::Write (.target.ycp, migration_products_store_file, products_before_migration); + } + + global boolean RestoreProductsBeforeMigration () { + products_before_migration = (list <map <string, string> >) SCR::Read (.target.ycp, migration_products_store_file); + + if (products_before_migration == nil) { + products_before_migration = []; + Report::Error (_("Error restoring the list of previously installed products.")); + return false; + } + + return true; + } + + global string GetFileOwner (string file) { + if (file == nil || file == "") { + y2error ("File not provided"); + return nil; + } + + if (! FileUtils::Exists (file)) { + y2error ("File %1 doesn't exist", file); + return nil; + } + + string command = sformat ("rpm -qf '%1'", String::Quote (file)) + " --queryformat \"%{NAME}\""; + map <string, any> cmd = (map <string, any>) SCR::Execute (.target.bash_output, command); + if (cmd["exit"]:-1 != 0) { + y2error ("Cannot get file owner %1: %2", command, cmd); + return nil; + } + + return (string) splitstring (cmd["stdout"]:"", "\n")[0]:nil; + } + /* EOF */ } -- 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] r60483 - /branches/SuSE-Code-11-Branch/openvas-security-scanner/
by openvasfelix＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: openvasfelix Date: Fri Jan 22 12:08:49 2010 New Revision: 60483 URL: http://svn.opensuse.org/viewcvs/yast?rev=60483&view=rev Log: Removing OpenVAS Security Scanner from SuSE-Code-11-Branch (has been moved to the SP1 branch). Removed: branches/SuSE-Code-11-Branch/openvas-security-scanner/ -- 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] r60482 - in /branches/SuSE-Code-11-SP1-Branch/wagon: ./ package/ src/ src/clients/ src/config/ src/modules/
by locilka＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: locilka Date: Fri Jan 22 12:08:23 2010 New Revision: 60482 URL: http://svn.opensuse.org/viewcvs/yast?rev=60482&view=rev Log: - Wagon extended to read and use migration products from the <upgrade> section from product control files (BNC #559554). - 2.17.9 Added: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_migration_products.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_point_of_no_return.ycp Modified: branches/SuSE-Code-11-SP1-Branch/wagon/VERSION branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP1-Branch/wagon/src/Makefile.am branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_selfupdate.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/VERSION Fri Jan 22 12:08:23 2010 @@ -1 +1 @@ -2.17.8 +2.17.9 Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes Fri Jan 22 12:08:23 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jan 22 11:57:00 CET 2010 - locilka(a)suse.cz + +- Wagon extended to read and use migration products from the + <upgrade> section from product control files (BNC #559554). +- 2.17.9 + +------------------------------------------------------------------- Mon Feb 9 10:10:05 CET 2009 - locilka(a)suse.cz - Added new wagon_congratulate client - an envelope that loads the Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/Makefile.am (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/Makefile.am Fri Jan 22 12:08:23 2010 @@ -2,5 +2,5 @@ # Makefile.am for wagon/src # -SUBDIRS = modules clients config +SUBDIRS = modules include clients config Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon.ycp Fri Jan 22 12:08:23 2010 @@ -26,6 +26,10 @@ import "CommandLine"; import "PackageLock"; import "PackageCallbacks"; + import "Report"; + import "FileUtils"; + + include "wagon/common_func.ycp"; textdomain "wagon"; @@ -137,6 +141,134 @@ } } + boolean RevertToOldProducts () { + if (Wagon::abort_can_revert_products != true) { + y2warning ("Cannot revert the previous state of products, sorry. Installed products were: %1, Migration products were: %2", + Wagon::products_before_migration, Wagon::migration_products); + + Report::Warning (_("Cannot revert the previous state of installed products. +You will have to revert them manually.")); + + return false; + } + + Wizard::SetContents ( + _("Reverting Migration"), + `Label(_("Migration tool has to remove the temporary migration products, +install the previously installed ones and contact Novell Customer Center +to get update repositories.")), + _("Several tasks can be done by the migration tool. If you skip this step, +you will have to do them manually."), + false, true + ); + Wizard::EnableAbortButton (); + + boolean cont = true; + while (true) { + any ret = UI::UserInput(); + if (ret == `next) { + cont = true; + break; + } else if (ret == `abort || ret == `cancel) { + if (Popup::AnyQuestion ( + // popup dialog caption + _("Migration Has to Be Reverted"), + // popup dialog qustion + _("Are you sure you want to skip reverting the migration?"), + // button + _("&Yes, Skip It"), + // button + _("&No"), + `focus_no + )) { + cont = false; + break; + } + } + } + + if (cont != true) { + y2warning ("User decided not to rollback"); + return false; + } + + ResetPackager(); + + // Full paths to product files + list <string> removed_product_files = []; + // Product packages + list <string> removed_packages = []; + + Wizard::SetContents ( + _("Reverting Migration"), + `Label(_("Removing temporary migration products...")), + "", + false, true + ); + + // Remove all the migration products using packages approach manually + // Removing via ResolvableRemove + PkgSolve usually produces errors, + // dependency loops etc. + // + y2milestone ("Removing newly installed products: %1", Wagon::migration_products); + foreach (string migration_product, Wagon::migration_products, { + foreach (map <string, any> remove_product, Pkg::ResolvableProperties (migration_product, `product, ""), { + remove_product = Wagon::MinimizeProductMap (remove_product); + + string product_file = remove_product["product_file"]:""; + if (product_file == nil || product_file == "") { + y2error ("Cannot remove product: %1, no product file defined", remove_product); + Report::Error (sformat(_("Cannot remove product %1"), remove_product["name"]:_("Unknown product"))); + return; + } + + if (! regexpmatch (product_file, "^/etc/products\\.d/.+")) + product_file = sformat ("/etc/products.d/%1", product_file); + + if (contains (removed_product_files, product_file)) { + y2milestone ("Product file %1 has been already removed", product_file); + return; + } + + string package_name = Wagon::GetFileOwner (product_file); + + if (package_name == nil || package_name == "") { + y2error ("Cannot find out file owner %1", product_file); + Report::Error (sformat(_("Cannot remove product %1"), remove_product["name"]:_("Unknown product"))); + return; + } + + if (Pkg::TargetRemove (package_name) != true) { + y2error ("Cannot remove package %1", package_name); + Report::Error (sformat(_("Cannot remove product %1. +Remove package %2 manually"), remove_product["name"]:_("Unknown product"), package_name)); + return; + } + + y2milestone ("Product %1/%2 has been successfully removed", remove_product, package_name); + removed_product_files = add (removed_product_files, product_file); + removed_packages = add (removed_packages, package_name); + }); + }); + + if (size (removed_packages) > 0) { + y2milestone ("%1 products were removed, reseting packager", size (removed_packages)); + ResetPackager(); + + foreach (string one_package, removed_packages, { + y2milestone ("Removed product package check: %1", Pkg::ResolvableProperties (one_package, `package, "")); + }); + } + + y2milestone ("Running registration"); + if (WFM::call ("inst_suse_register") == `abort) { + y2error ("Unable to register"); + return false; + } + + return true; + } + // main() HandleInit(); @@ -152,6 +284,12 @@ ret = ProductControl::RunFrom (current_step, false); } + // Wagon has been aborted, revert to the previous products + // if possible + if (ret == `abort || ret == `cancel) { + RevertToOldProducts(); + } + Wizard::CloseDialog(); HandleRet (ret); Added: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_migration_products.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_migration_products.ycp (added) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_migration_products.ycp Fri Jan 22 12:08:23 2010 @@ -0,0 +1,127 @@ +/** + * File: + * clients/wagon_migration_products.ycp + * + * Module: + * Wagon + * + * Authors: + * Lukas Ocilka <locilka(a)suse.cz> + * + * Summary: + * Online Migration Tool + * + * $Id$ + * + */ + +{ + /** + * Selects and installs all migration products. + */ + + textdomain "wagon"; + + import "Wagon"; + import "PackagesUI"; + import "GetInstArgs"; + import "Report"; + import "Popup"; + import "Label"; + + include "wagon/common_func.ycp"; + + if (GetInstArgs::going_back()) { + y2milestone ("Going back..."); + return `back; + } + + boolean FindAndSelectMigrationProducts () { + if (Wagon::InitPkg() != true) { + Report::Error (_("Unable to initialize the package manager.")); + return false; + } + + list <map <string,any> > products = Pkg::ResolvableProperties ("", `product, ""); + + foreach (map<string, any> p, products, { + if (p["status"]:`unknown != `installed) { + y2milestone ("Product %1 (%2) is not installed, skipping...", + p["name"]:"not-defined", p["short_name"]:p["display_name"]:"not-defined"); + return; + } + + if (! haskey (p, "upgrades") || p["upgrades"]:[] == []) { + y2warning ("Product %1 (%2) does not contain 'upgrades' section...", + p["name"]:"not-defined", p["short_name"]:p["display_name"]:"not-defined"); + return; + } + + y2milestone ("Going to upgrade product %1 (%2)", + p["name"]:"not-defined", p["short_name"]:p["display_name"]:"not-defined"); + + if (p["name"]:"" == nil || p["name"]:"" == "") { + y2error ("Product %1 doesn't have a name, reverting will be impossible", p); + Report::Error (sformat(_("Product %1 does not have a machine-readable 'name'. +Automatic reverting of the product state will be impossible."), p["short_name"]:p["display_name"]:"not-defined")); + } + + foreach (map <string, any> supported_upgrade, (list <map <string, any> >) p["upgrades"]:[], { + if (! haskey (supported_upgrade, "product") || supported_upgrade["product"]:"" == "") { + y2error ("Erroneous product upgrades: %1 (%2)", p, supported_upgrade); + Report::Error (sformat (_("Cannot upgrade product %1 (%2). +Migration path is erroneous."), p["display_name"]:p["short_name"]:_("Unknown"), p["name"]:_("not-defined"))); + return; + } + + string old_product = p["name"]:""; + string migration_product = supported_upgrade["product"]:""; + + // Install the migration product + if ((size (Pkg::ResolvableProperties (migration_product, `product, "")) == 0) || (Pkg::ResolvableInstall (migration_product, `product) != true)) { + y2error ("Cannot select migration product for installation: %1", Pkg::ResolvableProperties (migration_product, `product, "")); + Report::Error (sformat (_("Cannot select product +%1 (%2) for installation."), supported_upgrade["name"]:"", migration_product)); + return; + } else { + Wagon::migration_products = add (Wagon::migration_products, migration_product); + } + +// Old products are removed automatically during the upgrade +// // Remove the old product +// if ((Pkg::ResolvableInstalled (old_product, `product) != true) || (Pkg::ResolvableRemove (migration_product, `product) == true)) { +// Report::Error (sformat (_("Cannot select product %1 for deinstallation."), migration_product)); +// return; +// } + }); + }); + + return true; + } + + if (FindAndSelectMigrationProducts() != true) { + return `auto; + } + + symbol ret = SolveDependencies(); + + if (ret != `abort) { + // Solver ends with some resolvables changed + if (Pkg::IsAnyResolvable (`any, `to_install) == true || Pkg::IsAnyResolvable (`any, `to_remove) == true) { + y2milestone ("Installing packages..."); + // Everybody hold your breath 'cause we're gonna be sinkin' soon + any inst_ret = WFM::call ("inst_rpmcopy"); + y2milestone ("Package installation returned: %1", inst_ret); + ret = `auto; + } else { + y2milestone ("Nothing to install/remove"); + ret = `auto; + } + } + + ResetPackager(); + + y2milestone ("Returning: %1", ret); + + return ret; +} Added: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_point_of_no_return.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_point_of_no_return.ycp (added) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_point_of_no_return.ycp Fri Jan 22 12:08:23 2010 @@ -0,0 +1,39 @@ +/** + * File: + * clients/wagon_custom_url.ycp + * + * Module: + * Wagon + * + * Authors: + * Lukas Ocilka <locilka(a)suse.cz> + * + * Summary: + * Online Migration Tool + * + * $Id$ + * + */ + +{ + textdomain "wagon"; + + import "GetInstArgs"; + import "Wagon"; + + if (GetInstArgs::going_back()) { + y2milestone ("Going back..."); + return `back; + } + + /** + * Point of no return. After this call, YaST will start removing + * and installing packages. In other words, the real migration + * will start. + */ + + y2warning ("From this point, wagon cannot revert products anymore!"); + Wagon::abort_can_revert_products = false; + + return `auto; +} Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_selfupdate.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_selfupdate.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_selfupdate.ycp Fri Jan 22 12:08:23 2010 @@ -28,20 +28,15 @@ import "Popup"; import "Label"; import "PackagesUI"; + import "Report"; + + include "wagon/common_func.ycp"; if (GetInstArgs::going_back()) { y2milestone ("Going back..."); return `back; } - boolean SolverRunWithFeedback () { - UI::OpenDialog (`Label (_("Solving the package dependencies..."))); - boolean ret = Pkg::PkgSolve (false); - UI::CloseDialog(); - - return ret; - } - /** * Tries to upgrade packages got as parameter. * @@ -140,11 +135,50 @@ return pkgs_affected; } + integer UpdateInstalledProducts () { + integer affected_products = 0; + + list <map <string,any> > products = Pkg::ResolvableProperties ("", `product, ""); + + foreach (map<string, any> p, products, { + // Product is not installed + if (p["status"]:`unknown != `installed) return; + + // Make the logs readable + p["license"] = "..."; + p["description"] = "..."; + + string product_name = p["name"]:""; + string product_version = p["version"]:""; + + if (product_name == nil || product_name == "") { + y2error ("Cannot distinguish product name: %1", product_name); + return; + } + + // Product version is the same but release can be different + // product map doesn't contain the release string. To be sure, product will be reinstalled + y2milestone ("Upgrading product %1 version %2", product_name, product_version); + // The version is the same, release can be different + if (Pkg::ResolvableInstall (product_name, `product) != true) { + Report::Error (sformat(_("Cannot update installed product %1."), product_name)); + return; + } + + affected_products = affected_products + 1; + }); + + return affected_products; + } + Wagon::InitPkg(); list <map <string, any> > products = Pkg::ResolvableProperties ("", `product, ""); y2milestone ("All known products: %1", products); + Wagon::ReadProductsBeforeMigration(); + Wagon::StoreProductsBeforeMigration(); + symbol ret = `auto; // Patches need solver run @@ -168,71 +202,21 @@ } } + integer products_selected_for_update = UpdateInstalledProducts(); + if (products_selected_for_update > 0) { + y2milestone ("%1 products were selected for update", products_selected_for_update); + selected = products_selected_for_update; + } + y2milestone ("Selected resolvables: %1", selected); if (selected < 1) { y2milestone ("Neither patches nor packages for self-update have been selected"); return ret; } - boolean solved = nil; - - while (solved != true) { - // Trying to solve automatically - solved = SolverRunWithFeedback(); - symbol ret_sel = nil; - - // PkgSolve didn't report any problem - if (solved) { - y2milestone ("Solved automatically"); - // FIXME: inform user? - ret = `restart_same_step; - // There are some issues in selecting the patches - } else { - y2milestone ("Cannot be solved automatically"); - while (true) { - // Try to solve them manually - ret_sel = PackagesUI::RunPackageSelector ($["mode":`summaryMode]); - - // Cannot or don't want to accept the proposal - if (ret_sel == `cancel) { - // Confirmed - if (Popup::AnyQuestion ( - // TRANSLATORS: headline - _("Aborting the Upgrade"), - // TRANSLATORS: pop-up question - _("Cannot continue without installing the required patches. -Are sure you want to abort the upgrade process?"), - _("Abort Upgrade"), - Label::NoButton(), - `yes_button - )) { - ret = `abort; - break; - // Try again - } else { - continue; - } - // Solved manually - } else if (ret_sel == `accept) { - solved = true; - break; - } - } - } - - if (ret == `abort) { - solved = nil; - y2warning ("Aborting..."); - break; - } - - if (! Wagon::AcceptLicenses()) { - y2warning ("Some license(s) have been rejected, running solver again"); - solved = nil; - } - } + ret = SolveDependencies(); - if (solved == true) { + if (ret != `abort) { // Solver ends with some resolvables changed if (Pkg::IsAnyResolvable (`any, `to_install) == true || Pkg::IsAnyResolvable (`any, `to_remove) == true) { y2milestone ("Calling update..."); Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml Fri Jan 22 12:08:23 2010 @@ -29,8 +29,10 @@ <modules config:type="list"> <module>welcome</module> <module>update_online_mechanism</module> + <module>install_migration_products</module> <module>suse_register_workflow</module> <module>prepare_progress</module> + <module>point_of_no_return</module> <module>wagon_kickoff</module> <module>wagon_rpmcopy</module> <module>suseconfig_after_update</module> @@ -52,12 +54,14 @@ <modules config:type="list"> <module>welcome</module> <module>update_online_mechanism</module> + <module>install_migration_products</module>  <module>update_url_dialog</module> <module>suse_register_workflow</module> <module>wagon_custom_url</module> <module>wagon_selfupdate_from_url</module> <module>prepare_progress</module> + <module>point_of_no_return</module> <module>wagon_kickoff</module> <module>wagon_rpmcopy</module> <module>suseconfig_after_update</module> @@ -77,10 +81,12 @@ <modules config:type="list"> <module>welcome</module> <module>update_online_mechanism</module> + <module>install_migration_products</module>  <module>update_url_dialog</module> <module>suse_register_workflow</module> <module>prepare_progress</module> + <module>point_of_no_return</module> <module>wagon_kickoff</module> <module>wagon_rpmcopy</module> <module>suseconfig_after_update</module> @@ -100,11 +106,13 @@ <modules config:type="list"> <module>welcome</module> <module>update_online_mechanism</module> + <module>install_migration_products</module>  <module>update_url_dialog</module> <module>wagon_custom_url</module> <module>wagon_selfupdate_from_url</module> <module>prepare_progress</module> + <module>point_of_no_return</module> <module>wagon_kickoff</module> <module>wagon_rpmcopy</module> <module>suseconfig_after_update</module> @@ -126,6 +134,7 @@ <module>wagon_custom_url</module> <module>wagon_selfupdate_from_url</module> <module>prepare_progress</module> + <module>point_of_no_return</module> <module>wagon_kickoff</module> <module>wagon_rpmcopy</module> <module>suseconfig_after_update</module> @@ -198,16 +207,22 @@ <enable_back>no</enable_back> </module> -  +  <module> <label>Renew Update Stack</label> <name>update_online_mechanism</name> <execute>wagon_selfupdate</execute> </module> +  + <module> + <label>Migration Configuration</label> + <name>install_migration_products</name> + <execute>wagon_migration_products</execute> + </module> +  <module> - <label>Renew Update Stack</label> <name>update_url_dialog</name> <execute>wagon_update_url</execute> </module> @@ -218,7 +233,6 @@ (*) Offered in wagon_update_url if not running via applet --> <module> - <label>Renew Update Stack</label> <name>suse_register_workflow</name> <execute>inst_suse_register</execute> </module> @@ -228,7 +242,6 @@ (*) Offered in wagon_update_url if not running via applet --> <module> - <label>Renew Update Stack</label> <name>wagon_custom_url</name> <execute>wagon_custom_url</execute> </module> @@ -238,7 +251,6 @@ Follows the wagon_ownurl --> <module> - <label>Renew Update Stack</label> <name>wagon_selfupdate_from_url</name> <execute>wagon_selfupdate</execute> </module> @@ -265,6 +277,12 @@ <execute>inst_prepareprogress</execute> </module> +  + <module> + <name>point_of_no_return</name> + <execute>wagon_point_of_no_return</execute> + </module> + <module> <name>wagon_kickoff</name> <execute>inst_kickoff</execute> Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp Fri Jan 22 12:08:23 2010 @@ -29,11 +29,23 @@ import "Report"; import "ProductFeatures"; import "Update"; + import "FileUtils"; + import "String"; boolean running_by_applet = false; string update_workflow_type = "manual"; + // Products installed for the time of the migration + global list <string> migration_products = []; + + // Products installed before the migration + global list <map <string, string> > products_before_migration = []; + + // When aborting before the real migration starts, we can still + // revert to the old products + global boolean abort_can_revert_products = true; + global void SetUpdateWorkflow (string new_update_workflow_type) { // FIXME: check @@ -275,17 +287,192 @@ return true; } + global map <string,any> MinimizeProductMap (map <string,any> product) { + if (haskey (product, "license")) product["license"] = "..."; + if (haskey (product, "description")) product["description"] = "..."; + + return product; + } + + string GetDisplayName (string display_name, string name) { + if (display_name == name) + return display_name; + + // 'Product Long Name (product-libzypp-name)' + return sformat (_("%1 (%2)"), display_name, name); + } + + string GetDistributionUpgradeSummary () { + string ret = ""; + + list <map <string,any> > products = sort ( + map <string,any> x, map <string,any> y, Pkg::ResolvableProperties ("", `product, ""), + ``(x["display_name"]:x["short_name"]:x["name"]:"a" < y["display_name"]:x["short_name"]:x["name"]:"b") + ); + + // migration_products contains list of temporary products for migration process + + y2milestone ("All known migration products: %1", migration_products); + + string display_name = nil; + string name = nil; + + // list of all products that will be installed (are selected) + list <string> products_to_be_installed = []; + foreach (map <string,any> product, products, { + if (product["status"]:`unknown != `selected) return; + name = product["name"]:_("No short name defined"); + products_to_be_installed = add (products_to_be_installed, name); + }); + + // list of all products that will be upgraded + list <string> products_to_be_upgraded = []; + + // Products that are going to be removed + foreach (map <string,any> product, products, { + if (product["status"]:`unknown != `removed) return; + + product = MinimizeProductMap (product); + display_name = product["display_name"]:product["short_name"]:product["name"]:_("No name defined"); + name = product["name"]:_("No short name defined"); + + // Removing product and installing the same one (name) means -> upgrade + if (contains (products_to_be_installed, name)) { + products_to_be_upgraded = add (products_to_be_upgraded, name); + y2milestone ("Product to be upgraded: %1 (this is the removed one)", product); + // Do not list this product as 'to removed', list it as 'to upgrade' + return; + } + + // Removing a migration product is fine + if (contains (migration_products, product["name"]:"")) { + y2milestone ("Migration product will be removed: %1", product); + ret = ret + "<li>" + sformat ( + _("Temporary migration product %1 will be removed"), + GetDisplayName (display_name, name) + ) + "</li>\n"; + // Removing another product might be an issue + } else { + y2warning ("Product will be removed: %1", product); + ret = ret + "<li>" + sformat ( + _("Warning: Product %1 will be removed"), + GetDisplayName (display_name, name) + ) + "</li>\n"; + } + }); + + // Products that are going to be installed (new ones) or upgraded + foreach (map <string,any> product, products, { + if (product["status"]:`unknown != `selected) return; + + product = MinimizeProductMap (product); + display_name = product["display_name"]:product["short_name"]:product["name"]:_("No name defined"); + name = product["name"]:_("No short name defined"); + + // Product is going to be upgraded (removed + installed new version) + if (contains (products_to_be_upgraded, name)) { + y2milestone ("Product will be upgraded to: %1 (this is the installed one)", product); + ret = ret + "<li>" + sformat ( + _("Product %1 will be upgraded"), + GetDisplayName (display_name, name) + ) + "</li>\n"; + // Newly installed product + } else { + y2milestone ("Product will be upgraded: %1", product); + ret = ret + "<li>" + sformat ( + _("New product %1 will be installed"), + GetDisplayName (display_name, name) + ) + "</li>\n"; + } + }); + + // Products that will keep installed (unchanged) + foreach (map <string,any> product, products, { + if (product["status"]:`unknown != `installed) return; + + product = MinimizeProductMap (product); + display_name = product["display_name"]:product["short_name"]:product["name"]:_("No name defined"); + name = product["name"]:_("No short name defined"); + + y2milestone ("Product will keep: %1", product); + ret = ret + "<li>" + sformat ( + _("Product %1 will keep installed"), + GetDisplayName (display_name, name) + ) + "</li>\n"; + }); + + return "<ul>\n" + ret + "</ul>\n"; + } + global map <string, any> ProposalSummary () { map <string, any> ret = $[]; - // FIXME: create a useful summary ret = $[ - "preformatted_proposal" : "<ul><li>" + _("Distribution Upgrade") + "</li></ul>", - "help" : _("FIXME"), + "preformatted_proposal" : GetDistributionUpgradeSummary(), + // help text + "help" : _("To change update settings go to Software Proposal section."), ]; return ret; } + global list <map <string, string> > ReadProductsBeforeMigration () { + list <map <string, any> > products = Pkg::ResolvableProperties ("", `product, ""); + y2milestone ("All known products: %1", products); + + foreach (map<string, any> p, products, { + if (p["status"]:`unknown != `installed) + return; + + // Remember the 'old' product just for the case of reverting + products_before_migration = add ( + products_before_migration, + $["name" : p["name"]:"", "version" : p["version"]:""] + ); + }); + + return products_before_migration; + } + + // YaST can be restarted but some data have to be kept + string migration_products_store_file = sformat ("%1/wagon_products_before_migration", Directory::vardir); + + global boolean StoreProductsBeforeMigration () { + return (boolean) SCR::Write (.target.ycp, migration_products_store_file, products_before_migration); + } + + global boolean RestoreProductsBeforeMigration () { + products_before_migration = (list <map <string, string> >) SCR::Read (.target.ycp, migration_products_store_file); + + if (products_before_migration == nil) { + products_before_migration = []; + Report::Error (_("Error restoring the list of previously installed products.")); + return false; + } + + return true; + } + + global string GetFileOwner (string file) { + if (file == nil || file == "") { + y2error ("File not provided"); + return nil; + } + + if (! FileUtils::Exists (file)) { + y2error ("File %1 doesn't exist", file); + return nil; + } + + string command = sformat ("rpm -qf '%1'", String::Quote (file)) + " --queryformat \"%{NAME}\""; + map <string, any> cmd = (map <string, any>) SCR::Execute (.target.bash_output, command); + if (cmd["exit"]:-1 != 0) { + y2error ("Cannot get file owner %1: %2", command, cmd); + return nil; + } + + return (string) splitstring (cmd["stdout"]:"", "\n")[0]:nil; + } + /* EOF */ } Modified: branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in Fri Jan 22 12:08:23 2010 @@ -36,6 +36,8 @@ @clientdir@/*.ycp @moduledir@/*.ycp @moduledir@/*.ybc +%dir @yncludedir@/wagon +@yncludedir@/wagon/*.ycp %dir /usr/share/YaST2/control @desktopdir@/*.desktop /usr/share/YaST2/control/*.xml -- 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] r60481 - in /branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner: ./ agents/ doc/ package/ src/ testsuite/
by openvasfelix＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: openvasfelix Date: Fri Jan 22 12:02:54 2010 New Revision: 60481 URL: http://svn.opensuse.org/viewcvs/yast?rev=60481&view=rev Log: Added OpenVAS Security Scanner module, which was accidentally commited in wrong branch. Added: branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/ (props changed) - copied from r60477, branches/SuSE-Code-11-Branch/openvas-security-scanner/ branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/agents/ - copied from r60478, branches/SuSE-Code-11-Branch/openvas-security-scanner/agents/ branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/doc/ - copied from r60478, branches/SuSE-Code-11-Branch/openvas-security-scanner/doc/ branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/package/ - copied from r60478, branches/SuSE-Code-11-Branch/openvas-security-scanner/package/ branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/src/ - copied from r60478, branches/SuSE-Code-11-Branch/openvas-security-scanner/src/ branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/testsuite/ - copied from r60478, branches/SuSE-Code-11-Branch/openvas-security-scanner/testsuite/ -- 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] r60480 - in /branches/SuSE-Code-11-SP1-Branch/autoinstallation: package/autoyast2.changes src/modules/AutoInstallRules.ycp
by ug＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: ug Date: Fri Jan 22 11:49:26 2010 New Revision: 60480 URL: http://svn.opensuse.org/viewcvs/yast?rev=60480&view=rev Log: the regex match for rules only worked for substrings Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/AutoInstallRules.ycp Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes Fri Jan 22 11:49:26 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 22 11:49:06 CET 2010 - ug(a)suse.de + +- the regex match for rules only worked for substring, not + with real regexpressions (bnc#572932) + +------------------------------------------------------------------- Thu Jan 21 15:52:15 CET 2010 - ug(a)suse.de - passing a boolean to an ask-script failed (bnc#572166) Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/AutoInstallRules.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/AutoInstallRules.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/AutoInstallRules.ycp Fri Jan 22 11:49:26 2010 @@ -359,7 +359,7 @@ } else if( matchtype == "regex" ) { - tmpshell = tmpshell + sformat("[ \"$%1\" =~ \"%2\" ]", var, val); + tmpshell = tmpshell + sformat("[ \"$%1\" =~ %2 ]", var, val); } if (match) -- 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] r60479 - in /trunk/autoinstallation: package/autoyast2.changes src/modules/AutoInstallRules.ycp
by ug＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: ug Date: Fri Jan 22 11:48:41 2010 New Revision: 60479 URL: http://svn.opensuse.org/viewcvs/yast?rev=60479&view=rev Log: the regex match for rules only worked for substrings Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/modules/AutoInstallRules.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Fri Jan 22 11:48:41 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 22 11:47:22 CET 2010 - ug(a)suse.de + +- the regex match for rules only worked for substrings, not + with real regexpressions (bnc#572932) + +------------------------------------------------------------------- Thu Jan 21 15:50:31 CET 2010 - ug(a)suse.de - passing a boolean to an ask-script failed (bnc#572166) Modified: trunk/autoinstallation/src/modules/AutoInstallRules.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoInstallRules.ycp (original) +++ trunk/autoinstallation/src/modules/AutoInstallRules.ycp Fri Jan 22 11:48:41 2010 @@ -360,7 +360,7 @@ } else if( matchtype == "regex" ) { - tmpshell = tmpshell + sformat("[ \"$%1\" =~ \"%2\" ]", var, val); + tmpshell = tmpshell + sformat("[ \"$%1\" =~ %2 ]", var, val); } if (match) -- 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] r60478 - in /branches/SuSE-Code-11-Branch/openvas-security-scanner: agents/ doc/ doc/autodocs/ package/ src/ testsuite/ testsuite/tests/
by openvasfelix＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: openvasfelix Date: Fri Jan 22 11:15:47 2010 New Revision: 60478 URL: http://svn.opensuse.org/viewcvs/yast?rev=60478&view=rev Log: Added remaining portion of the OpenVAS Security Scanner YaST module. * openvas-security-scanner/agents, openvas-security-scanner/agents/Makefile.am, openvas-security-scanner/agents/openvas-security-scanner.scr, openvas-security-scanneragents/.cvsignore, openvas-security-scanner/doc, openvas-security-scanner/doc/autodocs, openvas-security-scanner/doc/autodocs/Makefile.am, openvas-security-scanner/doc/autodocs/.cvsignore, openvas-security-scanner/doc/Makefile.am, openvas-security-scanner/doc/.cvsignore, openvas-security-scanner/src, openvas-security-scanner/src/openvas-security-scanner.desktop, openvas-security-scanner/src/openvas-security-scanner.ycp, openvas-security-scanner/src/complex.ycp, openvas-security-scanner/src/helps.ycp, openvas-security-scanner/src/OpenvasSecurityScanner.ycp, openvas-security-scanner/package, openvas-security-scanner/package/.cvsignore: New. Remaining portion of the OpenVAS Security Scanner module. Added: branches/SuSE-Code-11-Branch/openvas-security-scanner/agents/ branches/SuSE-Code-11-Branch/openvas-security-scanner/agents/.cvsignore branches/SuSE-Code-11-Branch/openvas-security-scanner/agents/Makefile.am branches/SuSE-Code-11-Branch/openvas-security-scanner/agents/openvas-security-scanner.scr branches/SuSE-Code-11-Branch/openvas-security-scanner/doc/ branches/SuSE-Code-11-Branch/openvas-security-scanner/doc/.cvsignore branches/SuSE-Code-11-Branch/openvas-security-scanner/doc/Makefile.am branches/SuSE-Code-11-Branch/openvas-security-scanner/doc/autodocs/ branches/SuSE-Code-11-Branch/openvas-security-scanner/doc/autodocs/.cvsignore branches/SuSE-Code-11-Branch/openvas-security-scanner/doc/autodocs/Makefile.am branches/SuSE-Code-11-Branch/openvas-security-scanner/package/ branches/SuSE-Code-11-Branch/openvas-security-scanner/package/.cvsignore branches/SuSE-Code-11-Branch/openvas-security-scanner/src/ branches/SuSE-Code-11-Branch/openvas-security-scanner/src/.cvsignore branches/SuSE-Code-11-Branch/openvas-security-scanner/src/Makefile.am branches/SuSE-Code-11-Branch/openvas-security-scanner/src/OpenvasSecurityScanner.ycp branches/SuSE-Code-11-Branch/openvas-security-scanner/src/complex.ycp branches/SuSE-Code-11-Branch/openvas-security-scanner/src/dialogs.ycp branches/SuSE-Code-11-Branch/openvas-security-scanner/src/helps.ycp branches/SuSE-Code-11-Branch/openvas-security-scanner/src/openvas-security-scanner.desktop branches/SuSE-Code-11-Branch/openvas-security-scanner/src/openvas-security-scanner.ycp branches/SuSE-Code-11-Branch/openvas-security-scanner/src/wizards.ycp branches/SuSE-Code-11-Branch/openvas-security-scanner/testsuite/ branches/SuSE-Code-11-Branch/openvas-security-scanner/testsuite/.cvsignore branches/SuSE-Code-11-Branch/openvas-security-scanner/testsuite/Makefile.am branches/SuSE-Code-11-Branch/openvas-security-scanner/testsuite/tests/ branches/SuSE-Code-11-Branch/openvas-security-scanner/testsuite/tests/.cvsignore Added: branches/SuSE-Code-11-Branch/openvas-security-scanner/agents/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/openvas-s… ============================================================================== --- branches/SuSE-Code-11-Branch/openvas-security-scanner/agents/.cvsignore (added) +++ branches/SuSE-Code-11-Branch/openvas-security-scanner/agents/.cvsignore Fri Jan 22 11:15:47 2010 @@ -0,0 +1,2 @@ +Makefile +Makefile.in Added: branches/SuSE-Code-11-Branch/openvas-security-scanner/agents/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/openvas-s… ============================================================================== --- branches/SuSE-Code-11-Branch/openvas-security-scanner/agents/Makefile.am (added) +++ branches/SuSE-Code-11-Branch/openvas-security-scanner/agents/Makefile.am Fri Jan 22 11:15:47 2010 @@ -0,0 +1,7 @@ +# Makefile.am for openvas-security-scanner/agents + +agent_SCRIPTS = + +scrconf_DATA = openvas-security-scanner.scr + +EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA) Added: branches/SuSE-Code-11-Branch/openvas-security-scanner/agents/openvas-security-scanner.scr URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/openvas-s… ============================================================================== --- branches/SuSE-Code-11-Branch/openvas-security-scanner/agents/openvas-security-scanner.scr (added) +++ branches/SuSE-Code-11-Branch/openvas-security-scanner/agents/openvas-security-scanner.scr Fri Jan 22 11:15:47 2010 @@ -0,0 +1,24 @@ +/** + * File: + * openvas_security_scanner.scr + * Summary: + * SCR Agent for reading/writing /etc/openvas/openvas_security_scanner_config + * using the ini-agent + * Access: + * read/write + * Authors: + * Felix Wolfsteller <felix.wolfsteller(a)intevation.de> + * Example: + * Read(.openvas.feed) + * (["osf"]) + * + * Write(.openvas.feed, "onf") + * (true) + * $**Id$ + */ + +.etc.openvas.openvas_security_scanner_config + +`ag_ini( + `SysConfigFile( "/etc/openvas/openvas_security_scanner.config") +) Added: branches/SuSE-Code-11-Branch/openvas-security-scanner/doc/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/openvas-s… ============================================================================== --- branches/SuSE-Code-11-Branch/openvas-security-scanner/doc/.cvsignore (added) +++ branches/SuSE-Code-11-Branch/openvas-security-scanner/doc/.cvsignore Fri Jan 22 11:15:47 2010 @@ -0,0 +1,2 @@ +Makefile +Makefile.in Added: branches/SuSE-Code-11-Branch/openvas-security-scanner/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/openvas-s… ============================================================================== --- branches/SuSE-Code-11-Branch/openvas-security-scanner/doc/Makefile.am (added) +++ branches/SuSE-Code-11-Branch/openvas-security-scanner/doc/Makefile.am Fri Jan 22 11:15:47 2010 @@ -0,0 +1,10 @@ +# Makefile.am for openvas-security-scanner/doc + +SUBDIRS = autodocs + +htmldir = $(docdir) + +doc_DATA = +html_DATA = + +EXTRA_DIST = $(doc_DATA) $(html_DATA) Added: branches/SuSE-Code-11-Branch/openvas-security-scanner/doc/autodocs/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/openvas-s… ============================================================================== --- branches/SuSE-Code-11-Branch/openvas-security-scanner/doc/autodocs/.cvsignore (added) +++ branches/SuSE-Code-11-Branch/openvas-security-scanner/doc/autodocs/.cvsignore Fri Jan 22 11:15:47 2010 @@ -0,0 +1,3 @@ +Makefile +Makefile.in +*.html Added: branches/SuSE-Code-11-Branch/openvas-security-scanner/doc/autodocs/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/openvas-s… ============================================================================== --- branches/SuSE-Code-11-Branch/openvas-security-scanner/doc/autodocs/Makefile.am (added) +++ branches/SuSE-Code-11-Branch/openvas-security-scanner/doc/autodocs/Makefile.am Fri Jan 22 11:15:47 2010 @@ -0,0 +1,3 @@ +# Makefile.am for openvas-security-scanner/doc/autodocs + +include $(top_srcdir)/autodocs-ycp.ami Added: branches/SuSE-Code-11-Branch/openvas-security-scanner/package/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/openvas-s… ============================================================================== --- branches/SuSE-Code-11-Branch/openvas-security-scanner/package/.cvsignore (added) +++ branches/SuSE-Code-11-Branch/openvas-security-scanner/package/.cvsignore Fri Jan 22 11:15:47 2010 @@ -0,0 +1,2 @@ +*.spec +*.bz2 Added: branches/SuSE-Code-11-Branch/openvas-security-scanner/src/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/openvas-s… ============================================================================== --- branches/SuSE-Code-11-Branch/openvas-security-scanner/src/.cvsignore (added) +++ branches/SuSE-Code-11-Branch/openvas-security-scanner/src/.cvsignore Fri Jan 22 11:15:47 2010 @@ -0,0 +1,4 @@ +Makefile +Makefile.in +*.ybc +.dep Added: branches/SuSE-Code-11-Branch/openvas-security-scanner/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/openvas-s… ============================================================================== --- branches/SuSE-Code-11-Branch/openvas-security-scanner/src/Makefile.am (added) +++ branches/SuSE-Code-11-Branch/openvas-security-scanner/src/Makefile.am Fri Jan 22 11:15:47 2010 @@ -0,0 +1,29 @@ +# Makefile.am for openvas-security-scanner/src + +yncludedir = @yncludedir@/openvas-security-scanner + +client_DATA = \ + openvas-security-scanner.ycp + +ynclude_DATA = \ + helps.ycp \ + wizards.ycp \ + dialogs.ycp \ + complex.ycp + +desktop_DATA = \ + openvas-security-scanner.desktop + +module_DATA = \ + OpenvasSecurityScanner.ycp \ + OpenvasSecurityScanner2.pm \ + OpenvasSecurityScanner3.py + +# create a symlink for local build, #145327 +openvas-security-scanner: + ln -sf . $@ +ycpchook = openvas-security-scanner + +EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) + +include $(top_srcdir)/Makefile.am.common Added: branches/SuSE-Code-11-Branch/openvas-security-scanner/src/OpenvasSecurityScanner.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/openvas-s… ============================================================================== --- branches/SuSE-Code-11-Branch/openvas-security-scanner/src/OpenvasSecurityScanner.ycp (added) +++ branches/SuSE-Code-11-Branch/openvas-security-scanner/src/OpenvasSecurityScanner.ycp Fri Jan 22 11:15:47 2010 @@ -0,0 +1,545 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: modules/OpenvasSecurityScanner.ycp + * Package: Configuration of openvas-security-scanner + * Summary: OpenvasSecurityScanner settings, input and output functions + * Authors: Felix Wolfsteller <felix.wolfsteller(a)intevation.de> + * + * $**Id$ + * + * Representation of the configuration of openvas-security-scanner. + * Input and output routines. + */ + +{ + +module "OpenvasSecurityScanner"; +textdomain "openvas-security-scanner"; + +import "FileUtils"; +import "Popup"; +import "Progress"; +import "Report"; +import "SCR"; +import "Service"; +import "Summary"; +import "Message"; + +/** + * Write only, used during autoinstallation. + * Don't run services and SuSEconfig, it's all done at one place. + */ +boolean write_only = false; + +/** + * The users choosen feed. Currently one of "No Feed", + * "Greenbone Security Feed" or "OpenVAS NVT Feed". + */ +global any feed_choice = ""; + +/** + * Hold the path to where to install the GSF files from. + */ +global string gsf_location = ""; + +/** + * Sleeping time beetwing progress steps. + */ +integer sl = 20; + + +/** + * Returns whether the /usr/sbin/greenbone-nvt-sync and + * /etc/openvas/gsf-access-key exist. + * @return true if /usr/sbin/greenbone-nvt-sync and /etc/openvas/gsf-access-key + * exist. + */ +global boolean IsGSFInstalled () { + if (FileUtils::Exists ("/usr/sbin/greenbone-nvt-sync") && FileUtils::Exists ("/etc/openvas/gsf-access-key")) + return true; + + return false; +} + +/** + * Ask if user really wants to abort + * @return true on user intended abort. + */ +global boolean Abort () { + return Popup::ReallyAbort (true); +} + +/** + * Checks whether an Abort button has been pressed. + * If so, calls function to confirm the abort call. + * + * @return true if abort confirmed + */ +global boolean PollAbort () { + if (UI::PollInput () == `abort) + return Abort (); + + return false; +} + +/** + * Removes contents of /var/cache/openvas . + * @return true. + */ +boolean CleanCache () { + SCR::Execute (.target.bash, "for i in /var/cache/openvas/*; do rm -rf $i; done"); + return true; +} + +/** + * Removes contents of /usr/lib/openvas/plugins . + * @return true. + */ +boolean CleanNVTDir () { + SCR::Execute (.target.bash, "for i in /usr/lib/openvas/plugins/*; do rm -rf $i; done"); + return true; +} + + +/** + * Read all OpenVAS Security Scanner settings + * @return true on success + */ +global boolean Read() { + /* OpenvasSecurityScanner read dialog caption */ + string caption = _("Initializing OpenVAS Security Scanner Configuration"); + + integer steps = 2; + + Progress::New (caption, " ", steps, [ + /* Progress stage 1/2 */ + _("Read current OpenVAS Security Scanner configuration"), + /* Progress stage 2/2 */ + _("Read current openvas-scanner state") + ], [ + /* Progress stage 1/2 */ + _("Reading current OpenVAS Security Scanner configuration..."), + /* Progress stage 2/2 */ + _("Reading current openvas-scanner state..."), + /* Progress finished */ + Message::Finished () + ],""); + + sleep (sl); + + if (PollAbort ()) return false; + Progress::NextStage (); + if (false) Report::Error (Message::CannotReadCurrentSettings ()); + sleep (sl); + + if (PollAbort ()) return false; + Progress::NextStep(); + if (false) Report::Error (_("Cannot read current openvas-scanner state.")); + sleep (sl); + + if (PollAbort ()) return false; + Progress::NextStage (); + sleep (sl); + + feed_choice = SCR::Read (.etc.openvas.openvas_security_scanner_config.feed); + if (feed_choice == nil) + feed_choice = "No Feed"; + + return true; +} + + +/** + * Write all OpenVAS Security Scanner settings. + * @return true on success + */ +global boolean Write() { + /* Openvas Security Scanner write dialog caption */ + string caption = _("Saving OpenVAS Security Scanner Configuration"); + + integer steps = 2; + + Progress::New (caption, " ", steps, [ + /* Progress stage 1/2 */ + _("Write the OpenVAS Security Scanner settings") +], [ + /* Progress step 1/2 */ + _("Writing the OpenVAS Security Scanner settings..."), + Message::Finished () +], +"" + ); + + sleep (sl); + + /* Write settings to conf file */ + if (PollAbort ()) return false; + Progress::NextStage (); + /* Error message */ + if (!SCR::Write (.etc.openvas.openvas_security_scanner_config.feed, feed_choice) + || !SCR::Write (.etc.openvas.openvas_security_scanner_config, nil)){ + Report::Error (_("Cannot write OpenVAS Security Scanner settings.")); + } + + sleep (sl); + + Progress::NextStage (); + + return true; +} + + +/** + * Disable the openvas service and clean up the cache and plugins directory. + * @return true on success + */ +global boolean DisableOpenVAS () { + string caption = _("Disable the OpenVAS Security Scanner"); + integer steps = 3; + + Progress::New (caption, " ", steps, [ + /* Progress stage 1/3 */ + _("Stopp the OpenVAS Security Scanner service"), + /* Progress stage 2/3 */ + _("Disable the OpenVAS Security Scanner service"), + /* Progress stage 3/3 */ + _("Delete the NVT datastores"), + ],[ + /* Progress stage 1/3 */ + _("Stopping the OpenVAS Security Scanner service..."), + /* Progress stage 2/3 */ + _("Disabling the OpenVAS Security Scanner service..."), + /* Progress stage 3/3 */ + _("Deleting the NVT datastores..."), + Message::Finished () + ], ""); + + /* Stop the service (if running) */ + if (PollAbort ()) + return false; + Progress::NextStage (); + Service::Stop ("openvas-scanner"); + sleep (sl); + + /* Disable the service */ + if (PollAbort ()) + return false; + Progress::NextStage (); + Service::Adjust ("openvas-scanner", "disable"); + sleep (sl); + + /* Clean NVT Cache and Collection */ + if (PollAbort ()) + return false; + Progress::NextStage (); + CleanCache (); + CleanNVTDir (); + sleep (sl); + + Progress::NextStage (); + sleep (sl); + + return true; +} + +/** + * Fetches a NVT Feed. + * @return true on success + */ +global boolean FetchFeed () { + string caption = _("Fetching NVT Feed"); + + integer steps = 4; + + Progress::New (caption, " ", steps, [ + /* Progress stage 1/4 */ + _("Stop the OpenVAS Security Scanner service"), + /* Progress stage 2/4 */ + _("Delete the NVT datastores"), + /* Progress stage 3/4 */ + _("Fetch the Feed (may take a while)"), + /* Progress stage 4/4 */ + _("Start the OpenVAS Security Scanner service (may take a while)") + ], [ + /* Progress stage 1/4 */ + _("Stopping the OpenVAS Security Scanner service..."), + /* Progress stage 2/4 */ + _("Deleting the NVT datastores..."), + /* Progress stage 3/4 */ + _("Fetching the Feed (may take a while)..."), + /* Progress stage 4/4 */ + _("Starting the OpenVAS Security Scanner service (may take a while)..."), + Message::Finished () + ], ""); + + sleep (sl); + + /* Stop openvas service */ + if (PollAbort()) + return false; + Progress::NextStage (); + Service::Stop ("openvas-scanner"); + sleep (sl); + + /* Clean the NVT Cache and Collection */ + if (PollAbort ()) + return false; + Progress::NextStage (); + CleanCache (); + CleanNVTDir (); + sleep (sl); + + /* Sync with feed */ + if (PollAbort ()) + return false; + Progress::NextStage (); + if (feed_choice == "Greenbone Security Feed") + SCR::Execute (.target.bash, "greenbone-nvt-sync"); + else + SCR::Execute (.target.bash, "openvas-nvt-sync"); + /** @TODO Once the feed synchronization scripts have been consolidated, it + * will be possible to check the return. */ + sleep (sl); + + /* Start openvas service */ + if (PollAbort ()) return false; + Progress::NextStage (); + Service::Adjust ("openvas-scanner", "enable"); + if (!Service::Start ("openvas-scanner")) + Report::Error (_("Could not start OpenVAS Security Scanner service.")); + /** @TODO decide whether + * Report::Error (Message::CannotAdjustService ("openvas-scanner")); + * is more accurate */ + sleep (sl); + + Progress::NextStage (); + sleep (sl); + + return true; +} + +/** + * Fetches a NVT Feed. + * @return true on success + */ +global boolean SyncWithFeed () { + string caption = _("Synchronization with NVT Feed"); + + integer steps = 3; + + Progress::New (caption, " ", steps, [ + /* Progress stage 1/3 */ + _("Stop the OpenVAS Security Scanner service"), + /* Progress stage 2/3 */ + _("Fetch the Feed (may take a while)"), + /* Progress stage 2/3 */ + _("Start the OpenVAS Security Scanner service (may take a while)") + ], [ + /* Progress stage 1/3 */ + _("Stopping the OpenVAS Security Scanner service..."), + /* Progress stage 2/3 */ + _("Fetching the Feed (may take a while)..."), + /* Progress stage 3/3 */ + _("Starting the OpenVAS Security Scanner service (may take a while)..."), + Message::Finished () + ], ""); + + sleep (sl); + + /* Stop openvas service */ + if (PollAbort()) + return false; + Progress::NextStage (); + Service::Stop ("openvas-scanner"); + sleep (sl); + + /* Sync with feed */ + if (PollAbort ()) + return false; + Progress::NextStage (); + if (feed_choice == "Greenbone Security Feed") + SCR::Execute (.target.bash, "greenbone-nvt-sync"); + else + SCR::Execute (.target.bash, "openvas-nvt-sync"); + /** @TODO Once the feed synchronization scripts have been consolidated, it + * will be possible to check the return. */ + sleep (sl); + + /* Start openvas service */ + if (PollAbort ()) return false; + Progress::NextStage (); + Service::Adjust ("openvas-scanner", "enable"); + if (!Service::Start ("openvas-scanner")) + Report::Error (_("Could not start OpenVAS Security Scanner service.")); + /** @TODO decide whether + * Report::Error (Message::CannotAdjustService ("openvas-scanner")); + * is more accurate */ + sleep (sl); + + Progress::NextStage (); + sleep (sl); + + return true; +} + +/** + * Deactivate the GSF, remove access key and synchronization script. + */ +global boolean DeactivateGSF () { + /* Deactivate Greenbone Security Feed dialog caption */ + string caption = _("Deactivate Greenbone Security Feed Subscription"); + + integer steps = 3; + + Progress::New(caption, " ", steps, [ + /* Progress stage 1/3 */ + _("Remove Greenbone Security Feed Access Key"), + /* Progress stage 2/3 */ + _("Remove Greenbone Security Feed Synchronization Script"), + /* Progress stage 3/3 */ + _("Delete NVT datastores"), +], [ + /* Progress stage 1/3 */ + _("Removing Greenbone Security Feed Access Key..."), + /* Progress stage 2/3 */ + _("Removing Greenbone Security Feed Synchronization Script..."), + /* Progress stage 3/3 */ + _("Deleting NVT datastores..."), + Message::Finished () + ], ""); + + sleep (sl); + + /* Removing Access Key */ + if (PollAbort ()) return false; + Progress::NextStage (); + SCR::Execute (.target.bash, "rm -rf /etc/openvas/gsf-access-key"); + sleep (sl); + + + /* Removing sync script */ + if (PollAbort ()) return false; + Progress::NextStage (); + SCR::Execute (.target.bash, "rm -rf /usr/sbin/greenbone-nvt-sync"); + sleep (sl); + + /* Clean the NVT Cache and Collection */ + if (PollAbort ()) return false; + Progress::NextStage (); + CleanCache (); + CleanNVTDir (); + sleep (sl); + + return true; +} + +/** + * Fetches a NVT Feed. + * @return true on success + */ +global boolean ActivateGSF () { + /* Openvas Security Scanner Feed Fetching dialog caption */ + string caption = _("Fetching NVT Feed"); + + integer steps = 5; + + Progress::New(caption, " ", steps, [ + /* Progress stage 1/5 */ + _("Copy Greenbone Security Feed Access Key"), + /* Progress stage 2/5 */ + _("Add feed.greenbone.net to list of known hosts"), + /* Progress stage 3/5 */ + _("Import Greenbone Key"), + /* Progress stage 4/5 */ + _("Install greenbone-nvt-sync script"), + /* Progress stage 5/5 */ + _("Test Keys") +], [ + /* Progress stage 1/5 */ + _("Copying Greenbone Security Feed Access Key..."), + /* Progress stage 2/5 */ + _("Adding feed.greenbone.net to list of known hosts"), + /* Progress stage 3/5 */ + _("Importing Greenbone Key..."), + /* Progress stage 4/5 */ + _("Installing greenbone-nvt-sync script..."), + /* Progress stage 5/5 */ + _("Testing Keys..."), + Message::Finished () + ], ""); + + sleep(sl); + + /* Adding greenbone feed location to list of known hosts */ + if (PollAbort ()) return false; + Progress::NextStage (); + SCR::Execute (.target.bash, "echo \"[feed.greenbone.net]:24,[193.108.181.139]:24 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAmVIt4lOPi1lVJfFCtiNjGR4kHj377C6jMY4iaxotYueuGq8l8B1YIMUMLQzaUeaPwOGMZl5mWUT158zaiWK4zOzZarFLey6JrKfrnDZMdCcCneZPBRbMJUxiV1jv4U+/Vp/V1wO6OJ+S9XkodxvN9+vjAhcXspKXcRol30+T9mgilWK+nvSTVEhce+JJYz+gdQFN+1xgkPhjGbXSjHT7zB5fVjWe7TYLGhdqj1U+NTVOcKNn0wMBRGM3T63rKV71KI1hmLdX6+VmVQOCjYpqsFRh0TZadh5cEE5gmPDCnGlXCA9BrilOMSRvsTySs30xN4/Z5RHPWbDS0rwvqBf9Lw==\" >> /root/.ssh/known_hosts"); + sleep (sl); + + + /* Copy access key and set permissions */ + if (PollAbort ()) return false; + Progress::NextStage (); + y2milestone (" --> cp " + gsf_location + "/gsf-access-key" + + " /etc/openvas/gsf-access-key <--"); + SCR::Execute (.target.bash, "cp " + gsf_location + "/gsf-access-key" + + " /etc/openvas/gsf-access-key"); + SCR::Execute (.target.bash, "chmod 400 /etc/openvas/gsf-access-key"); + sleep (sl); + + /* Import Greenbone Key via script */ + if (PollAbort ()) return false; + Progress::NextStage (); + integer ret = (integer) SCR::Execute (.target.bash, + gsf_location + + "/import-greenbone-key"); + if (ret != 0) + { + Report::Error (_("The greenbone key could not be imported.")); + } + sleep(sl); + + /* Install Greenbone NVT Sync script */ + if (PollAbort ()) return false; + Progress::NextStage (); + SCR::Execute (.target.bash, "cp " + gsf_location + "/greenbone-nvt-sync /usr/sbin"); + sleep (sl); + + /* Do a self test */ + if (PollAbort ()) return false; + Progress::NextStage (); + ret = (integer) SCR::Execute (.target.bash, + "greenbone-nvt-sync --selftest"); + if (ret != 0) + { + Report::Error (_("The synchronization test failed.")); + } + sleep (sl); + + Progress::NextStage (); + sleep (sl); + + return true; +} + +/* EOF */ +} Added: branches/SuSE-Code-11-Branch/openvas-security-scanner/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/openvas-s… ============================================================================== --- branches/SuSE-Code-11-Branch/openvas-security-scanner/src/complex.ycp (added) +++ branches/SuSE-Code-11-Branch/openvas-security-scanner/src/complex.ycp Fri Jan 22 11:15:47 2010 @@ -0,0 +1,101 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: include/openvas-security-scanner/complex.ycp + * Package: Configuration of openvas-security-scanner + * Summary: Dialogs definitions + * Authors: Felix Wolfsteller <felix.wolfsteller(a)intevation.de> + * + * $**Id$ + */ + +{ + +textdomain "openvas-security-scanner"; + +import "Label"; +import "Popup"; +import "Wizard"; +import "Wizard_hw"; +import "Confirm"; +import "OpenvasSecurityScanner"; + + +include "openvas-security-scanner/helps.ycp"; + +/** + * Read settings dialog + * @return `abort if aborted and `next otherwise + */ +symbol ReadDialog() { + Wizard::RestoreHelp(HELPS["read"]:""); + //OpenvasSecurityScanner::SetAbortFunction(PollAbort); + if (!Confirm::MustBeRoot()) return `abort; + boolean ret = OpenvasSecurityScanner::Read(); + return ret ? `next : `abort; +} + +/** + * Write settings dialog + * @return `abort if aborted and `next otherwise + */ +symbol WriteDialog() { + Wizard::RestoreHelp(HELPS["write"]:""); + //OpenvasSecurityScanner::SetAbortFunction(PollAbort); + boolean ret = OpenvasSecurityScanner::Write(); + return ret ? `next : `abort; +} + + +/** + * Feed fetching "dialog" + * @return `abort if aborted and `next otherwise + */ +symbol FetchFeedDialog() { + Wizard::RestoreHelp(HELPS["fetchfeed"]:""); + boolean ret = OpenvasSecurityScanner::FetchFeed(); + return ret ? `next : `abort; +} + +/** + * Feed Synchronization "dialog" + * @return `abort if aborted and `next otherwise + */ +symbol SyncDialog () { + Wizard::RestoreHelp(HELPS["fetchfeed"]:""); + boolean ret = OpenvasSecurityScanner::SyncWithFeed(); + return ret ? `next : `abort; + +} + +/** + * Greenbone Security Feed Activation "dialog" + * @return `abort if aborted and `next otherwise + */ +symbol ActivateGSFDialog () { + Wizard::RestoreHelp(HELPS["activategsf"]:""); + boolean ret = OpenvasSecurityScanner::ActivateGSF(); + return ret ? `next : `abort; +} + +/* EOF */ +} + Added: branches/SuSE-Code-11-Branch/openvas-security-scanner/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/openvas-s… ============================================================================== --- branches/SuSE-Code-11-Branch/openvas-security-scanner/src/dialogs.ycp (added) +++ branches/SuSE-Code-11-Branch/openvas-security-scanner/src/dialogs.ycp Fri Jan 22 11:15:47 2010 @@ -0,0 +1,232 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: include/openvas-security-scanner/dialogs.ycp + * Package: Configuration of openvas-security-scanner + * Summary: Dialogs definitions + * Authors: Felix Wolfsteller <felix.wolfsteller(a)intevation.de> + * + * $**Id$ + */ + +{ + +textdomain "openvas-security-scanner"; + +import "Label"; +import "Wizard"; +import "OpenvasSecurityScanner"; + +include "openvas-security-scanner/helps.ycp"; + +/** + * OpenVAS Scan-Server Configuration Dialog + * + * @return any dialog result + */ +any ScannerConfigurationDialog () { + string caption = _("OpenVAS Security Scanner Configuration"); + + boolean no_feed_selected = (OpenvasSecurityScanner::feed_choice == nil || + OpenvasSecurityScanner::feed_choice == "No Feed" || + OpenvasSecurityScanner::feed_choice == ""); + + term radio_group = `VBox (); + radio_group = add (radio_group, `Left( + `RadioButton(`id(`no_feed), _("&Disable OpenVAS Security Scanner"), no_feed_selected) )); + + radio_group = add (radio_group, `Left( + `RadioButton(`id(`onf), _("Enable and use &OpenVAS NVT Feed"), (OpenvasSecurityScanner::feed_choice == "OpenVAS NVT Feed")) )); + + // Disable the Greenbone Security Feed option if the GSF scripts are not installed / activated + if (OpenvasSecurityScanner::IsGSFInstalled ()) + { + radio_group = add (radio_group, `Left(`RadioButton(`id(`gsf), _("Enable and use &Greenbone Security Feed"), (OpenvasSecurityScanner::feed_choice == "Greenbone Security Feed")) )); + } + else + { + radio_group = add (radio_group, `Left(`RadioButton(`id(`gsf), `opt(`disabled), _("Enable and use &Greenbone Security Feed"), false) )); + } + + term radio_box = `RadioButtonGroup (`id(`feed), `HVSquash(radio_group)); + + term gsf_box = `VBox (); + if (OpenvasSecurityScanner::IsGSFInstalled ()) + { + gsf_box = add (gsf_box, `PushButton(`id(`activate_gsf), `opt(`notify, `disabled), _("&Activate Greenbone Security Feed Subscription"))); + gsf_box = add (gsf_box, `PushButton(`id(`deactivate_gsf), `opt(`notify), _("D&eactivate Greenbone Security Feed Subscription"))); + } + else + { + gsf_box = add (gsf_box, `PushButton(`id(`activate_gsf), `opt(`notify), _("&Activate Greenbone Security Feed Subscription"))); + gsf_box = add (gsf_box, `PushButton(`id(`deactivate_gsf), `opt(`notify, `disabled), _("D&eactivate Greenbone Security Feed Subscription"))); + } + + // Disable the "Sync Now" button if no feed is selected / the OpenVAS service is disabled. + term sync_now_button = (no_feed_selected) ? `PushButton(`id(`feedsync_now), `opt(`disabled), _("&Synchronize with Feed now")) + : `PushButton(`id(`feedsync_now), `opt(`notify), _("&Synchronize with Feed now")); + + integer w = 38; + term contents = `VBox (`Frame ("Security Scanner Service", `MinSize (w, 0, radio_box)), `VSpacing (1), + `Frame ("Professional Feed Subscriptions", `MinSize (w, 0, gsf_box)), `VSpacing (1), + `Frame ("Manual Feed Management", `MinSize (w, 0, `VBox (sync_now_button)))); + + Wizard::SetContentsButtons (caption, contents, + HELPS["configuration"]:"", + Label::BackButton (), Label::FinishButton ()); + Wizard::DisableBackButton(); + + any ret = nil; + while (true) { + ret = UI::UserInput (); + + /* Abort? */ + if (ret == `abort) + { + if (OpenvasSecurityScanner::Abort ()) break; + else continue; + } + /* Next */ + else if (ret == `next) + { + ret = UI::QueryWidget (`id(`feed), `CurrentButton); + string choice = ""; + if (ret == `no_feed) + choice = "No Feed"; + else if (ret == `onf) + choice = "OpenVAS NVT Feed"; + else if (ret == `gsf) + choice = "Greenbone Security Feed"; + + /* Check whether the feed-choice changed, do nothing if so */ + if (OpenvasSecurityScanner::feed_choice == choice) + ret = `write; + else + { + OpenvasSecurityScanner::feed_choice = choice; + if (choice == "No Feed") + { + ret = `no_feed; + } + else + { + ret = `fetch_new; + } + } + break; + + } + /* Do a feed sync */ + else if (ret == `feedsync_now) + { + break; + } + /* Activate GSF */ + else if (ret == `activate_gsf) + { + break; + } + /* Deactivate GSF */ + else if (ret == `deactivate_gsf) + { + OpenvasSecurityScanner::feed_choice = "No Feed"; + break; + } + /* Unknown */ + else + { + y2error("unexpected retcode: %1", ret); + continue; + } + } + + Wizard::RestoreBackButton (); + + return ret; +} + +/** + * Dialog to enter the location of the Greenbone Security Feed (key) files and scripts + * + * @return any dialog result + */ +any EnterGSFLocationDialog () { + string caption = _("Greenbone Security Feed installation"); + + + term contents = `VBox (`InputField(`id(`gsf_location), _("Path to directory containing the Greenbone Security Feed Files"), "")); + + Wizard::SetContentsButtons (caption, contents, + HELPS["activategsf"]:"", + Label::BackButton(), Label::NextButton()); + Wizard::DisableBackButton (); + + any ret = nil; + while (true) { + ret = UI::UserInput (); + if (ret == `abort) + { + break; + } + else if (ret == `next) + { + /* Assuming location is correct */ + any text = UI::QueryWidget(`id(`gsf_location), `Value); + OpenvasSecurityScanner::gsf_location = (string) text; + break; + } + else + { + y2error ("unexpected retcode: %1", ret); + continue; + } + } + + Wizard::RestoreBackButton (); + return ret; +} + +/** + * Dialog showing progress of disabling the OpenVAS Security Scanner Service. + * + * @return any dialog result + */ +any DisableOpenVASDialog () { + Wizard::RestoreHelp (HELPS["disableopenvas"]:""); + boolean ret = OpenvasSecurityScanner::DisableOpenVAS (); + return ret ? `next : `abort; +} + +/** + * Dialog showing progress of deactivating the Greenbone Security Feed. + * + * @return any dialog result + */ +any DeactivateGSFDialog () { + Wizard::RestoreHelp (HELPS["deactivategsf"]:""); /** TODO help */ + boolean ret = OpenvasSecurityScanner::DeactivateGSF (); + return ret ? `next : `abort; +} + + +/* EOF */ +} + Added: branches/SuSE-Code-11-Branch/openvas-security-scanner/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/openvas-s… ============================================================================== --- branches/SuSE-Code-11-Branch/openvas-security-scanner/src/helps.ycp (added) +++ branches/SuSE-Code-11-Branch/openvas-security-scanner/src/helps.ycp Fri Jan 22 11:15:47 2010 @@ -0,0 +1,131 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: include/openvas-security-scanner/helps.ycp + * Package: Configuration of openvas-security-scanner + * Summary: Help texts of all the dialogs + * Authors: Felix Wolfsteller <felix.wolfsteller(a)intevation.de> + * + * $**Id$ + */ + +{ + +textdomain "openvas-security-scanner"; + +/** + * All helps are here + */ +map HELPS = $[ + /* Help for main dialog */ + "configuration" : "<big>" + + _("OpenVAS Security Scanner Configuration") + + "</big>" + // Disable OpenVAS Security Scanner + + "" + _("Disable OpenVAS Security Scanner") + ": " + + _("Select \"Disable OpenVAS Security Scanner\" to switch off the OpenVAS Security Scanner Service. ") + + _("The datastores for Network Vulnerabilities (NVTs) will be deleted. This might take some time.") + // Enable and use OpenVAS NVT Feed + + "" + _("Enable and use OpenVAS NVT Feed") + ": " + + _("Select \"Enable and use OpenVAS NVT Feed\" to switch on the OpenVAS Security Scanner with the OpenVAS NVT Feed. ") + + _("The free-of-charge OpenVAS NVT Feed delivers the latest Network Vulnerability Tests (NVTs) with volunteer-based Quality Assurance. The NVT synchronisation uses RSYNC protocol. Please visit <tt>http://www.openvas.org/</tt> for more information.") + + _("Previous NVT datastores will be deleted before the initial synchronization is executed. This might take some time. ") + // Enable and use Greenbone Security Feed + + "" + _("Enable and use Greenbone Security Feed") + ": " + + _("Select \"Enable and use Greenbone Security Feed\" to switch on the OpenVAS Security Scanner with the Greenbone Security Feed. ") + + _("Note that this option is only available if you activated obtained and activated an access key for the Greenbone Security Feed. ") + + _("The subscription-based Greenbone Security Feed assures Network Vulnerability Tests (NVTs) of consistent quality, high availability and professional support. ") + + _("The NVT synchronisation uses SSH-secured RSYNC protocol. ") + + _("Previous NVT datastores will be deleted. This might take some time.") + // Activate Greenbone Security Feed Subscription + + "" + _("Activate Greenbone Security Feed Subscription") + ": " + + _("To obtain a access key for the Greenbone Security Feed, please visit <tt>http://greenbone.net/order/</tt>. ") + + _("Click on \"Activate Greenbone Security Feed\" and enter the path to the obtained access key files. ") + + _("The access key and synchronization script will then be installed and you can choose the \"Use Greenbone Security Feed\" option to use the OpenVAS Security Scanner with this feed.") + // Deactivate Greenbone Security Feed Subscription + + "" + _("Deactivate Greenbone Security Feed Subscription") + ": " + + _("This option is only available if you have previously activated your Greenbone Security Feed Subscription. ") + + _("If you select this option, previous NVT datastores, NVT selections and other feed related files will be deleted. This might take some time.") + // Synchronize with Feed now + + "" + _("Synchronize with Feed now") + ": " + + _("Will immediately start a synchronize with the selected feed. Note that this option is not available if you just changed the feed. ") + // Next + + "" + _("Next") + ": " + + _("Click on \"Next\" to synchronize with a newly chosen feed.") + + "", + + /* Help for the Activate Greenbone Security Feed dialog */ + "activategsf" : "<big>" + _("Activate Greenbone Security Feed") + "</big>" + + "" + _("If you already have obtained an access key, provide the path to these files in the text entry field.") + + "" + + _("If you do not have an access key to the Greenbone Security Feed, please visit <tt>http://greenbone.net/order/</tt> to obtain one. ") + + _("Enter the path to the access key files. ") + + _("The access key and synchronization script will then be installed and you can choose the \"Use Greenbone Security Feed\" option.") + + "", + + /* Help for the Deactivate Greenbone Security Feed dialog */ + "deactivategsf" : "<big>" + _("Deactivate Greenbone Security Feed") + "</big>" + + "" + _("The access key, the Feed synchronization script and the NVT datastores will be deleted.") + + "", + + /* Read dialog help 1/2 */ + "read" : _("<big>Initializing openvas-security-scanner Configuration</big> +Please wait... +") + + + /* Read dialog help 2/2 */ + _("<big>Aborting Initialization:</big> +Safely abort the configuration utility by pressing Abort now. +"), + + /* Write dialog help 1/2 */ + "write" : _("<big>Saving openvas-security-scanner Configuration</big> +Please wait... +") + + + /* Write dialog help 2/2 */ +_("<big>Aborting Saving:</big> +Abort the save procedure by pressing Abort. +An additional dialog informs whether it is safe to do so. + +"), + + "disableopenvas" : "<big>" + + _("Disabling the OpenVAS Security Scanner Service") + + "</big> " + + "" + + _("The service will be stopped and not start automatically after a reboot. ") + + _("The NVT datastores will be deleted, which might take some time. Click abort to abort this action.") + + "", + + "fetchfeed" : "<big>" + + _("Fetching a NVT Feed") + + "</big> " + + "" + + _("Before fetching the chosen feed, ") + + _("previous NVT datastores will be deleted, which might take some time. ") + + _("Note that in order to synchronize with a feed, the scanner service has to be stopped. It will be restarted once the synchronization is finished. ") + + _("Click abort to abort this action.") + + "" +]; + +/* EOF */ +} Added: branches/SuSE-Code-11-Branch/openvas-security-scanner/src/openvas-security-scanner.desktop URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/openvas-s… ============================================================================== --- branches/SuSE-Code-11-Branch/openvas-security-scanner/src/openvas-security-scanner.desktop (added) +++ branches/SuSE-Code-11-Branch/openvas-security-scanner/src/openvas-security-scanner.desktop Fri Jan 22 11:15:47 2010 @@ -0,0 +1,25 @@ +[Desktop Entry] +Type=Application +Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Security; + +X-KDE-ModuleType=Library +X-KDE-RootOnly=true +X-KDE-HasReadOnlyMode=true +X-KDE-Library=yast2 +X-SuSE-YaST-Call=openvas-security-scanner + +X-SuSE-YaST-Group=Security +X-SuSE-YaST-Argument= +X-SuSE-YaST-RootOnly=true +X-SuSE-YaST-AutoInst= +X-SuSE-YaST-Geometry= +X-SuSE-YaST-SortKey= +X-SuSE-YaST-AutoInstResource=openvas-security-scanner + +Icon=yast-openvas +Exec=/sbin/yast2 openvas-security-scanner + +Name=OpenVAS Security Scanner +GenericName=Configure the OpenVAS Security Scanner +X-KDE-SubstituteUID=true +StartupNotify=true Added: branches/SuSE-Code-11-Branch/openvas-security-scanner/src/openvas-security-scanner.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/openvas-s… ============================================================================== --- branches/SuSE-Code-11-Branch/openvas-security-scanner/src/openvas-security-scanner.ycp (added) +++ branches/SuSE-Code-11-Branch/openvas-security-scanner/src/openvas-security-scanner.ycp Fri Jan 22 11:15:47 2010 @@ -0,0 +1,76 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: clients/openvas-security-scanner.ycp + * Package: Configuration of openvas-security-scanner + * Summary: Main file + * Authors: Felix Wolfsteller <felix.wolfsteller(a)intevation.de> + * + * $**Id$ + * + * Main file for openvas-security-scanner configuration. Uses all other files. + */ + +{ + +/*** + * <h3>Configuration of openvas-security-scanner</h3> + */ + +textdomain "openvas-security-scanner"; + +/* The main () */ +y2milestone ("----------------------------------------"); +y2milestone ("OpenVAS Security Scanner module started"); + +import "Progress"; +import "Report"; +import "Summary"; + +import "CommandLine"; + +include "openvas-security-scanner/wizards.ycp"; + +map cmdline_description = $[ + "id" : "openvas-security-scanner", + "help" : _("Configuration of OpenVAS Security Scanner"), + "guihandler" : OpenvasSecurityScannerSequence, + "initialize" : OpenvasSecurityScanner::Read, + "finish" : OpenvasSecurityScanner::Write, + "actions" : $[], + "options" : $[], + "mappings" : $[] +]; + +/* Main ui function */ +any ret = nil; + +ret = CommandLine::Run (cmdline_description); +y2debug ("ret=%1", ret); + +/* Finish */ +y2milestone ("OpenVAS Security Scanner module finished"); +y2milestone ("----------------------------------------"); + +return ret; + +/* EOF */ +} Added: branches/SuSE-Code-11-Branch/openvas-security-scanner/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/openvas-s… ============================================================================== --- branches/SuSE-Code-11-Branch/openvas-security-scanner/src/wizards.ycp (added) +++ branches/SuSE-Code-11-Branch/openvas-security-scanner/src/wizards.ycp Fri Jan 22 11:15:47 2010 @@ -0,0 +1,153 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: include/openvas-security-scanner/wizards.ycp + * Package: Configuration of openvas-security-scanner + * Summary: Wizards definitions + * Authors: Felix Wolfsteller <felix.wolfsteller(a)intevation.de> + * + * $**Id$ + */ + +{ + +textdomain "openvas-security-scanner"; + +import "Sequencer"; +import "Wizard"; + +include "openvas-security-scanner/complex.ycp"; +include "openvas-security-scanner/dialogs.ycp"; + + +/** + * Main dialog workflow of the openvas-security-scanner configuration. + * + * @return Sequence result. + */ +any MainSequence () { + map aliases = $[ + "conf" : [ ``( ScannerConfigurationDialog () ), true], + "feed_sync" : [ ``( SyncDialog () ), true], + "enter_gsf" : [ ``( EnterGSFLocationDialog () ), true], + "activate_gsf" : [ ``( ActivateGSFDialog () ), true], + "deactivate_gsf" : [ ``( DeactivateGSFDialog () ), true] + ]; + + map sequence = $[ + "ws_start" : "conf", + "conf" : $[ + `abort : `abort, + `next : `next, + `feedsync_now : "feed_sync", + `activate_gsf : "enter_gsf", + `deactivate_gsf : "deactivate_gsf", + `no_feed : `no_feed, + `fetch_new : `fetch_new, + `write : `write + ], + "feed_sync" : $[ + `abort : `abort, + `next : "conf" + ], + "enter_gsf" : $[ + `abort : "conf", + `next : "activate_gsf" + ], + "activate_gsf" : $[ + `abort : "conf", + `next : "conf" + ], + "deactivate_gsf" : $[ + `abort : "conf", + `next : "conf" + ] + ]; + + any ret = Sequencer::Run (aliases, sequence); + + return ret; +} + +/** + * Workflow of the whole module + * @return sequence result + */ +any OpenvasSecurityScannerSequence () { + map aliases = $[ + "read" : [ ``( ReadDialog () ), true ], + "main" : ``( MainSequence () ), + "feed_fetch" : ``( FetchFeedDialog () ), + "enter_gsf" : ``( EnterGSFLocationDialog () ), + "fetch_new" : ``( FetchFeedDialog () ), + "no_feed" : ``( DisableOpenVASDialog () ), + "write" : [ ``( WriteDialog () ), true ] + ]; + + map sequence = $[ + "ws_start" : "read", + "read" : $[ + `abort : `abort, + `next : "main" + ], + "main" : $[ + `abort : `abort, + `feedsync_now : "feed_fetch", + `activate_gsf : "enter_gsf", + `fetch_new : "fetch_new", + `next : "write", + `no_feed : "no_feed", + `write : "write" + ], + "enter_gsf" : $[ + `abort : "main", + `next : "main" + ], + "feed_fetch" : $[ + `abort : "main", + `next : "main" + ], + "fetch_new" : $[ + `abort : "main", + `next : "write" + ], + "no_feed" : $[ + `abort : "main", + `next : "write" + ], + "write" : $[ + `abort : `abort, + `next : `next + ] + ]; + + Wizard::CreateDialog (); + + any ret = Sequencer::Run (aliases, sequence); + + UI::CloseDialog (); + return ret; +} + + +/* EOF */ +} + Added: branches/SuSE-Code-11-Branch/openvas-security-scanner/testsuite/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/openvas-s… ============================================================================== --- branches/SuSE-Code-11-Branch/openvas-security-scanner/testsuite/.cvsignore (added) +++ branches/SuSE-Code-11-Branch/openvas-security-scanner/testsuite/.cvsignore Fri Jan 22 11:15:47 2010 @@ -0,0 +1,11 @@ +Makefile +Makefile.in +site.exp +*.sum +*.log +tmp.out* +tmp.err* +tmp.log* +config +run +*.test Added: branches/SuSE-Code-11-Branch/openvas-security-scanner/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/openvas-s… ============================================================================== --- branches/SuSE-Code-11-Branch/openvas-security-scanner/testsuite/Makefile.am (added) +++ branches/SuSE-Code-11-Branch/openvas-security-scanner/testsuite/Makefile.am Fri Jan 22 11:15:47 2010 @@ -0,0 +1,21 @@ +# +# Makefile.am for .../testsuite +# +# Do not edit this file (Makefile.am) as it will be overwritten! +# + +AUTOMAKE_OPTIONS = dejagnu +EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) + +testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite + +all-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) + +clean-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) clean + +check-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) check + +# EOF Added: branches/SuSE-Code-11-Branch/openvas-security-scanner/testsuite/tests/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/openvas-s… ============================================================================== (empty) -- 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] r60477 - in /branches/SuSE-Code-11-Branch/openvas-security-scanner: ./ MAINTAINER Makefile.cvs RPMNAME VERSION configure.in.in yast2-openvas-security-scanner.spec.in
by openvasfelix＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: openvasfelix Date: Fri Jan 22 10:50:54 2010 New Revision: 60477 URL: http://svn.opensuse.org/viewcvs/yast?rev=60477&view=rev Log: Added first portion of OpenVAS Security Scanner YaST module. * openvas-security-scanner/, openvas-security-scanner/RPMNAME, openvas-security-scanner/VERSION, openvas-security-scanner/yast2-openvas-security-scanner.spec.in, openvas-security-scanner/Makefile.cvs, openvas-security-scanner/MAINTAINER, openvas-security-scanner/configure.in.in: New files, first portion of the OpenVAS Security Scanner module. Added: branches/SuSE-Code-11-Branch/openvas-security-scanner/ branches/SuSE-Code-11-Branch/openvas-security-scanner/MAINTAINER branches/SuSE-Code-11-Branch/openvas-security-scanner/Makefile.cvs branches/SuSE-Code-11-Branch/openvas-security-scanner/RPMNAME branches/SuSE-Code-11-Branch/openvas-security-scanner/VERSION branches/SuSE-Code-11-Branch/openvas-security-scanner/configure.in.in branches/SuSE-Code-11-Branch/openvas-security-scanner/yast2-openvas-security-scanner.spec.in Added: branches/SuSE-Code-11-Branch/openvas-security-scanner/MAINTAINER URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/openvas-s… ============================================================================== --- branches/SuSE-Code-11-Branch/openvas-security-scanner/MAINTAINER (added) +++ branches/SuSE-Code-11-Branch/openvas-security-scanner/MAINTAINER Fri Jan 22 10:50:54 2010 @@ -0,0 +1 @@ +Felix Wolfsteller <felix.wolfsteller(a)intevation.de> Added: branches/SuSE-Code-11-Branch/openvas-security-scanner/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/openvas-s… ============================================================================== --- branches/SuSE-Code-11-Branch/openvas-security-scanner/Makefile.cvs (added) +++ branches/SuSE-Code-11-Branch/openvas-security-scanner/Makefile.cvs Fri Jan 22 10:50:54 2010 @@ -0,0 +1,22 @@ +# +# Makefile.cvs +# +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + +configure: all + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) + +all: + y2tool y2autoconf + y2tool y2automake + autoreconf --force --install + +install: configure + make + make install + +reconf: all + ./config.status --recheck + ./config.status Added: branches/SuSE-Code-11-Branch/openvas-security-scanner/RPMNAME URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/openvas-s… ============================================================================== --- branches/SuSE-Code-11-Branch/openvas-security-scanner/RPMNAME (added) +++ branches/SuSE-Code-11-Branch/openvas-security-scanner/RPMNAME Fri Jan 22 10:50:54 2010 @@ -0,0 +1 @@ +yast2-openvas-security-scanner Added: branches/SuSE-Code-11-Branch/openvas-security-scanner/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/openvas-s… ============================================================================== --- branches/SuSE-Code-11-Branch/openvas-security-scanner/VERSION (added) +++ branches/SuSE-Code-11-Branch/openvas-security-scanner/VERSION Fri Jan 22 10:50:54 2010 @@ -0,0 +1 @@ +2.15.0 Added: branches/SuSE-Code-11-Branch/openvas-security-scanner/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/openvas-s… ============================================================================== --- branches/SuSE-Code-11-Branch/openvas-security-scanner/configure.in.in (added) +++ branches/SuSE-Code-11-Branch/openvas-security-scanner/configure.in.in Fri Jan 22 10:50:54 2010 @@ -0,0 +1,12 @@ +## YCP module configure.in.in + +## Initialize +@YAST2-INIT-COMMON@ +@YAST2-INIT-YCP@ + +## some common checks +@YAST2-CHECKS-COMMON@ +@YAST2-CHECKS-YCP@ + +## and generate the output... +@YAST2-OUTPUT@ Added: branches/SuSE-Code-11-Branch/openvas-security-scanner/yast2-openvas-security-scanner.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/openvas-s… ============================================================================== --- branches/SuSE-Code-11-Branch/openvas-security-scanner/yast2-openvas-security-scanner.spec.in (added) +++ branches/SuSE-Code-11-Branch/openvas-security-scanner/yast2-openvas-security-scanner.spec.in Fri Jan 22 10:50:54 2010 @@ -0,0 +1,31 @@ +@HEADER-COMMENT@ + +@HEADER@ +Requires: yast2 +BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite + +BuildArchitectures: noarch + +Summary: Configuration of openvas-security-scanner + +%description +- + +@PREP@ + +@BUILD@ + +@INSTALL@ + +@CLEAN@ + +%files +%defattr(-,root,root) +%dir @yncludedir@/openvas-security-scanner +@yncludedir@/openvas-security-scanner/* +@clientdir@/openvas-security-scanner.ycp +@clientdir@/openvas-security-scanner_*.ycp +@moduledir@/OpenvasSecurityScanner.* +@moduledir@/OpenvasSecurityScanner2.* +@desktopdir@/openvas-security-scanner.desktop +%doc @docdir@ -- 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] r60476 - /tags/branch-Code-11-SP1-2_17_29/registration/
by jdsn＠svn.opensuse.org 21 Jan '10

21 Jan '10

Author: jdsn Date: Thu Jan 21 19:04:25 2010 New Revision: 60476 URL: http://svn.opensuse.org/viewcvs/yast?rev=60476&view=rev Log: Created tag branch-Code-11-SP1-2_17_29 for registration Added: tags/branch-Code-11-SP1-2_17_29/registration/ (props changed) - copied from r60475, branches/SuSE-Code-11-SP1-Branch/registration/ -- 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] r60475 - /branches/SuSE-Code-11-SP1-Branch/registration/src/clients/inst_suse_register.ycp
by jdsn＠svn.opensuse.org 21 Jan '10

21 Jan '10

Author: jdsn Date: Thu Jan 21 18:29:59 2010 New Revision: 60475 URL: http://svn.opensuse.org/viewcvs/yast?rev=60475&view=rev Log: only reinitialize once Modified: branches/SuSE-Code-11-SP1-Branch/registration/src/clients/inst_suse_register.ycp Modified: branches/SuSE-Code-11-SP1-Branch/registration/src/clients/inst_suse_register.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/regis… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/src/clients/inst_suse_register.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/src/clients/inst_suse_register.ycp Thu Jan 21 18:29:59 2010 @@ -673,8 +673,6 @@ Register::smt_server_cert = curRegCert; y2milestone("New registration server: %1", curRegURL); y2milestone("New registration server CA certificate location: %1", curRegCert); - // run setup again, make sure settings get reset (maybe registration was already initalized and an error occurred) (bnc#557194) - Register::setupRegistrationServer(nil); status=true; break; } -- 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] r60474 - in /trunk/scanner: VERSION package/yast2-scanner.changes src/Scanner.ycp src/dialogs.ycp src/helps.ycp
by jsmeix＠svn.opensuse.org 21 Jan '10

21 Jan '10

Author: jsmeix Date: Thu Jan 21 17:45:07 2010 New Revision: 60474 URL: http://svn.opensuse.org/viewcvs/yast?rev=60474&view=rev Log: - V 2.19.1 - Adapted to no longer try to install the proprietary packages iscan, iscan-proprietary-drivers, and iscan-firmware. Instead show a meaningful user information when one of those Epson models is to be set up which require the proprietary Iscan software so that the user can download and install the right packages from Avasys on his own (see Novell/Suse Bugzilla bnc#569917). - Reduced too long help text 'regarding firewall' but added a link to 'SDB:CUPS and SANE Firewall settings' at http://en.opensuse.org/SDB:CUPS_and_SANE_Firewall_settings (see Novell/Suse Bugzilla bnc#551282). Modified: trunk/scanner/VERSION trunk/scanner/package/yast2-scanner.changes trunk/scanner/src/Scanner.ycp trunk/scanner/src/dialogs.ycp trunk/scanner/src/helps.ycp Modified: trunk/scanner/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/VERSION?rev=60474&r1=604… ============================================================================== --- trunk/scanner/VERSION (original) +++ trunk/scanner/VERSION Thu Jan 21 17:45:07 2010 @@ -1 +1 @@ -2.19.0 +2.19.1 Modified: trunk/scanner/package/yast2-scanner.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/package/yast2-scanner.ch… ============================================================================== --- trunk/scanner/package/yast2-scanner.changes (original) +++ trunk/scanner/package/yast2-scanner.changes Thu Jan 21 17:45:07 2010 @@ -1,9 +1,26 @@ +------------------------------------------------------------------- +Thu Jan 21 17:36:27 CET 2010 - jsmeix(a)suse.de + +- V 2.19.1 +- Adapted to no longer try to install the proprietary packages + iscan, iscan-proprietary-drivers, and iscan-firmware. + Instead show a meaningful user information + when one of those Epson models is to be set up + which require the proprietary Iscan software + so that the user can download and install + the right packages from Avasys on his own + (see Novell/Suse Bugzilla bnc#569917). +- Reduced too long help text 'regarding firewall' but + added a link to 'SDB:CUPS and SANE Firewall settings' at + http://en.opensuse.org/SDB:CUPS_and_SANE_Firewall_settings + (see Novell/Suse Bugzilla bnc#551282). + ------------------------------------------------------------------ Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz - Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su where root privileges are needed, removed X-KDE-SubstituteUID key - (bnc#540627) + (see Novell/Suse Bugzilla bnc#540627 and bnc#550073). ------------------------------------------------------------------- Wed Dec 23 15:21:13 CET 2009 - jsmeix(a)suse.de Modified: trunk/scanner/src/Scanner.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/src/Scanner.ycp?rev=6047… ============================================================================== --- trunk/scanner/src/Scanner.ycp (original) +++ trunk/scanner/src/Scanner.ycp Thu Jan 21 17:45:07 2010 @@ -361,42 +361,29 @@ * Test whether the package is installed (Package::Installed) and * if not then test whether the package is available to be installed (Package::Available) and * if yes then install it (Package::Install). - * The packages iscan and iscan-free require special handling: - * iscan and iscan-free conflict with each other, - * iscan is only available on i386 compatible architectures - * because iscan contains proprietary binary-only i386-only software, - * some scanners require the non-free software. * @param package_name string of the package name * @return true on success */ boolean TestAndInstallPackage( string package_name ) { // First of all the multi-line string because such strings cannot be indented: string iscan_message = - // Message of a Popup::Error - // Do not change or translate "iscan", it is a package name. - // Do not change or translate "i386", it is an architecture name. -_("The package iscan should be installed -but it contains proprietary binary-only i386-only software. -Therefore it is only available for i386-compatible architectures. -Some scanners are also supported by another driver. -If you really want to install iscan, you must do it manually. -"); - string iscan_64bit_message = - // Do not change or translate "iscan", it is a package name. - // Do not change or translate "x86_64", it is an architecture name. - // Do not change or translate "AMD", it is a manufacturer name. - // Do not change or translate "scanimage", it is a program name. - // Do not change or translate "xscanimage", it is a program name. - // Do not change or translate "xsane", it is a program name. - // Do not change or translate "kooka", it is a program name. -_("Iscan is only available as 32-bit software. -On AMD 64-bit (x86_64) systems the scanner driver in the iscan package -works only if also the scanning user frontend is 32-bit software. -You can use the special frontend /usr/bin/iscan for Epson scanners -which is included in the iscan package. -If you like to use a standard frontend like scanimage, xscanimage, xsane, or kooka, -you must explicitly install the 32-bit package version -(i.e. get the package from the right media or repository). + // Message of a Popup::Error for models which require + // the third-party Image Scan (IScan) driver software from Epson/Avasys. + // Do not change or translate "Image Scan", it is a driver software name. + // Do not change or translate "Avasys, it is a manufacturer name. +_("The third-party Image Scan driver software from Avasys is required. +The Image Scan driver software is made and provided by Avasys +http://avasys.jp/eng/linux_driver/ +where RPM packages for 32-bit (i386) and 64-bit (x86_64) architecture +can be downloaded (if you accept the Avasys and Epson license agreements). +The Image Scan driver contains proprietary binary-only software. +For some models it is only available for 32-bit (i386) architecture +which does not work when you have a 64-bit system installation. +Some scanners are also supported by another (free-software) driver. +When your scanner model requires a DFSG non-free (proprietary) module, +you have to download and install two packages from Avasys: +The 'iscan' package for the base software and an additional +model dependant 'iscan-plugin' package with the proprietary module. "); if( Package::Installed( package_name ) ) { return true; @@ -405,23 +392,16 @@ && Package::Installed( "iscan" ) ) { // Each scanner which is supported by iscan-free is also supported by iscan. + // 'iscan' is the package name of the primary RPM which is provided by Avasys + // (there are also additional iscan-plugin-<model-name> provided by Avasys). // If iscan is already installed, there is no need to switch to iscan-free. - // Because iscan contains proprietary software it is not installed by default. - // Therefore the user must have had installed iscan intentionally. + // Because iscan contains proprietary software it is not provided by openSUSE. + // Therefore the user must have had downloaded it from Avasys + // and then installed intentionally and manually. return true; } if( "iscan" == package_name ) - { // Some scanners which are supported by iscan are not supported by iscan-free. - // If iscan-free is already installed, it would have to be replaced by iscan. - // Because iscan contains proprietary software this would be a replacement of free software - // by proprietary software and this cannot be done in an automated way (as it would happen here). - // Furthermore iscan is only available on i386 compatible architectures (on x86_64 only as 32-bit). - // Finally on x86_64 the 32-bit iscan software cannot be used with the usual scanning frontends. - // Therefore there is only a message and the user must do the installation manually. - y2milestone( "No automated installation of proprietary iscan." ); - if( Arch::x86_64() ) - { iscan_message = iscan_message + "\n" + iscan_64bit_message; - } + { y2milestone( "Third-party Image Scan driver software from Avasys required." ); Popup::Error( iscan_message ); return false; } @@ -1376,9 +1356,15 @@ integer database_index = -1; string model_string = ""; string interface_and_usbid_string = ""; + string package_string = ""; string status_string = ""; // Scanner model list firmware entry for models which require a firmware upload: string firmware_string = _("Firmware upload required."); + // Scanner model list entry for models which require + // the third-party Image Scan (IScan) driver software from Epson/Avasys. + // Do not change or translate "Image Scan", it is a driver software name. + // Do not change or translate "Avasys, it is a manufacturer name. + string iscan_string = _("Third-party Image Scan driver software from Avasys required."); list< term > model_items = []; foreach( map< string, string > database_entry, database, @@ -1446,6 +1432,19 @@ if( "" != comment ) { comment = "[" + comment + "]"; } + // Build a translatable package_string: + if( "iscan" == package ) + { package_string = iscan_string; + } + else + { package_string = sformat( // Scanner model list package name entry: + // %1 will be replaced by the RPM package name + // which provides the driver for the particular model: + _("Package %1"), + package + ); + package_string = "(" + package_string + ")"; + } // Build a translatable status_string: // These are the exiting status values according to the *desc files in sane-1.0.15 (9.3) // and how often each value apppears: @@ -1460,10 +1459,8 @@ if( "good" == status ) { status_string = sformat( // Scanner model list status entry for "good" supported models: // %1 will be replaced by the backend (scanner driver) name - // %2 will be replaced by the package name which provides the backend - _("Driver %1 (package %2) provides good functionality."), - backend, - package + _("Driver %1 provides good functionality."), + backend ); } else @@ -1476,10 +1473,8 @@ { status_string = sformat( // Scanner model list status entry for models // which are listed as "unsupported" for a particular driver: // %1 will be replaced by the backend (scanner driver) name - // %2 will be replaced by the package name which provides the backend - _("This scanner is not supported by the driver %1 (package %2)."), - backend, - package + _("This scanner is not supported by the driver %1."), + backend ); } } @@ -1487,50 +1482,40 @@ { if( "complete" == status ) { status_string = sformat( // Scanner model list status entry for "complete" supported models: // %1 will be replaced by the backend (scanner driver) name - // %2 will be replaced by the package name which provides the backend - _("Driver %1 (package %2) provides complete functionality."), - backend, - package + _("Driver %1 provides complete functionality."), + backend ); } else { if( "untested" == status ) { status_string = sformat( // Scanner model list status entry for "untested" models: // %1 will be replaced by the backend (scanner driver) name - // %2 will be replaced by the package name which provides the backend - _("Driver %1 (package %2) may work, but was not tested."), - backend, - package + _("Driver %1 may work, but was not tested."), + backend ); } else { if( "basic" == status ) { status_string = sformat( // Scanner model list status entry for "basic" supported models: // %1 will be replaced by the backend (scanner driver) name - // %2 will be replaced by the package name which provides the backend - _("Driver %1 (package %2) provides basic functionality."), - backend, - package + _("Driver %1 provides basic functionality."), + backend ); } else { if( "minimal" == status ) { status_string = sformat( // Scanner model list status entry for "minimal" supported models: // %1 will be replaced by the backend (scanner driver) name - // %2 will be replaced by the package name which provides the backend - _("Driver %1 (package %2) provides minimal functionality."), - backend, - package + _("Driver %1 provides minimal functionality."), + backend ); } else { status_string = sformat( // Fallback scanner model list status entry for models // which are listed but without a known support status: // %1 will be replaced by the backend (scanner driver) name - // %2 will be replaced by the package name which provides the backend - _("Driver %1 (package %2) may work, but the functionality is unknown."), - backend, - package + _("Driver %1 may work, but the functionality is unknown."), + backend ); } } @@ -1540,10 +1525,11 @@ } if( "required" == firmware ) { // The model_string for supported models which require a firmware upload: - model_string = sformat( "%1 %2 : %3 %4 %5 %6", + model_string = sformat( "%1 %2 : %3 %4 %5 %6 %7", manufacturer, model, firmware_string, + package_string, status_string, interface_and_usbid_string, comment @@ -1551,9 +1537,10 @@ } else { // The model_string for all other supported and unsupported models: - model_string = sformat( "%1 %2 : %3 %4 %5", + model_string = sformat( "%1 %2 : %3 %4 %5 %6", manufacturer, model, + package_string, status_string, interface_and_usbid_string, comment @@ -1750,9 +1737,9 @@ Because firmware is licensed by the scanner manufacturer, we cannot distribute it. Usually the firmware file is stored somewhere on the manufacturer's CD. -Alternatively, it may be possible to download it from the manufacturer's Web site. +Alternatively, it may be possible to download it from the manufacturer's web site. Ask the manufacturer how to get the firmware file for your particular scanner. -Find additional useful information on the SANE Web site at +Find additional useful information on the SANE web site at http://www.sane-project.org/. After you get the firmware file, you must configure the driver manually. @@ -1899,16 +1886,20 @@ && user_confirmation ) { if( ! TestAndInstallPackage( package_name ) ) - { Popup::AnyMessage( // Header of a Popup::AnyMessage: - _("Required Package Not Installed"), - // Body of a Popup::AnyMessage where - // %1 will be replaced by the backend name - // %2 will be replaced by the package name - // Only a simple message because before there was a dialog - // which let the user install the package so that this message is shown - // if the user has explicitly rejected to install it. - sformat( _("The driver %1 requires the package %2."), backend_name, package_name ) - ); + { // There is already sufficient user information regarding + // the third-party Image Scan driver software from Avasys: + if( package_name != "iscan" ) + { Popup::AnyMessage( // Header of a Popup::AnyMessage: + _("Required Package Not Installed"), + // Body of a Popup::AnyMessage where + // %1 will be replaced by the backend name + // %2 will be replaced by the package name + // Only a simple message because before there was a dialog + // which let the user install the package so that this message is shown + // if the user has explicitly rejected to install it. + sformat( _("The driver %1 requires the package %2."), backend_name, package_name ) + ); + } Progress::Title( // Last progress step progress bar title when the Progress was aborted: _("Aborted") ); Modified: trunk/scanner/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/src/dialogs.ycp?rev=6047… ============================================================================== --- trunk/scanner/src/dialogs.ycp (original) +++ trunk/scanner/src/dialogs.ycp Thu Jan 21 17:45:07 2010 @@ -707,9 +707,13 @@ } continue; } - // The epkowa backend in the package iscan is only available for i386-compatible architectures. // The epkowa backend in the package iscan-free is available for all architectures. - // Some scanners require additionally proprietary libraries which are only in iscan. + // In contrast the epkowa backend in the package iscan which is provided by Avasys + // is only available for i386-compatible architectures: + // True 32-bit i386 and also 64-bit x86_64. + // For some models it might be only available for 32-bit i386 architecture. + // Some scanners require additionally proprietary libraries which are + // provided by Avasys as additional model dependant iscan-plugin-<model-name> RPMs. // For those scanners there is in the database "backend"="epkowa" and "package"="iscan". // The scanners which work with iscan-free have "backend"="epkowa" and "package"="iscan-free". // It would be possible to test for non-i386-compatible architecture in the ModelItems function @@ -731,9 +735,8 @@ // Body of a Popup::AnyMessage when the epkowa driver was selected // on a non-i386-compatible architecture (i.e. neither i386 nor x86_64). // Do not change or translate "epkowa", it is a driver name. - // Do not change or translate "iscan", it is a package name. // Do not change or translate "i386", it is an architecture name. - _("The epkowa driver (package iscan) is only available for i386-compatible architectures.") + _("The epkowa driver is only available for i386-compatible architectures (32-bit i386 and also 64-bit x86_64).") ); continue; } @@ -743,7 +746,7 @@ // Body of a Popup::ContinueCancelHeadline // when the epkowa driver was selected on x86_64. // Do not change or translate "epkowa", it is a driver name. - _("The epkowa driver may cause problems on 64-bit architectures.\nSee our support database for details.") + _("The epkowa driver may cause problems on 64-bit x86_64 architecture.") ) ) { // The user has decided to cancel the set up of the epkowa backend on x86_64: Modified: trunk/scanner/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/src/helps.ycp?rev=60474&… ============================================================================== --- trunk/scanner/src/helps.ycp (original) +++ trunk/scanner/src/helps.ycp Thu Jan 21 17:45:07 2010 @@ -196,14 +196,11 @@ If you press Back, the driver is deactivated. ") + // ConfigureBackend dialog help 2/4: -// Do not change or translate "iscan", it is a package name. -// Do not change or translate "i386", it is an architecture name. _(" <big>Additional Packages</big> If the package that provides the driver is not yet installed, an appropriate dialog is shown to install the package. -Such packages may not be available for all architectures -(for example, the iscan package is only available for i386 architectures). +Such packages may not be available for all architectures. ") + // ConfigureBackend dialog help 3/4: _(" @@ -271,7 +268,7 @@ on your host against unwanted access via network. For using scanners via network the SANE network daemon (the saned) is the server process which must run so that remote clients -can access scanners which are connected to your local host. +can access scanners which are connected to your local host. Client hosts contact the saned via the sane-port (TCP port 6566) but scanning data is transferred via an additional random port. Therefore only port 6566 is not sufficient for scanning via network. -- 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] r60473 - in /trunk/storage: package/ storage/src/include/ storage/src/modules/
by aschnell＠svn.opensuse.org 21 Jan '10

21 Jan '10

Author: aschnell Date: Thu Jan 21 17:32:04 2010 New Revision: 60473 URL: http://svn.opensuse.org/viewcvs/yast?rev=60473&view=rev Log: - implemented moving of newly created partitions (see bnc #541034) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-dialogs.ycp trunk/storage/storage/src/include/ep-hd-dialogs.ycp trunk/storage/storage/src/include/ep-hd-lib.ycp trunk/storage/storage/src/include/ep-hd.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 Thu Jan 21 17:32:04 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jan 21 17:28:48 CET 2010 - aschnell(a)suse.de + +- implemented moving of newly created partitions (see bnc #541034) + +------------------------------------------------------------------- Tue Jan 19 14:14:26 CET 2010 - fehr(a)suse.de - allow to use cylinder 0 for partition (bnc #571749) Modified: trunk/storage/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-d… ============================================================================== --- trunk/storage/storage/src/include/ep-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-dialogs.ycp Thu Jan 21 17:32:04 2010 @@ -622,7 +622,8 @@ heading = sformat(_("Resize Partition %1"), device); cyl_size = disk["cyl_size"]:1; - free_cyl_after = Storage::FreeCylindersAfterPartition(device); + integer free_cyl_before = 0; + Storage::FreeCylindersAroundPartition(device, free_cyl_before, free_cyl_after); min_size_k = Integer::Max([ min_size_k, cyl_size / 1024 ]); max_size_k = size_k + (cyl_size * free_cyl_after) / 1024; Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-dialogs.ycp Thu Jan 21 17:32:04 2010 @@ -340,11 +340,99 @@ } + boolean DlgMovePartition(map<string, any>& part) + { + string device = part["device"]:"error"; + + integer free_cyl_before = 0; + integer free_cyl_after = 0; + + Storage::FreeCylindersAroundPartition(device, free_cyl_before, free_cyl_after); + + if (free_cyl_before == 0 && free_cyl_after == 0) + { + // error popup text, %1 is replace with name of partition + Popup::Error(sformat(_("No space to moved partition %1."), device)); + return false; + } + + integer move = 0; + + if (free_cyl_before > 0 && free_cyl_after == 0) + { + // popup text, %1 is replace with name of partition + if (!Popup::YesNo(sformat(_("Move partition %1 forward?"), device))) + return false; + + move = -free_cyl_before; + } + else if (free_cyl_before == 0 && free_cyl_after > 0) + { + // popup text, %1 is replace with name of partition + if (!Popup::YesNo(sformat(_("Move partition %1 backward?"), device))) + return false; + + move = free_cyl_after; + } + else if (free_cyl_before > 0 && free_cyl_after > 0) + { + UI::OpenDialog(`opt(`decorated), + Greasemonkey::Transform( + `VBox( + `MarginBox(2, 0.4, + `RadioButtonGroup(`id(`directions), + `VBox( + // popup text, %1 is replace with name of partition + `Label(sformat(_("Move partition %1?"), device)), + // radio button text + `LeftRadioButton(`id(`forward), _("Forward"), true), + // radio button text + `LeftRadioButton(`id(`backward), _("Backward")) + ))), + `ButtonBox( + `PushButton(`id(`cancel), `opt(`cancelButton), Label::CancelButton()), + `PushButton(`id(`ok), `opt(`default, `okButton), Label::OKButton()) + ) + ) + ) + ); + + symbol widget = (symbol) UI::UserInput(); + + symbol direction = (symbol) UI::QueryWidget(`id(`directions), `Value); + + UI::CloseDialog(); + + if (widget != `ok) + return false; + + switch (direction) + { + case `forward: + move = -free_cyl_before; + break; + + case `backward: + move = free_cyl_after; + break; + } + } + + if (move == 0) + return false; + + part["region", 0] = part["region", 0]:0 + move; + y2milestone("part:%1", part); + return true; + } + + boolean DlgResizePartition(map<string, any> &data, map <string, any> disk) { return DlgResize(data, disk); } + boolean ConfirmPartitionsDelete( string disk, list<string> pnames ) { return ConfirmRecursiveDelete( disk, pnames, Modified: trunk/storage/storage/src/include/ep-hd-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-lib.ycp Thu Jan 21 17:32:04 2010 @@ -269,6 +269,52 @@ } + void EpMovePartition(string device) + { + if (device == nil) + { + // error popup + Popup::Error(_("No partition selected.")); + return; + } + + map<string, map> target_map = Storage::GetTargetMap(); + map<string, any> disk = Storage::GetDisk(target_map, device); + map<string, any> part = Storage::GetPartition(target_map, device); + + if (disk["readonly"]:false) + { + Popup::Error(Partitions::RdonlyText(disk["device"]:"", true)); + return; + } + + if (!part["create"]:false) + { + // error popup, %1 is replace by partition device name, e.g. /dev/sdb1 + Popup::Error(sformat(_("The partition %1 is already created on disk +and cannot be moved."), device)); + return; + } + + if (part["type"]:`primary == `extended) + { + // error popup text + Popup::Error(_("An extended partition cannot be moved.")); + return; + } + + if (DlgMovePartition(part)) + { + if (Storage::UpdatePartition(device, part["region", 0]:0, part["region", 1]:0)) + { + UpdateMainStatus(); + TreePanel::Create(); + UpdateTableFocus(device); + } + } + } + + void EpResizePartition(string device) { if (device == nil) @@ -366,11 +412,11 @@ string mypart_table_type = target_map[ device, "label" ]:Storage::DefaultDiskLabel( mysize ); // helptext - string helptext = _("Select one or more (if available) hard disks -that will have the same partition layout as -this disk. + string helptext = _("Select one or more (if available) hard disks +that will have the same partition layout as +this disk. Disks marked with '*' sign contain one or -more partitions. After cloning, these +more partitions. After cloning, these partitions will be deleted."); list <string> AvailableTargetDisks() @@ -379,7 +425,7 @@ filter( string dev, map props, target_map, { return dev != device && Storage::IsDiskType( props["type"]:`CT_UNKNOWN ) && - isempty(props["used_by"]:[]) && + isempty(props["used_by"]:[]) && props["cyl_size"]:0 == mycyl_size; }); @@ -389,8 +435,8 @@ foreach( string dev, map props, filtered_target_map,{ if( props["size_k"]:0 >= mysize ) - items = add(items, dev); - else + items = add(items, dev); + else y2milestone("%1 is smaller than needed, skipping it", device); }); @@ -418,7 +464,7 @@ } if (isempty(myparts)) { - Popup::Error(_("There are no partitions on this disk (a clonable + Popup::Error(_("There are no partitions on this disk (a clonable disk must have at least one partition). Create some partitions before cloning the disk.")); return; @@ -427,7 +473,7 @@ list <string> mydisks = AvailableTargetDisks(); if (isempty(mydisks)) { - Popup::Error("This disk cannot be cloned. There are no suitable + Popup::Error("This disk cannot be cloned. There are no suitable disks that could have the same partitioning layout."); return; } @@ -486,7 +532,7 @@ }); //if there is anything to delete, ask user if s/he really wants to delete - if ( !isempty(partitions_to_delete) && + if ( !isempty(partitions_to_delete) && !ConfirmDeletePartitions( partitions_to_delete )) { ret = nil; continue; @@ -519,10 +565,10 @@ foreach( map one_partition, myparts, { map next = Storage::NextPartition( this_disk, one_partition["type"]:`none); - Storage::CreatePartition( this_disk, next["device"]:"error", + Storage::CreatePartition( this_disk, next["device"]:"error", one_partition["type"]:`primary, one_partition["fsid"]: Partitions::fsid_native, - one_partition["region",0]:0, one_partition["region",1]:0, + one_partition["region",0]:0, one_partition["region",1]:0, one_partition["mountby"]:Storage::GetMountBy(device) ); //FIXME: ChangeVolumeProperties too? }); Modified: trunk/storage/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd.ycp (original) +++ trunk/storage/storage/src/include/ep-hd.ycp Thu Jan 21 17:32:04 2010 @@ -34,6 +34,7 @@ void EpContextMenuHdPartition(string device) { symbol widget = ContextMenu::Simple([ `item(`id(`edit), _("Edit")), + `item(`id(`move), _("Move")), `item(`id(`resize), _("Resize")), `item(`id(`delete), _("Delete")) ]); @@ -43,6 +44,10 @@ EpEditPartition(device); break; + case `move: + EpMovePartition(device); + break; + case `resize: EpResizePartition(device); break; @@ -60,6 +65,8 @@ // push button text `PushButton(`id(`edit),`opt(`key_F4), _("Edit...")), // push button text + `PushButton(`id(`move), `opt(`key_F7), _("Move...")), + // push button text `PushButton(`id(`resize), `opt(`key_F6), _("Resize...")), // push button text `PushButton(`id(`delete), `opt(`key_F5), _("Delete...")) @@ -100,6 +107,15 @@ EpEditPartition( device ); break; + case `move: + if (is_disk) + // error popup + Popup::Error(_("Hard disks, BIOS RAIDs and multipath +devices cannot be moved.")); + else + EpMovePartition(device); + break; + case `resize: if (is_disk) // error popup 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 Thu Jan 21 17:32:04 2010 @@ -2153,6 +2153,7 @@ return( ret==0 ); } + global boolean UpdatePartition( string device, integer start, integer len ) { y2milestone( "UpdatePartition device:%1 start:%2 len:%3", @@ -4388,31 +4389,14 @@ } -global integer FreeCylindersAfterPartition(string device) +global boolean FreeCylindersAroundPartition(string device, integer& free_before, integer& free_after) { - integer ret = 0; - if (LibStorage::StorageInterface::freeCylindersAfterPartition(sint, device, ret) != 0) - ret = 0; - y2milestone("FreeCylindersAfterPartition ret:%1", ret); + boolean ret = LibStorage::StorageInterface::freeCylindersAroundPartition(sint, device, free_before, free_after) == 0; + y2milestone("FreeCylindersAfterPartition ret:%1 free_before:%2 free_after:%3", ret, free_before, free_after); return ret; } -global define boolean CheckNextCreated( map disk, list region ) - ``{ - boolean ret = false; - integer cylinder = region[0]:0 + region[1]:0; - foreach(map part, disk["partitions"]:[], ``{ - if( part["region",0]:0 == cylinder && part["create"]:false ) - { - ret = true; - } - }); - y2milestone( "CheckNextCreated region:%1 ret:%2", region, ret ); - return( ret ); - } - - global string PathToDestdir(string p) { if (Installation::scr_destdir != "/") @@ -5013,125 +4997,6 @@ } -global define void AdaptResize( string maindev, list region, integer schange ) - ``{ - map<string,map> tg = GetTargetMap(); - list<map> partitions = tg[maindev,"partitions"]:[]; - integer cylinder = region[0]:0 + region[1]:0; - boolean found = false; - integer index = -1; - integer e_idx = -1; - list<integer> idx_list = []; - map part = (map) find(map p, partitions, - ``(p["region",0]:0 == cylinder && p["create"]:false)); - y2milestone( "AdaptResize %1 reg %2 change %3", maindev, region, schange ); - if( part != nil ) - { - found = false; - index = 0; - foreach(map p, partitions, - ``{ - if( p["region",0]:0 == cylinder && p["create"]:false ) - { - found = true; - } - else if( !found ) - { - index = index + 1; - } - }); - if( partitions[index,"type"]:`primary == `extended ) - { - e_idx = index; - found = false; - index = 0; - foreach(map p, partitions, - ``{ - if( p["region",0]:0 == cylinder && p["create"]:false && - p["type"]:`primary != `extended ) - { - found = true; - part = p; - } - else if( !found ) - { - index = index + 1; - } - }); - } - cylinder = part["region",0]:0 + part["region",1]:0; - y2milestone( "AdaptResize part:%1", part ); - y2milestone( "AdaptResize index:%1 e_idx:%2 cylinder:%3", index, e_idx, - cylinder ); - map pnew = (map) find( map p, partitions, - ``( p["region",0]:0 == cylinder && - p["create"]:false )); - y2milestone( "AdaptResize pnew:%1", pnew ); - while( pnew != nil && - (part["mount"]:"" == Partitions::BootMount() || - part["fsid"]:0==Partitions::fsid_swap || - part["region",1]:0 < (schange<0?(-1*schange):schange)) ) - { - y2milestone( "AdaptResize pnew:%1", pnew ); - part = pnew; - idx_list = add( idx_list, index ); - y2milestone( "AdaptResize index:%1 idx_list:%2", index, idx_list ); - found = false; - index = 0; - foreach(map p, partitions, ``{ - y2milestone( "found:%1 index:%2 p=%3", found, index, p ); - if( p["nr"]:0 == pnew["nr"]:0 ) - { - found = true; - } - else if( !found ) - { - index = index + 1; - } - }); - cylinder = part["region",0]:0 + part["region",1]:0; - pnew = (map) find( map p, partitions, - ``( p["region",0]:0 == cylinder && - p["create"]:false )); - } - y2milestone( "AdaptResize idx:%1 list:%2", index, idx_list ); - - foreach(integer num, idx_list, ``{ - partitions[num,"region",0] = partitions[num,"region",0]:0 - schange; - UpdatePartition( partitions[num,"device"]:"", partitions[num,"region",0]:0, - partitions[num,"region",1]:1 ); - }); - partitions[index,"region",0] = partitions[index,"region",0]:0 - schange; - partitions[index,"region",1] = partitions[index,"region",1]:0 + schange; - if( partitions[index,"region",1]:0 <= 0 ) - { - partitions[index,"region",1] = 1; - } - y2milestone( "AdaptResize increase p:%1", partitions[index]:$[] ); - UpdatePartition( partitions[index,"device"]:"", partitions[index,"region",0]:0, - partitions[index,"region",1]:1 ); - if( e_idx>=0 ) - { - partitions[e_idx,"region",0] = partitions[e_idx,"region",0]:0 - schange; - partitions[e_idx,"region",1] = partitions[e_idx,"region",1]:0 + schange; - if( partitions[e_idx,"region",1]:0 <= 0 ) - { - partitions[e_idx,"region",1] = 1; - } - UpdatePartition( partitions[e_idx,"device"]:"", partitions[e_idx,"region",0]:0, - partitions[e_idx,"region",1]:1 ); - } - } - else - { - y2error( "AdaptResize this should not happen %1", partitions ); - } - y2milestone( "AdaptResize partitions:%1", partitions ); - y2milestone( "AdaptResize maindev:%1 region:%2 change:%3", maindev, - region, schange ); - } - - global define integer NumLoopDevices() { map bo = (map)WFM::Execute (.local.bash_output, "losetup -a" ); -- 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] r60472 - /tags/branch-SLE-10-SP3-2_13_17/cd-creator/
by jsuchome＠svn.opensuse.org 21 Jan '10

21 Jan '10

Author: jsuchome Date: Thu Jan 21 17:03:58 2010 New Revision: 60472 URL: http://svn.opensuse.org/viewcvs/yast?rev=60472&view=rev Log: Created tag branch-SLE-10-SP3-2_13_17 for cd-creator Added: tags/branch-SLE-10-SP3-2_13_17/cd-creator/ - copied from r60471, branches/SuSE-SLE-10-SP3-Branch/cd-creator/ -- 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] r60471 - /tags/branch-SLE-10-SP3-2_13_17/
by jsuchome＠svn.opensuse.org 21 Jan '10

21 Jan '10

Author: jsuchome Date: Thu Jan 21 17:03:53 2010 New Revision: 60471 URL: http://svn.opensuse.org/viewcvs/yast?rev=60471&view=rev Log: Created tag branch-SLE-10-SP3-2_13_17 Added: tags/branch-SLE-10-SP3-2_13_17/ -- 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] r60470 - in /branches/SuSE-SLE-10-SP3-Branch/cd-creator: VERSION package/yast2-cd-creator.changes src/CDCreator.ycp src/wizards.ycp
by jsuchome＠svn.opensuse.org 21 Jan '10

21 Jan '10

Author: jsuchome Date: Thu Jan 21 17:03:42 2010 New Revision: 60470 URL: http://svn.opensuse.org/viewcvs/yast?rev=60470&view=rev Log: - correctly copy PPC files for bootable medias (bnc#561751) - do not copy /etc, /PS3 directories - do not write TRANS.TBL checksum into content file - 2.13.17 Modified: branches/SuSE-SLE-10-SP3-Branch/cd-creator/VERSION branches/SuSE-SLE-10-SP3-Branch/cd-creator/package/yast2-cd-creator.changes branches/SuSE-SLE-10-SP3-Branch/cd-creator/src/CDCreator.ycp branches/SuSE-SLE-10-SP3-Branch/cd-creator/src/wizards.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/cd-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/cd-cre… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/cd-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/cd-creator/VERSION Thu Jan 21 17:03:42 2010 @@ -1 +1 @@ -2.13.16 +2.13.17 Modified: branches/SuSE-SLE-10-SP3-Branch/cd-creator/package/yast2-cd-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/cd-cre… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/cd-creator/package/yast2-cd-creator.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/cd-creator/package/yast2-cd-creator.changes Thu Jan 21 17:03:42 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Jan 14 07:34:27 CET 2010 - jsuchome(a)suse.cz + +- correctly copy PPC files for bootable medias (bnc#561751) +- do not copy /etc, /PS3 directories +- do not write TRANS.TBL checksum into content file +- 2.13.17 + +------------------------------------------------------------------- Wed Apr 22 17:00:35 CEST 2009 - lslezak(a)suse.cz - register Pkg::CallbackSourceReportInit/Destroy() callbacks - Modified: branches/SuSE-SLE-10-SP3-Branch/cd-creator/src/CDCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/cd-cre… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/cd-creator/src/CDCreator.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/cd-creator/src/CDCreator.ycp Thu Jan 21 17:03:42 2010 @@ -471,7 +471,7 @@ { // generate new sha1 sums for files in descr subdirectory // remove './' from the file names, ignore directory.yast file, sort the output - string command = sformat("(cd '%1/%2' && find . -type f -exec sha1sum \\{\\} \\; | sed -e 's#^\$.\\{40\\}\$ ./#META SHA1 \\1 #' | grep -v '^.\\{40\\} directory.yast$' | LC_ALL=C sort -k 2)", String::Quote(dir), String::Quote(product_dir)); + string command = sformat("(cd '%1/%2' && find . -type f -exec sha1sum \\{\\} \\; | sed -e 's#^\$.\\{40\\}\$ ./#META SHA1 \\1 #' | grep -Ev '( directory.yast$| TRANS.TBL$)' | LC_ALL=C sort -k 2)", String::Quote(dir), String::Quote(product_dir)); y2milestone("Generating SHA1 sums: %1", command); @@ -600,7 +600,7 @@ return true; } -boolean CopyDirectoryRec(integer srcid, integer mid, string src, string target) +boolean CopyDirectoryR(integer srcid, integer mid, string src, string target, boolean optional) { y2milestone("CopyDirectoryRec: srcid: %1, mid: %2, src: %3, target: %4", srcid, mid, src, target); @@ -609,14 +609,29 @@ if (local_dir == nil || local_dir == "") { - // an error message, %1 is the directory, %2 is URL of the source - Report::Error(sformat(_("Cannot read directory %1\nfrom source %2."), src, Pkg::SourceGeneralData(srcid)["url"]:"")); + if (!optional) + { + // an error message, %1 is the directory, %2 is URL of the source + Report::Error(sformat(_("Cannot read directory %1\nfrom source %2."), src, Pkg::SourceGeneralData(srcid)["url"]:"")); + } + return false; } return Exec(sformat("/bin/cp -a -f -- '%1' '%2'", String::Quote(local_dir), String::Quote(target))); } +boolean CopyDirectoryRec(integer srcid, integer mid, string src, string target) +{ + return CopyDirectoryR(srcid, mid, src, target, false); +} + +boolean CopyDirectoryRecOpt(integer srcid, integer mid, string src, string target) +{ + return CopyDirectoryR(srcid, mid, src, target, true); +} + + boolean CopyDirectoryNonRec(integer srcid, integer mid, string src, string target) { // get file list from directory.yast @@ -647,9 +662,44 @@ boolean CopyPPCBoot(integer srcid, string target) { - return CopyDirectoryRec(srcid, 1, "/ppc", target) - && CopyDirectoryRec(srcid, 1, "/etc", target) - && CopyDirectoryRec(srcid, 1, "/suseboot", target); + y2milestone("Copying PPC boot files"); + boolean ret = true; + + y2milestone("Copying /ppc subdirectory"); + boolean r = CopyDirectoryRecOpt(srcid, 1, "/ppc", target); + + if (!r) + { + y2milestone("Directory listing may be missing, copying /ppc/bootinfo.txt"); + CopyFile(srcid, 1, "/ppc/bootinfo.txt", target + "/ppc"); + } + + ret = ret && r; + + y2milestone("Copying /suseboot subdirectory"); + r = CopyDirectoryRecOpt(srcid, 1, "/suseboot", target); + y2milestone("Result: %1", r); + + if (!r) + { + list<string> files = [ + "/suseboot/inst32", "/suseboot/inst64", "/suseboot/os-chooser", + "/suseboot/yaboot", "/suseboot/yaboot.cnf", "/suseboot/yaboot.ibm", + "/suseboot/yaboot.txt" + ]; + + y2milestone("Directory listing may be missing using fixed list: %1", files); + + foreach(string f, files, + { + CopyOptionalFile(srcid, 1, f, target + f); + } + ); + } + + ret = ret && r; + + return ret; } string UpDir(string input) @@ -761,7 +811,6 @@ } else if (Arch::ppc() || Arch::ppc64()) { - Exec(sformat("/bin/mkdir -p %1/etc", skel_root)); Exec(sformat("/bin/mkdir -p %1/ppc", skel_root)); Exec(sformat("/bin/mkdir -p %1/suseboot", skel_root)); } @@ -981,6 +1030,13 @@ CopyDirectoryRec(source_id, 1, "boot/loader", sformat("%1/boot", skel_root)); } } + else if (Arch::ppc() || Arch::ppc64()) + { + CopyPPCBoot(source_id, skel_root); + + // recursive copy of /boot + CopyDirectoryRec(source_id, 1, "boot", skel_root); + } else { // recursive copy of /boot/loader/* @@ -990,6 +1046,10 @@ else { CopyDirectoryRec(source_id, 1, "/boot", skel_root); + if (Arch::ppc() || Arch::ppc64()) + { + CopyPPCBoot(source_id, skel_root); + } } } Modified: branches/SuSE-SLE-10-SP3-Branch/cd-creator/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/cd-cre… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/cd-creator/src/wizards.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/cd-creator/src/wizards.ycp Thu Jan 21 17:03:42 2010 @@ -58,7 +58,7 @@ "isolinux": $[ `abort : `abort, `next : "packagemanager", - `autoyast : "summary" + `autoyast : "gpgkey" ], "packagemanager": $[ `abort : `abort, -- 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] r60469 - in /branches/SuSE-Code-11-SP1-Branch/autoinstallation: package/autoyast2.changes src/dialogs/ask.ycp
by ug＠svn.opensuse.org 21 Jan '10

21 Jan '10

Author: ug Date: Thu Jan 21 15:52:27 2010 New Revision: 60469 URL: http://svn.opensuse.org/viewcvs/yast?rev=60469&view=rev Log: passing a boolean to an ask-script failed (bnc#572166) Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/dialogs/ask.ycp Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes Thu Jan 21 15:52:27 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jan 21 15:52:15 CET 2010 - ug(a)suse.de + +- passing a boolean to an ask-script failed (bnc#572166) + +------------------------------------------------------------------- Thu Jan 7 10:36:45 CET 2010 - ug(a)suse.de - 2.17.32 Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/dialogs/ask.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/dialogs/ask.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/dialogs/ask.ycp Thu Jan 21 15:52:27 2010 @@ -185,6 +185,8 @@ any val = UI::QueryWidget(`id(entry_id), `Value); if( ask["type"]:"string" == "integer" ) { val = tointeger((string)val); + } else if( ask["type"]:"string" == "boolean" ) { + val = ( (boolean)val ? "true" : "false" ); } if( ask["password"]:false == true ) { string pass2 = (string)UI::QueryWidget(`id(`pass2), `Value); -- 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] r60468 - in /trunk/autoinstallation: package/autoyast2.changes src/dialogs/ask.ycp
by ug＠svn.opensuse.org 21 Jan '10

21 Jan '10

Author: ug Date: Thu Jan 21 15:51:45 2010 New Revision: 60468 URL: http://svn.opensuse.org/viewcvs/yast?rev=60468&view=rev Log: passing a boolean to an ask-script failed (bnc#572166) Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/dialogs/ask.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Thu Jan 21 15:51:45 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jan 21 15:50:31 CET 2010 - ug(a)suse.de + +- passing a boolean to an ask-script failed (bnc#572166) + +------------------------------------------------------------------- Tue Jan 19 13:26:19 CET 2010 - ug(a)suse.de - bootloader docu rewritten - thanx to Jozef Uhliarik for Modified: trunk/autoinstallation/src/dialogs/ask.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/dialogs/ask… ============================================================================== --- trunk/autoinstallation/src/dialogs/ask.ycp (original) +++ trunk/autoinstallation/src/dialogs/ask.ycp Thu Jan 21 15:51:45 2010 @@ -217,6 +217,8 @@ any val = UI::QueryWidget(`id(entry_id), `Value); if( ask["type"]:"string" == "integer" ) { val = tointeger((string)val); + } else if( ask["type"]:"string" == "boolean" ) { + val = ( (boolean)val ? "true" : "false" ); } if( ask["password"]:false == true ) { string pass2 = (string)UI::QueryWidget(`id(`pass2), `Value); -- 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] r60467 - /trunk/installation/control/control.openSUSE.xml
by coolo＠svn.opensuse.org 21 Jan '10

21 Jan '10

Author: coolo Date: Thu Jan 21 15:29:22 2010 New Revision: 60467 URL: http://svn.opensuse.org/viewcvs/yast?rev=60467&view=rev Log: use 11.3 urls Modified: trunk/installation/control/control.openSUSE.xml Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.ope… ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Thu Jan 21 15:29:22 2010 @@ -199,9 +199,9 @@ <extra_urls config:type="list">  <extra_url> - <baseurl>http://download.opensuse.org/update/11.2/</baseurl> + <baseurl>http://download.opensuse.org/update/11.3/</baseurl> <alias>repo-update</alias> - <name>openSUSE-11.2-Update</name> + <name>openSUSE-11.3-Update</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">true</enabled> <autorefresh config:type="boolean">true</autorefresh> @@ -210,36 +210,36 @@  <extra_url> - <baseurl>http://download.opensuse.org/distribution/11.2/repo/oss/</baseurl> + <baseurl>http://download.opensuse.org/distribution/11.3/repo/oss/</baseurl> <alias>repo-oss</alias> - <name>openSUSE-11.2-Oss</name> + <name>openSUSE-11.3-Oss</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">true</enabled> <autorefresh config:type="boolean">true</autorefresh> <priority config:type="integer">99</priority> </extra_url> <extra_url> - <baseurl>http://download.opensuse.org/distribution/11.2/repo/non-oss/</baseurl> + <baseurl>http://download.opensuse.org/distribution/11.3/repo/non-oss/</baseurl> <alias>repo-non-oss</alias> - <name>openSUSE-11.2-Non-Oss</name> + <name>openSUSE-11.3-Non-Oss</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">true</enabled> <autorefresh config:type="boolean">true</autorefresh> <priority config:type="integer">99</priority> </extra_url> <extra_url> - <baseurl>http://download.opensuse.org/debug/distribution/11.2/repo/oss/</baseurl> + <baseurl>http://download.opensuse.org/debug/distribution/11.3/repo/oss/</baseurl> <alias>repo-debug</alias> - <name>openSUSE-11.2-Debug</name> + <name>openSUSE-11.3-Debug</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">false</enabled> <autorefresh config:type="boolean">true</autorefresh> <priority config:type="integer">99</priority> </extra_url> <extra_url> - <baseurl>http://download.opensuse.org/source/distribution/11.2/repo/oss/</baseurl> + <baseurl>http://download.opensuse.org/source/distribution/11.3/repo/oss/</baseurl> <alias>repo-source</alias> - <name>openSUSE-11.2-Source</name> + <name>openSUSE-11.3-Source</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">false</enabled> <autorefresh config:type="boolean">true</autorefresh> -- 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] r60466 - /trunk/printer/src/helps.ycp
by jsmeix＠svn.opensuse.org 21 Jan '10

21 Jan '10

Author: jsmeix Date: Thu Jan 21 11:02:03 2010 New Revision: 60466 URL: http://svn.opensuse.org/viewcvs/yast?rev=60466&view=rev Log: Improved help text 'regarding firewall'. Modified: trunk/printer/src/helps.ycp Modified: trunk/printer/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/helps.ycp?rev=60466&… ============================================================================== --- trunk/printer/src/helps.ycp (original) +++ trunk/printer/src/helps.ycp Thu Jan 21 11:02:03 2010 @@ -649,15 +649,22 @@ in which printers are published via network. By default the SuSEfirewall allows any incomming information via a network interface which belongs to the 'internal zone' -because this zone is trusted by default. -If the CUPS servers and your system are in a trusted internal network, -your network interface must be set to be in the 'internal zone'. -It does not make sense to have a network setup in a trusted internal network +because this zone is trusted by default. +It does not make sense to do printing in a trusted internal network with a network interface which belongs to the untrusted 'external zone' (the latter is the default setting for network interfaces to be safe). -Do not disable firewall protection for CUPS +In particular do not disable firewall protection for CUPS (i.e. for IPP which uses TCP port 631 and UDP port 631) for the untrusted 'external zone'. +To use remote printers in a trusted internal network +and be protected by the firewall against unwanted access +from any external network (in particular from the Internet), +assign the network interface which belongs to the internal network +to the internal zone of the firewall. +Use the YaST Firewall setup module to do this fundamental setup +to gain security plus usefulness in your network +and using remote printers in a trusted internal network +will work without any further firewall setup. For details see the openSUSE support database article 'CUPS and SANE Firewall settings' at http://en.opensuse.org/SDB:CUPS_and_SANE_Firewall_settings @@ -713,20 +720,34 @@ // SharingDialog help 3/3: _(" Regarding firewall: -Check if a firewall is active for a network zone in which printers -are made available via network to be used by trusted users -(nobody lets arbitrary users print on his printer). -By default the SuSEfirewall allows any access via a network interface -which belongs to the 'internal zone' because this zone is trusted by default. -If the CUPS server and the client systems are in an internal network -and when you trust all what there is in your internal network, -your network interface must be set to be in the 'internal zone'. -It does not make sense to have a network setup in a trusted internal network +A firewall is used to protect running server processes +(in this case the CUPS server process 'cupsd') +on your host against unwanted access via network. +Printing via network happens in a trusted internal network +(nobody lets arbitrary users from whatever external network +print on his printer) and usually the users need +physical printer access to get their paper output. +By default the SuSEfirewall lets any network traffic pass +via a network interface which belongs to the 'internal zone' +because this zone is trusted by default. +It does not make sense to do printing in a trusted internal network with a network interface which belongs to the untrusted 'external zone' -which is the default setting for network interfaces to be safe. +(the latter is the default setting for network interfaces to be safe). Do not disable firewall protection for CUPS (i.e. for IPP which uses TCP port 631 and UDP port 631) -for the untrusted 'external zone'. +for the untrusted 'external zone'. +To make printers accessible in a trusted internal network +and be protected by the firewall against unwanted access +from any external network (in particular from the Internet), +assign the network interface which belongs to the internal network +to the internal zone of the firewall. +Use the YaST Firewall setup module to do this fundamental setup +to gain security plus usefulness in your network and +sharing printers in a trusted internal network +will work without any further firewall setup. +For details see the openSUSE support database +article 'CUPS and SANE Firewall settings' at +http://en.opensuse.org/SDB:CUPS_and_SANE_Firewall_settings "), "policies" : -- 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] r60465 - in /branches/SuSE-Code-11-SP1-Branch/network/src: lan/complex.ycp modules/Lan.ycp
by kmachalkova＠svn.opensuse.org 20 Jan '10

20 Jan '10

Author: kmachalkova Date: Wed Jan 20 18:02:46 2010 New Revision: 60465 URL: http://svn.opensuse.org/viewcvs/yast?rev=60465&view=rev Log: Now use the library func - look for changes in all components (L.Items, DNS, Routing, N.Config) Modified: branches/SuSE-Code-11-SP1-Branch/network/src/lan/complex.ycp branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp Modified: branches/SuSE-Code-11-SP1-Branch/network/src/lan/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/lan/complex.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/lan/complex.ycp Wed Jan 20 18:02:46 2010 @@ -50,9 +50,9 @@ * Display finished popup * @return dialog result */ -define symbol FinishDialog() ``{ +/*define symbol FinishDialog() ``{ return FinishPopup(Modified(), "lan", "", "mail", ["permanent"]); -} +}*/ /** * Read settings dialog @@ -91,7 +91,7 @@ define symbol WriteDialog() ``{ ScreenName("lan-write"); - if(!Modified()) return `next; + if(!Lan::Modified()) return `next; LanItems::SetModified(); Wizard::RestoreHelp(help["write"]:""); Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp Wed Jan 20 18:02:46 2010 @@ -105,21 +105,22 @@ // FIXME: MOD list<string> DeletedModules = []; +// FIXME: used in lan/address.ycp (#17346) -> "global" + +/*------------------*/ +/* GLOBAL FUNCTIONS */ +/*------------------*/ + /** * Return a modification status * @return true if data was modified */ -boolean Modified() { +global boolean Modified() { boolean ret = LanItems::Modified() || DNS::modified || Routing::Modified() || NetworkConfig::Modified(); return ret; } -// FIXME: used in lan/address.ycp (#17346) -> "global" - -/*------------------*/ -/* GLOBAL FUNCTIONS */ - // function for use from autoinstallation (Fate #301032) global define boolean isAnyInterfaceDown(){ boolean down = false; @@ -387,11 +388,11 @@ global define boolean Write() { y2milestone("Writing configuration"); -// if(!write_only && NetHwDetection::running) NetHwDetection::Stop(); - /* Stop the detection */ - //FIXME: not only LanItems - if(!LanItems::modified) { + // Query modified flag in all components, not just LanItems - DNS, + // Routing, NetworkConfig too in order not to discard changes made + // outside LanItems (bnc#439235) + if(!Modified()) { y2milestone("No changes to network setup -> nothing to write"); return true; } -- 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] r60464 - in /trunk/printer/src: basicadd.ycp basicmodify.ycp
by jsmeix＠svn.opensuse.org 20 Jan '10

20 Jan '10

Author: jsmeix Date: Wed Jan 20 17:43:53 2010 New Revision: 60464 URL: http://svn.opensuse.org/viewcvs/yast?rev=60464&view=rev Log: Fixed search usability in basicadd.ycp and basicmodify.ycp for ncurses: Only when the user is already searching drivers, set the focus to the InputField for the driver search string so that the user can just continue typing other search strings. In contrast when the user is not already searching drivers, it is annoying in particular in the text-only ncurses UI when the focus becomes always set to the driver search string InputField. Modified: trunk/printer/src/basicadd.ycp trunk/printer/src/basicmodify.ycp Modified: trunk/printer/src/basicadd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/basicadd.ycp?rev=604… ============================================================================== --- trunk/printer/src/basicadd.ycp (original) +++ trunk/printer/src/basicadd.ycp Wed Jan 20 17:43:53 2010 @@ -295,9 +295,15 @@ _("&Search for") ) ); - // Set the focus to the InputField for the driver search string - // so that the user can just start typing: - UI::SetFocus( `driver_filter_input ); + if( `apply_driver_filter == user_input ) + { // Only when the user is already searching drivers, + // set the focus to the InputField for the driver search string + // so that the user can just continue typing other search strings. + // In contrast when the user is not already searching drivers, + // it is annoying in particular in the text-only ncurses UI + // when the focus becomes always set to the driver search string InputField. + UI::SetFocus( `driver_filter_input ); + } // Wait for user input: user_input = UI::UserInput(); if( `abort == user_input || `cancel == user_input || `back == user_input ) break; Modified: trunk/printer/src/basicmodify.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/basicmodify.ycp?rev=… ============================================================================== --- trunk/printer/src/basicmodify.ycp (original) +++ trunk/printer/src/basicmodify.ycp Wed Jan 20 17:43:53 2010 @@ -493,9 +493,15 @@ _("&Search for") ) ); - // Set the focus to the InputField for the driver search string - // so that the user can just start typing: - UI::SetFocus( `driver_filter_input ); + if( `apply_driver_filter == user_input ) + { // Only when the user is already searching drivers, + // set the focus to the InputField for the driver search string + // so that the user can just continue typing other search strings. + // In contrast when the user is not already searching drivers, + // it is annoying in particular in the text-only ncurses UI + // when the focus becomes always set to the driver search string InputField. + UI::SetFocus( `driver_filter_input ); + } // Wait for user input: user_input = UI::UserInput(); if( `abort == user_input || `cancel == user_input || `back == user_input ) break; -- 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] r60463 - in /branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src: MdPartCo.cc MdPartCo.h
by mpatelcz＠svn.opensuse.org 20 Jan '10

20 Jan '10

Author: mpatelcz Date: Wed Jan 20 17:40:46 2010 New Revision: 60463 URL: http://svn.opensuse.org/viewcvs/yast?rev=60463&view=rev Log: 1. Removed text massages on deletion 2. RAID disks are released after partition deletion. Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.h Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc Wed Jan 20 17:40:46 2010 @@ -674,13 +674,6 @@ } if( ret==0 && !created() ) { - list<string> rdevs; - getDevs( rdevs ); - for( list<string>::const_iterator s=rdevs.begin(); - s!=rdevs.end(); ++s ) - { - getStorage()->clearUsedBy(*s); - } //Remove partitions MdPartPair p=mdpartPair(MdPart::notDeleted); for( MdPartIter i=p.begin(); i!=p.end(); ++i ) @@ -688,6 +681,12 @@ if( i->nr()>0 ) { ret = removePartition( i->nr() ); + if( ret != 0 ) + { + // Error. Break. + break; + } + } } //Remove 'whole device' it was created when last partition was deleted. @@ -697,16 +696,35 @@ if( !removeFromList( &(*p.begin()) )) { y2err( "not found:" << *p.begin() ); + ret = MDPART_PARTITION_NOT_FOUND; } } - setDeleted( true ); - destrSb = true; - del_ptable = true; } + if( ret==0 ) + { + unuseDevs(); + setDeleted( true ); + destrSb = true; + del_ptable = true; + } y2mil("ret:" << ret); return( ret ); } +int MdPartCo::unuseDevs(void) +{ + list<string> rdevs; + getDevs( rdevs ); + for( list<string>::const_iterator s=rdevs.begin(); + s!=rdevs.end(); s++ ) + { + getStorage()->clearUsedBy(*s); + } + return 0; +} + + + void MdPartCo::removePresentPartitions() { VolPair p = volPair(); @@ -888,10 +906,6 @@ // 1. Check Metadata. if( sb_ver == "imsm" || sb_ver == "ddf" ) { - if( !silent ) - { - getStorage()->showInfoCb( noRemoveTextFormat(true) ); - } y2error("Cannot remove IMSM or DDF SW RAIDs."); return (MDPART_NO_REMOVE); } @@ -912,10 +926,6 @@ } if( permitRemove == 1 ) { - if( !silent ) - { - getStorage()->showInfoCb( noRemoveTextPartitions(true) ); - } y2error("Cannot remove RAID with partitions."); return (MDPART_NO_REMOVE); } @@ -1090,36 +1100,6 @@ } return( txt ); } -string MdPartCo::noRemoveTextFormat( bool doing ) const - { - string txt; - if( doing ) - { - // displayed text during action, %1$s is replaced by a name (e.g. pdc_igeeeadj), - txt = sformat( _("Cannot remove %1$s. It is IMSM or DDF RAID."), name().c_str() ); - } - else - { - // displayed text before action, %1$s is replaced by a name (e.g. pdc_igeeeadj), - txt = sformat( _("Couldn't remove %1$s. It is IMSM or DDF RAID."), name().c_str() ); - } - return( txt ); - } -string MdPartCo::noRemoveTextPartitions( bool doing ) const - { - string txt; - if( doing ) - { - // displayed text during action, %1$s is replaced by a name (e.g. pdc_igeeeadj), - txt = sformat( _("Cannot remove %1$s because it contains at least 1 partition."), name().c_str() ); - } - else - { - // displayed text before action, %1$s is replaced by a name (e.g. pdc_igeeeadj), - txt = sformat( _("Couldn't remove %1$s because it contains at least 1 partition."), name().c_str() ); - } - return( txt ); - } void MdPartCo::setUdevData(const list<string>& id) { Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.h (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.h Wed Jan 20 17:40:46 2010 @@ -277,8 +277,6 @@ int doCreateLabel(); virtual int doRemove(); virtual string removeText( bool doing ) const; - virtual string noRemoveTextFormat( bool doing ) const; - virtual string noRemoveTextPartitions( bool doing ) const; virtual string setDiskLabelText( bool doing ) const; void getMajorMinor(void); @@ -299,6 +297,8 @@ void getMdProps(void); void setSpares(void); + /* Clear UsedBy for Disks. */ + int unuseDevs(void); void logData( const string& Dir ); string udev_path; -- 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] r60462 - /trunk/scanner/src/helps.ycp
by jsmeix＠svn.opensuse.org 20 Jan '10

20 Jan '10

Author: jsmeix Date: Wed Jan 20 16:49:56 2010 New Revision: 60462 URL: http://svn.opensuse.org/viewcvs/yast?rev=60462&view=rev Log: Reduced too long help text 'regarding firewall' but added a link to 'SDB:CUPS and SANE Firewall settings' at http://en.opensuse.org/SDB:CUPS_and_SANE_Firewall_settings Modified: trunk/scanner/src/helps.ycp Modified: trunk/scanner/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/src/helps.ycp?rev=60462&… ============================================================================== --- trunk/scanner/src/helps.ycp (original) +++ trunk/scanner/src/helps.ycp Wed Jan 20 16:49:56 2010 @@ -267,48 +267,32 @@ // Keep the information that external access is useless and insecure (see "man saned"). _(" <big>Regarding Firewall</big> -Clients contact the saned via the sane-port (TCP port 6566) +A firewall is used to protect running server processes +on your host against unwanted access via network. +For using scanners via network the SANE network daemon (the saned) +is the server process which must run so that remote clients +can access scanners which are connected to your local host. +Client hosts contact the saned via the sane-port (TCP port 6566) but scanning data is transferred via an additional random port. -Therefore is is not sufficient for scanning via network -to open only port 6566 in the firewall. -You can specify a port range for the data connection -in the saned config file /etc/sane.d/saned.conf -via an entry like 'data_portrange = 30000 - 30100' -and then open port 6566 and the port range 30000:30100 -in the firewall. -The default firewall settings protect your host from external access. +Therefore only port 6566 is not sufficient for scanning via network. +Do not open the sane-port 6566 or any other port +regarding using scanners for the external zone in the firewall. +This is dangerous because it allows access to the saned from foreign hosts +so that the firewall does no longer provide any protection for the saned. Allowing access from the external network (i.e. for the external zone) does not make sense because scanning documents requires physical scanner access by trusted users. On the other hand the default firewall settings allow -any access from an internal (i.e. trusted) network -unless you have firewall protection enabled for the internal zone. -But an active firewall for the internal zone (i.e. for the -trusted network zone) does usually also not make much sense -because this makes the internal zone effectively the same -as the external zone. -The simplest and most secure way to do scanning via network -is when the trusted network has a well separated network interface -to have the trusted network well separated from the rest. -Then those network interface can be assigned to the internal zone -via the YaST Firewall setup module and scanning via network +any access from an internal (i.e. trusted) network. +To make the saned on your server accessible from an internal network, +assign the network interface which belongs to the internal network +to the internal zone of the firewall. +Use the YaST Firewall setup module to do this fundamental setup +regarding network security and firewall and scanning via network will work without any further firewall setup. -Anything else may result a problematic mix-up of trusted and -non-trusted network traffic in one same network environment. -For example when both the internal network and the connection -to the Internet happens via one same 'router-box' device. -In such a case the 'router-box' device is the crucial point -(in particular the crucial point of possible failure) -regarding network security. -In any case a plain opening of a port for the external zone -is dangerous because it allows access from any foreign host -to those port but does not provide any protection for -the service which is accessed via this port (e.g. the saned). -Instead of plain opening of ports for arbitrary access -one should additionally specify in the firewall setup -from which hosts and networks the access is allowed. -The YaST Firewall setup module can also be used -for such kind of more sophisticated firewall setup. +For details see the openSUSE support database +article 'CUPS and SANE Firewall settings' at +http://en.opensuse.org/SDB:CUPS_and_SANE_Firewall_settings ") + // ConfigureNetworkScanning dialog help 4/5: // Do not change or translate "net", it is a metadriver name. @@ -318,7 +302,7 @@ <big>Client Settings</big> If you want to access scanners connected to other hosts (servers) in the network, set up the net metadriver to access them via the daemon running on the servers. -saned and firewall on the servers must permit the access. +The saned and the firewall on the servers must permit the access. In Servers Used, enter which servers should be used. Enter a comma-separated list of servers (server names or IP addresses). If no servers are entered, net is not activated. -- 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] r60461 - in /trunk/printer/src: basicadd.ycp basicmodify.ycp
by jsmeix＠svn.opensuse.org 20 Jan '10

20 Jan '10

Author: jsmeix Date: Wed Jan 20 16:18:24 2010 New Revision: 60461 URL: http://svn.opensuse.org/viewcvs/yast?rev=60461&view=rev Log: Fixed search usability in basicadd.ycp and basicmodify.ycp in each run of the user input while loop directly before UI::UserInput() by first replacing the [Search for] button with itself with `opt(`default) to enforce this default regardless whatever function call or UI bug may have changed it and then setting the focus to the InputField for the driver search string so that the user can just start typing (it does not work the other way round, i.e. first set the focus then the default widget because it seems setting the default widget sets also the focus to it). Modified: trunk/printer/src/basicadd.ycp trunk/printer/src/basicmodify.ycp Modified: trunk/printer/src/basicadd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/basicadd.ycp?rev=604… ============================================================================== --- trunk/printer/src/basicadd.ycp (original) +++ trunk/printer/src/basicadd.ycp Wed Jan 20 16:18:24 2010 @@ -134,18 +134,21 @@ ) ), `HBox - ( `PushButton - ( `id(`apply_driver_filter), - // This button must be the default - // (it is activated when the user pressed the Enter key) - // because when the user has clicked into TextEntry to enter something - // it is normal to finish entering by pressing the Enter key - // but if the Enter key was linked to 'Next' or 'Back', - // the user would get the wrong action. - `opt(`default), - // Label of a PushButton to search a list for a search string - // and then show the search result: - _("&Search for") + ( `ReplacePoint + ( `id(`apply_driver_filter_replace_point), + `PushButton + ( `id(`apply_driver_filter), + // This button must be the default + // (it is activated when the user pressed the Enter key) + // because when the user has clicked into InputField to enter something + // it is normal to finish entering by pressing the Enter key + // but if the Enter key was linked to 'Next' or 'Back', + // the user would get the wrong action. + `opt(`default), + // Label of a PushButton to search a list for a search string + // and then show the search result: + _("&Search for") + ) ), `ReplacePoint ( `id(`driver_filter_input_replace_point), @@ -274,13 +277,28 @@ UI::FakeUserInput( `connection_selection ); any user_input = nil; while( true ) - { // The [Search for] button must be the default - // (it is activated when the user pressed the Enter key) - // because when the user has clicked into TextEntry to enter something - // it is normal to finish entering by pressing the Enter key - // but if the Enter key was linked to 'Next' or 'Back', - // the user would get the wrong action. - UI::SetFocus( `apply_driver_filter ); + { // Replace the [Search for] button with itself to enforce it is the default widget + // (the default widget is the result of UI::UserInput when the user pressed the Enter key) + // regardless whatever function call or UI bug (e.g. bnc#558900) may have changed the default widget: + UI::ReplaceWidget( `id(`apply_driver_filter_replace_point), + `PushButton + ( `id(`apply_driver_filter), + // This button must be the default + // (it is activated when the user pressed the Enter key) + // because when the user has clicked into InputField to enter something + // it is normal to finish entering by pressing the Enter key + // but if the Enter key was linked to 'Next' or 'Back', + // the user would get the wrong action. + `opt(`default), + // Label of a PushButton to search a list for a search string + // and then show the search result: + _("&Search for") + ) + ); + // Set the focus to the InputField for the driver search string + // so that the user can just start typing: + UI::SetFocus( `driver_filter_input ); + // Wait for user input: user_input = UI::UserInput(); if( `abort == user_input || `cancel == user_input || `back == user_input ) break; if( `next == user_input ) Modified: trunk/printer/src/basicmodify.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/basicmodify.ycp?rev=… ============================================================================== --- trunk/printer/src/basicmodify.ycp (original) +++ trunk/printer/src/basicmodify.ycp Wed Jan 20 16:18:24 2010 @@ -337,18 +337,21 @@ ) ), `HBox - ( `PushButton - ( `id(`apply_driver_filter), - // This button must be the default - // (it is activated when the user pressed the Enter key) - // because when the user has clicked into TextEntry to enter something - // it is normal to finish entering by pressing the Enter key - // but if the Enter key was linked to 'Next' or 'Back', - // the user would get the wrong action. - `opt(`default), - // Label of a PushButton to search a list for a search string - // and then show the search result: - _("&Search for") + ( `ReplacePoint + ( `id(`apply_driver_filter_replace_point), + `PushButton + ( `id(`apply_driver_filter), + // This button must be the default + // (it is activated when the user pressed the Enter key) + // because when the user has clicked into InputField to enter something + // it is normal to finish entering by pressing the Enter key + // but if the Enter key was linked to 'Next' or 'Back', + // the user would get the wrong action. + `opt(`default), + // Label of a PushButton to search a list for a search string + // and then show the search result: + _("&Search for") + ) ), `ReplacePoint ( `id(`driver_filter_input_replace_point), @@ -472,13 +475,28 @@ } any user_input = nil; while( true ) - { // The [Search for] button must be the default - // (it is activated when the user pressed the Enter key) - // because when the user has clicked into TextEntry to enter something - // it is normal to finish entering by pressing the Enter key - // but if the Enter key was linked to 'Next' or 'Back', - // the user would get the wrong action. - UI::SetFocus( `apply_driver_filter ); + { // Replace the [Search for] button with itself to enforce it is the default widget + // (the default widget is the result of UI::UserInput when the user pressed the Enter key) + // regardless whatever function call or UI bug (e.g. bnc#558900) may have changed the default widget: + UI::ReplaceWidget( `id(`apply_driver_filter_replace_point), + `PushButton + ( `id(`apply_driver_filter), + // This button must be the default + // (it is activated when the user pressed the Enter key) + // because when the user has clicked into InputField to enter something + // it is normal to finish entering by pressing the Enter key + // but if the Enter key was linked to 'Next' or 'Back', + // the user would get the wrong action. + `opt(`default), + // Label of a PushButton to search a list for a search string + // and then show the search result: + _("&Search for") + ) + ); + // Set the focus to the InputField for the driver search string + // so that the user can just start typing: + UI::SetFocus( `driver_filter_input ); + // Wait for user input: user_input = UI::UserInput(); if( `abort == user_input || `cancel == user_input || `back == user_input ) break; if( `next == user_input ) -- 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-client-11.1-i586 #639
by Hudson Integration Service 20 Jan '10

20 Jan '10

See <http://yast.suse.de:3334/job/webyast-client-11.1-i586/639/changes> Changes: [Jiri Suchomel] color status output ------------------------------------------ [...truncated 93 lines...] * Starting syntax check... * Done + check_exit 0 + '[' -z 0 ']' + MYEXIT=0 + '[' 0 == 0 ']' + echo 'exit code: 0 ... good, lets continue' exit code: 0 ... good, lets continue + return + export GEM_PATH=/usr/local/lib/ruby/gems/1.8/gems + GEM_PATH=/usr/local/lib/ruby/gems/1.8/gems + export CI_REPORTS=results + CI_REPORTS=results + export RAILS_ENV=test + RAILS_ENV=test + pushd webclient /src/web-client/webclient /src/web-client + RAILS_ENV=test + rake db:create db:migrate (in /src/web-client/webclient) == CreateAccounts: migrating ================================================= -- create_table("accounts", {:force=>true}) -> 0.0058s == CreateAccounts: migrated (0.0061s) ======================================== == UpdateAccounts: migrating ================================================= -- remove_column(:accounts, :email) -> 0.0400s -- remove_column(:accounts, :crypted_password) -> 0.0435s -- remove_column(:accounts, :salt) -> 0.0605s == UpdateAccounts: migrated (0.1446s) ======================================== == AddColumntAccounts: migrating ============================================= -- add_column(:accounts, :salt, :string) -> 0.0019s == AddColumntAccounts: migrated (0.0021s) ==================================== == CreateHosts: migrating ==================================================== -- create_table(:hosts) -> 0.0038s == CreateHosts: migrated (0.0041s) =========================================== == InsertLocalhost: migrating ================================================ == InsertLocalhost: migrated (0.1470s) ======================================= == PrivatePortNumbers: migrating ============================================= == PrivatePortNumbers: migrated (0.0049s) ==================================== + 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/web-client + '[' -d coverage ']' + mkdir coverage + rake test (in /src/web-client) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/unit/host_test.rb" "test/unit/basesystem_test.rb" "test/unit/helpers/controlpanel_helper_test.rb" "test/unit/account_test.rb" "test/unit/yast/service_resource_test.rb" "test/unit/yast_model_test.rb" "test/unit/client_exception_test.rb" (in /src/web-client/webclient) Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started .................... Finished in 0.837064 seconds. 20 tests, 64 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/hosts_controller_test.rb" "test/functional/private_routing_test.rb" "test/functional/lang_controller_test.rb" "test/functional/controlpanel_controller_test.rb" "test/functional/sessions_controller_test.rb" "test/functional/main_controller_test.rb" /src/web-client/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb:34: warning: don't put space before argument parentheses /src/web-client/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb:38: warning: don't put space before argument parentheses /src/web-client/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb:25: warning: already initialized constant LANGUAGES /src/web-client/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb:82: warning: already initialized constant SUPPORTED_LANGUAGE Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started .................DEPRECATION WARNING: Using assert_redirected_to with partial hash arguments is deprecated. Specify the full set arguments instead. (called from test_main_index_no_session at ./test/functional/main_controller_test.rb:12) .................. Finished in 1.653806 seconds. 35 tests, 66 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/integration/two_sessions_test.rb" "test/integration/manage_hosts_test.rb" fakeweb not found, skipping two_session_test /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/custom_services) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/security) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/users) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/unit/string_serialization_test.rb" "test/unit/array_serialization_test.rb" "test/unit/interface_test.rb" (in /src/web-client/plugins/network) Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started ........ Finished in 0.028556 seconds. 8 tests, 8 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/network_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started ... Finished in 0.388806 seconds. 3 tests, 8 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/samba_server) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/patch_updates) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/system) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/system_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started ...... Finished in 0.691025 seconds. 6 tests, 20 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/administrator) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/administrator_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started Finished in 0.000202 seconds. 0 tests, 0 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/registration) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/registration_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started ..DEPRECATION WARNING: Using assert_redirected_to with partial hash arguments is deprecated. Specify the full set arguments instead. (called from test_register at ./test/functional/registration_controller_test.rb:97) ... Finished in 0.593089 seconds. 5 tests, 11 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/mail_settings) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/unit/ntp_test.rb" "test/unit/systemtime_test.rb" (in /src/web-client/plugins/systemtime) Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started ..... Finished in 3.755692 seconds. 5 tests, 15 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/systemtime_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started .... Finished in 7.146372 seconds. 4 tests, 9 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/language) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/language_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started Finished in 0.000229 seconds. 0 tests, 0 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/services) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/services_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started .F. Finished in 0.292977 seconds. 1) Failure: test_ntp_status(ServicesControllerTest) [/test/functional/services_controller_test.rb:72:in `test_ntp_status' activesupport (2.3.5) lib/active_support/testing/setup_and_teardown.rb:62:in `__send__' activesupport (2.3.5) lib/active_support/testing/setup_and_teardown.rb:62:in `run']: <false> is not true. 3 tests, 7 assertions, 1 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" Errors running test:functionals! rake aborted! Error on execute task test on plugins/services /src/web-client/Rakefile:16 (See full trace by running task with --trace) ++ error_exit 1 ++ echo 'ERROR: detected exit code 1' ERROR: detected exit code 1 ++ 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 Jiri Suchomel 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 1

[yast-commit] Build failed in Hudson: webyast-client-head-i586 #731
by Hudson Integration Service 20 Jan '10

20 Jan '10

See <http://yast.suse.de:3334/job/webyast-client-head-i586/731/changes> Changes: [Jiri Suchomel] color status output ------------------------------------------ [...truncated 94 lines...] * Starting syntax check... * Done + check_exit 0 + '[' -z 0 ']' + MYEXIT=0 + '[' 0 == 0 ']' + echo 'exit code: 0 ... good, lets continue' exit code: 0 ... good, lets continue + return + export GEM_PATH=/usr/local/lib/ruby/gems/1.8/gems + GEM_PATH=/usr/local/lib/ruby/gems/1.8/gems + export CI_REPORTS=results + CI_REPORTS=results + export RAILS_ENV=test + RAILS_ENV=test + pushd webclient /src/web-client/webclient /src/web-client + RAILS_ENV=test + rake db:create db:migrate (in /src/web-client/webclient) == CreateAccounts: migrating ================================================= -- create_table("accounts", {:force=>true}) -> 0.0057s == CreateAccounts: migrated (0.0060s) ======================================== == UpdateAccounts: migrating ================================================= -- remove_column(:accounts, :email) -> 0.0400s -- remove_column(:accounts, :crypted_password) -> 0.0463s -- remove_column(:accounts, :salt) -> 0.0142s == UpdateAccounts: migrated (0.1010s) ======================================== == AddColumntAccounts: migrating ============================================= -- add_column(:accounts, :salt, :string) -> 0.0017s == AddColumntAccounts: migrated (0.0019s) ==================================== == CreateHosts: migrating ==================================================== -- create_table(:hosts) -> 0.0039s == CreateHosts: migrated (0.0042s) =========================================== == InsertLocalhost: migrating ================================================ == InsertLocalhost: migrated (0.1482s) ======================================= == PrivatePortNumbers: migrating ============================================= == PrivatePortNumbers: migrated (0.0047s) ==================================== + 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/web-client + '[' -d coverage ']' + mkdir coverage + rake test (in /src/web-client) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/unit/host_test.rb" "test/unit/basesystem_test.rb" "test/unit/helpers/controlpanel_helper_test.rb" "test/unit/account_test.rb" "test/unit/yast/service_resource_test.rb" "test/unit/yast_model_test.rb" "test/unit/client_exception_test.rb" (in /src/web-client/webclient) Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started .................... Finished in 0.702345 seconds. 20 tests, 64 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/hosts_controller_test.rb" "test/functional/private_routing_test.rb" "test/functional/lang_controller_test.rb" "test/functional/controlpanel_controller_test.rb" "test/functional/sessions_controller_test.rb" "test/functional/main_controller_test.rb" /src/web-client/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb:34: warning: don't put space before argument parentheses /src/web-client/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb:38: warning: don't put space before argument parentheses /src/web-client/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb:25: warning: already initialized constant LANGUAGES /src/web-client/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb:82: warning: already initialized constant SUPPORTED_LANGUAGE Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started .................DEPRECATION WARNING: Using assert_redirected_to with partial hash arguments is deprecated. Specify the full set arguments instead. (called from test_main_index_no_session at ./test/functional/main_controller_test.rb:12) .................. Finished in 0.958391 seconds. 35 tests, 66 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/integration/two_sessions_test.rb" "test/integration/manage_hosts_test.rb" fakeweb not found, skipping two_session_test /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/custom_services) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/security) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/users) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/unit/string_serialization_test.rb" "test/unit/array_serialization_test.rb" "test/unit/interface_test.rb" (in /src/web-client/plugins/network) Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started ........ Finished in 0.027723 seconds. 8 tests, 8 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/network_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started ... Finished in 0.304867 seconds. 3 tests, 8 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/samba_server) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/patch_updates) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/system) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/system_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started ...... Finished in 0.448017 seconds. 6 tests, 20 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/administrator) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/administrator_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started Finished in 0.00024 seconds. 0 tests, 0 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/registration) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/registration_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started ..DEPRECATION WARNING: Using assert_redirected_to with partial hash arguments is deprecated. Specify the full set arguments instead. (called from test_register at ./test/functional/registration_controller_test.rb:97) ... Finished in 0.616442 seconds. 5 tests, 11 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/mail_settings) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/unit/ntp_test.rb" "test/unit/systemtime_test.rb" (in /src/web-client/plugins/systemtime) Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started ..... Finished in 3.82986 seconds. 5 tests, 15 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/systemtime_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started .... Finished in 7.494127 seconds. 4 tests, 9 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/language) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/language_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started Finished in 0.000239 seconds. 0 tests, 0 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/services) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/services_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started .F. Finished in 0.215881 seconds. 1) Failure: test_ntp_status(ServicesControllerTest) [/test/functional/services_controller_test.rb:72:in `test_ntp_status' activesupport (2.3.5) lib/active_support/testing/setup_and_teardown.rb:62:in `__send__' activesupport (2.3.5) lib/active_support/testing/setup_and_teardown.rb:62:in `run']: <false> is not true. 3 tests, 7 assertions, 1 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" Errors running test:functionals! rake aborted! Error on execute task test on plugins/services /src/web-client/Rakefile:16 (See full trace by running task with --trace) ++ error_exit 1 ++ echo 'ERROR: detected exit code 1' ERROR: detected exit code 1 ++ 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 Jiri Suchomel 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 1

[yast-commit] r60460 - in /trunk/printer/src: Printer.ycp basicadd.ycp basicmodify.ycp driveradd.ycp
by jsmeix＠svn.opensuse.org 20 Jan '10

20 Jan '10

Author: jsmeix Date: Wed Jan 20 14:36:41 2010 New Revision: 60460 URL: http://svn.opensuse.org/viewcvs/yast?rev=60460&view=rev Log: In basicadd.ycp and basicmodify.ycp re-rename the PushButton to launch the "Add Driver" dialog from "Install Driver" to "Driver Packages" because the former can be confused by the user with the functionality what the [OK] button in basicadd.ycp and basicmodify.ycp does i.e. to install the print queue with the selected driver. Modified: trunk/printer/src/Printer.ycp trunk/printer/src/basicadd.ycp trunk/printer/src/basicmodify.ycp trunk/printer/src/driveradd.ycp Modified: trunk/printer/src/Printer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/Printer.ycp?rev=6046… ============================================================================== --- trunk/printer/src/Printer.ycp (original) +++ trunk/printer/src/Printer.ycp Wed Jan 20 14:36:41 2010 @@ -2228,8 +2228,8 @@ // from the BasicAdd dialog but the RPM package hplip is not installed: // Do not change or translate "hp-setup", it is a program name. // Do not change or translate "hplip", it is a package name. - // Translate 'Add Driver' the same as the PushButton name to go to the "Add Driver" dialog: - _("To run hp-setup, the RPM package hplip must be installed.\nUse 'Add Driver' to install it.") + // Translate 'Driver Packages' the same as the PushButton name to go to the "Add Driver" dialog: + _("To run hp-setup, the RPM package hplip must be installed.\nUse 'Driver Packages' to install it.") ); } return false; Modified: trunk/printer/src/basicadd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/basicadd.ycp?rev=604… ============================================================================== --- trunk/printer/src/basicadd.ycp (original) +++ trunk/printer/src/basicadd.ycp Wed Jan 20 14:36:41 2010 @@ -170,8 +170,8 @@ `PushButton ( `id(`add_driver), // Label of a PushButton to go to the "Add Driver" dialog - // to install a new driver (and perhaps download it before): - _("&Install Driver") + // to install or remove driver packages (and perhaps download it before): + _("Driver &Packages") ) ), `ReplacePoint Modified: trunk/printer/src/basicmodify.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/basicmodify.ycp?rev=… ============================================================================== --- trunk/printer/src/basicmodify.ycp (original) +++ trunk/printer/src/basicmodify.ycp Wed Jan 20 14:36:41 2010 @@ -373,8 +373,8 @@ `PushButton ( `id(`add_driver), // Label of a PushButton to go to the "Add Driver" dialog - // to install a new driver (and perhaps download it before): - _("&Install Driver") + // to install or remove driver packages (and perhaps download it before): + _("Driver &Packages") ) ), `ReplacePoint @@ -415,7 +415,7 @@ ( `CheckBox ( `id(`default_queue_checkbox), // CheckBox to set a local print queue to be the default queue: - _("Default &Printer"), + _("&Use as Default"), is_default ), `HSpacing( 2 ), Modified: trunk/printer/src/driveradd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/driveradd.ycp?rev=60… ============================================================================== --- trunk/printer/src/driveradd.ycp (original) +++ trunk/printer/src/driveradd.ycp Wed Jan 20 14:36:41 2010 @@ -45,7 +45,7 @@ */ any AddDriverDialog() { // Title of the Add Driver Dialog: - string caption = _("Add Driver"); + string caption = _("Driver Packages"); boolean cups_drivers_installed = Printerlib::TestAndInstallPackage( "cups-drivers", "installed" ); boolean gutenprint_installed = Printerlib::TestAndInstallPackage( "gutenprint", "installed" ); boolean hplip_installed = Printerlib::TestAndInstallPackage( "hplip", "installed" ); -- 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] r60459 - in /branches/SuSE-Code-11-SP1-Branch/network/src: lan/complex.ycp modules/Lan.ycp
by kmachalkova＠svn.opensuse.org 20 Jan '10

20 Jan '10

Author: kmachalkova Date: Wed Jan 20 14:33:02 2010 New Revision: 60459 URL: http://svn.opensuse.org/viewcvs/yast?rev=60459&view=rev Log: Moved an useful func to more appropriate place Modified: branches/SuSE-Code-11-SP1-Branch/network/src/lan/complex.ycp branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp Modified: branches/SuSE-Code-11-SP1-Branch/network/src/lan/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/lan/complex.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/lan/complex.ycp Wed Jan 20 14:33:02 2010 @@ -38,16 +38,6 @@ /** - * Return a modification status - * @return true if data was modified - */ -define boolean Modified() ``{ - boolean ret = LanItems::Modified() || DNS::modified || Routing::Modified() || - NetworkConfig::Modified(); - return ret; -} - -/** * Commit changes to internal structures * @return always `next */ Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp Wed Jan 20 14:33:02 2010 @@ -105,14 +105,21 @@ // FIXME: MOD list<string> DeletedModules = []; -// FIXME: used in lan/address.ycp (#17346) -> "global" - +/** + * Return a modification status + * @return true if data was modified + */ +boolean Modified() { + boolean ret = LanItems::Modified() || DNS::modified || Routing::Modified() || + NetworkConfig::Modified(); + return ret; +} +// FIXME: used in lan/address.ycp (#17346) -> "global" /*------------------*/ /* GLOBAL FUNCTIONS */ - // function for use from autoinstallation (Fate #301032) global define boolean isAnyInterfaceDown(){ boolean down = 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] Build failed in Hudson: webyast-client-11.1-i586 #635
by Hudson Integration Service 20 Jan '10

20 Jan '10

See <http://yast.suse.de:3334/job/webyast-client-11.1-i586/635/changes> Changes: [Stefan Schubert] moved to new ActiveResource concept [Stefan Schubert] Merge branch 'master' of git@gitorious.org:opensuse/yast-web-client ------------------------------------------ [...truncated 127 lines...] == AddColumntAccounts: migrating ============================================= -- add_column(:accounts, :salt, :string) -> 0.0018s == AddColumntAccounts: migrated (0.0020s) ==================================== == CreateHosts: migrating ==================================================== -- create_table(:hosts) -> 0.0018s == CreateHosts: migrated (0.0019s) =========================================== == InsertLocalhost: migrating ================================================ == InsertLocalhost: migrated (0.0727s) ======================================= == PrivatePortNumbers: migrating ============================================= == PrivatePortNumbers: migrated (0.0023s) ==================================== + 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/web-client + '[' -d coverage ']' + mkdir coverage + rake test (in /src/web-client) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/unit/host_test.rb" "test/unit/basesystem_test.rb" "test/unit/helpers/controlpanel_helper_test.rb" "test/unit/account_test.rb" "test/unit/yast/service_resource_test.rb" "test/unit/yast_model_test.rb" "test/unit/client_exception_test.rb" (in /src/web-client/webclient) Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started .................... Finished in 0.748286 seconds. 20 tests, 64 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/hosts_controller_test.rb" "test/functional/private_routing_test.rb" "test/functional/lang_controller_test.rb" "test/functional/controlpanel_controller_test.rb" "test/functional/sessions_controller_test.rb" "test/functional/main_controller_test.rb" /src/web-client/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb:34: warning: don't put space before argument parentheses /src/web-client/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb:38: warning: don't put space before argument parentheses /src/web-client/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb:25: warning: already initialized constant LANGUAGES /src/web-client/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb:82: warning: already initialized constant SUPPORTED_LANGUAGE Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started .................DEPRECATION WARNING: Using assert_redirected_to with partial hash arguments is deprecated. Specify the full set arguments instead. (called from test_main_index_no_session at ./test/functional/main_controller_test.rb:12) .................. Finished in 1.145908 seconds. 35 tests, 66 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/integration/two_sessions_test.rb" "test/integration/manage_hosts_test.rb" fakeweb not found, skipping two_session_test /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/custom_services) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/security) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/users) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/unit/string_serialization_test.rb" "test/unit/array_serialization_test.rb" "test/unit/interface_test.rb" (in /src/web-client/plugins/network) Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started ........ Finished in 0.028815 seconds. 8 tests, 8 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/network_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started ... Finished in 0.65803 seconds. 3 tests, 8 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/samba_server) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/patch_updates) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/system) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/system_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started ...... Finished in 0.465232 seconds. 6 tests, 20 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/administrator) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/administrator_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started Finished in 0.000234 seconds. 0 tests, 0 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/registration) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/registration_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started ..DEPRECATION WARNING: Using assert_redirected_to with partial hash arguments is deprecated. Specify the full set arguments instead. (called from test_register at ./test/functional/registration_controller_test.rb:97) ... Finished in 0.782375 seconds. 5 tests, 11 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/mail_settings) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/unit/ntp_test.rb" "test/unit/systemtime_test.rb" (in /src/web-client/plugins/systemtime) Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started ..... Finished in 4.279695 seconds. 5 tests, 15 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/systemtime_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started .... Finished in 7.517651 seconds. 4 tests, 9 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/language) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/language_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started Finished in 0.000208 seconds. 0 tests, 0 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/services) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/services_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started ... Finished in 0.344042 seconds. 3 tests, 7 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/eulas) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/eulas_controller_test.rb" Taking ../../webclient for RAILS_PARENT Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started ... Finished in 0.089579 seconds. 3 tests, 12 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/permissions) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/permission_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started .. Finished in 0.893664 seconds. 2 tests, 4 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/status) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/status_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started E Finished in 0.470486 seconds. 1) Error: test_index(StatusControllerTest): Errno::ENOENT: No such file or directory - ./test/functional/../fixtures/logs.xml /test/functional/status_controller_test.rb:17:in `read' /test/functional/status_controller_test.rb:17:in `setup' activesupport (2.3.5) lib/active_support/testing/setup_and_teardown.rb:61:in `run' 1 tests, 0 assertions, 0 failures, 1 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" Errors running test:functionals! rake aborted! Error on execute task test on plugins/status /src/web-client/Rakefile:16 (See full trace by running task with --trace) ++ error_exit 1 ++ echo 'ERROR: detected exit code 1' ERROR: detected exit code 1 ++ 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 1

[yast-commit] Build failed in Hudson: webyast-client-head-i586 #727
by Hudson Integration Service 20 Jan '10

20 Jan '10

See <http://yast.suse.de:3334/job/webyast-client-head-i586/727/changes> Changes: [Stefan Schubert] moved to new ActiveResource concept [Stefan Schubert] Merge branch 'master' of git@gitorious.org:opensuse/yast-web-client ------------------------------------------ [...truncated 128 lines...] == AddColumntAccounts: migrating ============================================= -- add_column(:accounts, :salt, :string) -> 0.0009s == AddColumntAccounts: migrated (0.0010s) ==================================== == CreateHosts: migrating ==================================================== -- create_table(:hosts) -> 0.0040s == CreateHosts: migrated (0.0042s) =========================================== == InsertLocalhost: migrating ================================================ == InsertLocalhost: migrated (0.3510s) ======================================= == PrivatePortNumbers: migrating ============================================= == PrivatePortNumbers: migrated (0.0046s) ==================================== + 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/web-client + '[' -d coverage ']' + mkdir coverage + rake test (in /src/web-client) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/unit/host_test.rb" "test/unit/basesystem_test.rb" "test/unit/helpers/controlpanel_helper_test.rb" "test/unit/account_test.rb" "test/unit/yast/service_resource_test.rb" "test/unit/yast_model_test.rb" "test/unit/client_exception_test.rb" (in /src/web-client/webclient) Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started .................... Finished in 0.687304 seconds. 20 tests, 64 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/hosts_controller_test.rb" "test/functional/private_routing_test.rb" "test/functional/lang_controller_test.rb" "test/functional/controlpanel_controller_test.rb" "test/functional/sessions_controller_test.rb" "test/functional/main_controller_test.rb" /src/web-client/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb:34: warning: don't put space before argument parentheses /src/web-client/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb:38: warning: don't put space before argument parentheses /src/web-client/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb:25: warning: already initialized constant LANGUAGES /src/web-client/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb:82: warning: already initialized constant SUPPORTED_LANGUAGE Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started .................DEPRECATION WARNING: Using assert_redirected_to with partial hash arguments is deprecated. Specify the full set arguments instead. (called from test_main_index_no_session at ./test/functional/main_controller_test.rb:12) .................. Finished in 1.079038 seconds. 35 tests, 66 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/integration/two_sessions_test.rb" "test/integration/manage_hosts_test.rb" fakeweb not found, skipping two_session_test /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/custom_services) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/security) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/users) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/unit/string_serialization_test.rb" "test/unit/array_serialization_test.rb" "test/unit/interface_test.rb" (in /src/web-client/plugins/network) Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started ........ Finished in 0.029358 seconds. 8 tests, 8 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/network_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started ... Finished in 0.442258 seconds. 3 tests, 8 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/samba_server) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/patch_updates) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/system) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/system_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started ...... Finished in 0.520616 seconds. 6 tests, 20 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/administrator) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/administrator_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started Finished in 0.000538 seconds. 0 tests, 0 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/registration) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/registration_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started ..DEPRECATION WARNING: Using assert_redirected_to with partial hash arguments is deprecated. Specify the full set arguments instead. (called from test_register at ./test/functional/registration_controller_test.rb:97) ... Finished in 0.553149 seconds. 5 tests, 11 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/mail_settings) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/unit/ntp_test.rb" "test/unit/systemtime_test.rb" (in /src/web-client/plugins/systemtime) Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started ..... Finished in 4.307288 seconds. 5 tests, 15 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/systemtime_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started .... Finished in 7.859822 seconds. 4 tests, 9 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/language) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/language_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started Finished in 0.000207 seconds. 0 tests, 0 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/services) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/services_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started ... Finished in 0.19033 seconds. 3 tests, 7 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/eulas) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/eulas_controller_test.rb" Taking ../../webclient for RAILS_PARENT Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started ... Finished in 0.090124 seconds. 3 tests, 12 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/permissions) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/permission_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started .. Finished in 0.521358 seconds. 2 tests, 4 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" (in /src/web-client/plugins/status) /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/status_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started E Finished in 0.485358 seconds. 1) Error: test_index(StatusControllerTest): Errno::ENOENT: No such file or directory - ./test/functional/../fixtures/logs.xml /test/functional/status_controller_test.rb:17:in `read' /test/functional/status_controller_test.rb:17:in `setup' activesupport (2.3.5) lib/active_support/testing/setup_and_teardown.rb:61:in `run' 1 tests, 0 assertions, 0 failures, 1 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" Errors running test:functionals! rake aborted! Error on execute task test on plugins/status /src/web-client/Rakefile:16 (See full trace by running task with --trace) ++ error_exit 1 ++ echo 'ERROR: detected exit code 1' ERROR: detected exit code 1 ++ 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 1

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

20 Jan '10

Author: aschnell Date: Wed Jan 20 10:45:38 2010 New Revision: 60458 URL: http://svn.opensuse.org/viewcvs/yast?rev=60458&view=rev Log: - fixed resizing of LVM logical volumes on S390 (bnc #571159) Modified: trunk/storage/package/yast2-storage.changes 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 Wed Jan 20 10:45:38 2010 @@ -9,6 +9,11 @@ - added NFS4 support (fate #305171) ------------------------------------------------------------------- +Mon Jan 18 12:47:39 CET 2010 - aschnell(a)suse.de + +- fixed resizing of LVM logical volumes on S390 (bnc #571159) + +------------------------------------------------------------------- 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/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 Wed Jan 20 10:45:38 2010 @@ -4371,8 +4371,8 @@ global define map IsResizable( map part ) ``{ map ret = FileSystems::IsResizable(`unknown); - if( !Arch::s390 () && - (part["type"]:`none==`lvm || Partitions::IsResizable( part["fsid"]:0 ))) + if ((!Arch::s390() && Partitions::IsResizable(part["fsid"]:0)) || + part["type"]:`none == `lvm) { if( part["fsid"]:0==Partitions::fsid_swap ) { -- 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] r60457 - in /branches/SuSE-Code-11-SP1-Branch/storage: package/yast2-storage.changes storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 20 Jan '10

20 Jan '10

Author: aschnell Date: Wed Jan 20 10:43:32 2010 New Revision: 60457 URL: http://svn.opensuse.org/viewcvs/yast?rev=60457&view=rev Log: - fixed resizing of LVM logical volumes on S390 (bnc #571159) Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Wed Jan 20 10:43:32 2010 @@ -10,6 +10,11 @@ - allow to use cylinder 0 for partition (bnc #571749) ------------------------------------------------------------------- +Mon Jan 18 12:47:39 CET 2010 - aschnell(a)suse.de + +- fixed resizing of LVM logical volumes on S390 (bnc #571159) + +------------------------------------------------------------------- Fri Jan 08 15:28:03 CET 2010 - aschnell(a)suse.de - fixed numbering of RAIDs (bnc #567662) Modified: branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp Wed Jan 20 10:43:32 2010 @@ -4703,8 +4703,8 @@ global define map IsResizable( map part ) ``{ map ret = FileSystems::IsResizable(`unknown); - if( !Arch::s390 () && - (part["type"]:`none==`lvm || Partitions::IsResizable( part["fsid"]:0 ))) + if ((!Arch::s390() && Partitions::IsResizable(part["fsid"]:0)) || + part["type"]:`none == `lvm) { if( part["fsid"]:0==Partitions::fsid_swap ) { -- 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] r60456 - in /branches/SuSE-Code-11-Branch/storage: VERSION package/yast2-storage.changes storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 20 Jan '10

20 Jan '10

Author: aschnell Date: Wed Jan 20 10:36:44 2010 New Revision: 60456 URL: http://svn.opensuse.org/viewcvs/yast?rev=60456&view=rev Log: - fixed resizing of LVM logical volumes on S390 (bnc #571159) Modified: branches/SuSE-Code-11-Branch/storage/VERSION branches/SuSE-Code-11-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-Branch/storage/storage/src/modules/Storage.ycp Modified: branches/SuSE-Code-11-Branch/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/storage/V… ============================================================================== --- branches/SuSE-Code-11-Branch/storage/VERSION (original) +++ branches/SuSE-Code-11-Branch/storage/VERSION Wed Jan 20 10:36:44 2010 @@ -1 +1 @@ -2.17.75 +2.17.76 Modified: branches/SuSE-Code-11-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/storage/p… ============================================================================== --- branches/SuSE-Code-11-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-Branch/storage/package/yast2-storage.changes Wed Jan 20 10:36:44 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 18 12:47:39 CET 2010 - aschnell(a)suse.de + +- fixed resizing of LVM logical volumes on S390 (bnc #571159) +- 2.17.76 + +------------------------------------------------------------------- Thu Jul 09 10:51:36 CEST 2009 - aschnell(a)suse.de - fixed resizing of mounted logical volumes (svn #56059, bnc Modified: branches/SuSE-Code-11-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/storage/s… ============================================================================== --- branches/SuSE-Code-11-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-Code-11-Branch/storage/storage/src/modules/Storage.ycp Wed Jan 20 10:36:44 2010 @@ -4643,8 +4643,8 @@ global define map IsResizable( map part ) ``{ map ret = FileSystems::IsResizable(`unknown); - if( !Arch::s390 () && - (part["type"]:`none==`lvm || Partitions::IsResizable( part["fsid"]:0 ))) + if ((!Arch::s390() && Partitions::IsResizable(part["fsid"]:0)) || + part["type"]:`none == `lvm) { if( part["fsid"]:0==Partitions::fsid_swap ) { -- 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] r60455 - /trunk/printer/src/helps.ycp
by jsmeix＠svn.opensuse.org 20 Jan '10

20 Jan '10

Author: jsmeix Date: Wed Jan 20 10:25:06 2010 New Revision: 60455 URL: http://svn.opensuse.org/viewcvs/yast?rev=60455&view=rev Log: Added link to 'SDB:CUPS and SANE Firewall settings' at http://en.opensuse.org/SDB:CUPS_and_SANE_Firewall_settings to the help text. Modified: trunk/printer/src/helps.ycp Modified: trunk/printer/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/helps.ycp?rev=60455&… ============================================================================== --- trunk/printer/src/helps.ycp (original) +++ trunk/printer/src/helps.ycp Wed Jan 20 10:25:06 2010 @@ -472,7 +472,7 @@ left bracket [ is percent encoded as %5B right bracket ] is percent encoded as %5D For details see 'Uniform Resource Identifier (URI): Generic Syntax' at -http://tools.ietf.org/html/rfc3986 +http://tools.ietf.org/html/rfc3986 ") + // ConnectionWizardDialog help 4/7: _(" @@ -630,7 +630,7 @@ between the attempts. If access still fails, the queue is not disabled and the print job is lost. For more information have a look at <tt>/usr/lib[64]/cups/backend/beh</tt> and -http://www.linuxfoundation.org/en/OpenPrinting/Database/BackendErrorHandler +http://www.linuxfoundation.org/en/OpenPrinting/Database/BackendErrorHandler "), "printing_via_network_dialog" : @@ -650,15 +650,17 @@ By default the SuSEfirewall allows any incomming information via a network interface which belongs to the 'internal zone' because this zone is trusted by default. -If the remote CUPS servers and your system are in an internal network -and when you trust all what there is in your internal network, +If the CUPS servers and your system are in a trusted internal network, your network interface must be set to be in the 'internal zone'. It does not make sense to have a network setup in a trusted internal network with a network interface which belongs to the untrusted 'external zone' -which is the default setting for network interfaces to be safe. +(the latter is the default setting for network interfaces to be safe). Do not disable firewall protection for CUPS (i.e. for IPP which uses TCP port 631 and UDP port 631) -for the untrusted 'external zone'. +for the untrusted 'external zone'. +For details see the openSUSE support database +article 'CUPS and SANE Firewall settings' at +http://en.opensuse.org/SDB:CUPS_and_SANE_Firewall_settings ") + // PrintingViaNetworkDialog help 2/4: _(" -- 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] r60454 - /trunk/gtk/src/pkg/ygtkpackageview.cc
by rpmcruz＠svn.opensuse.org 19 Jan '10

19 Jan '10

Author: rpmcruz Date: Tue Jan 19 23:55:40 2010 New Revision: 60454 URL: http://svn.opensuse.org/viewcvs/yast?rev=60454&view=rev Log: Set rules_hint true. Modified: trunk/gtk/src/pkg/ygtkpackageview.cc 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 Tue Jan 19 23:55:40 2010 @@ -707,6 +707,8 @@ gtk_tree_view_set_fixed_height_mode (view, TRUE); gtk_tree_view_set_headers_visible (view, FALSE); gtk_tree_view_set_enable_tree_lines (view, TRUE); + // FIXME: do we want rules_hint really? + gtk_tree_view_set_rules_hint (view, TRUE); GtkTreeSelection *selection = gtk_tree_view_get_selection (view); gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE); -- 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] r60453 - in /trunk/gtk: ChangeLog src/YGPackageSelectorPluginStub.cc src/pkg/YGPackageSelector.cc
by rpmcruz＠svn.opensuse.org 19 Jan '10

19 Jan '10

Author: rpmcruz Date: Tue Jan 19 23:43:32 2010 New Revision: 60453 URL: http://svn.opensuse.org/viewcvs/yast?rev=60453&view=rev Log: * src/pkg/YGPackageSelector.cc: added --plug-sidebar flag. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGPackageSelectorPluginStub.cc trunk/gtk/src/pkg/YGPackageSelector.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=60453&r1=60452… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Tue Jan 19 23:43:32 2010 @@ -1,3 +1,7 @@ +2010-01-19 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/pkg/YGPackageSelector.cc: added --plug-sidebar flag. + 2010-01-16 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/pkg/YGPackageSelector.cc: added --undo-box flag. 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 Tue Jan 19 23:43:32 2010 @@ -13,7 +13,8 @@ bool search_entry_side = true, search_entry_top = false, dynamic_sidebar = true, expander_sidebar = false, flex_sidebar = false, grid_sidebar = false, - layered_sidebar = false, layered_tabs_sidebar = false, startup_menu = false, + layered_sidebar = false, layered_tabs_sidebar = false, plug_sidebar = false, + startup_menu = false, big_icons_sidebar = false, icons_sidebar = false, categories_side = true, repositories_side = true, categories_top = false, repositories_top = false, @@ -41,6 +42,7 @@ { "grid-sidebar", &grid_sidebar }, { "layered-sidebar", &layered_sidebar }, { "layered-tabs-sidebar", &layered_tabs_sidebar }, + { "plug-sidebar", &plug_sidebar }, { "startup-menu", &startup_menu }, { "big-icons-sidebar", &big_icons_sidebar }, { "icons-sidebar", &icons_sidebar }, 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 Tue Jan 19 23:43:32 2010 @@ -29,8 +29,8 @@ // experiments: extern bool search_entry_side, search_entry_top, dynamic_sidebar, expander_sidebar, flex_sidebar, grid_sidebar, layered_sidebar, - layered_tabs_sidebar, startup_menu, big_icons_sidebar, icons_sidebar, - categories_side, + layered_tabs_sidebar, plug_sidebar, startup_menu, big_icons_sidebar, + icons_sidebar, 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, undo_box, @@ -2593,6 +2593,17 @@ gtk_misc_set_alignment (GTK_MISC (label), 0, .5); gtk_label_set_mnemonic_widget (GTK_LABEL (label), m_view); + if (plug_sidebar) { + GtkWidget *label_box = gtk_hbox_new (FALSE, 2); +// GtkWidget *button = create_small_button (GTK_STOCK_REMOVE, _("Remove")); + GtkWidget *button = create_small_button (GTK_STOCK_CLOSE, _("Close")); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (close_clicked_cb), this); + gtk_box_pack_start (GTK_BOX (label_box), label, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (label_box), button, FALSE, TRUE, 0); + label = label_box; + } + m_widget = gtk_vbox_new (FALSE, 4); gtk_box_pack_start (GTK_BOX (m_widget), label, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (m_widget), scroll, TRUE, TRUE, 0); @@ -2642,6 +2653,11 @@ if (gtk_tree_selection_get_selected (selection, NULL, NULL)) pThis->notify(); } + + static void close_clicked_cb (GtkButton *button, _QueryWidget *pThis) + { + gtk_widget_hide (pThis->getWidget()); + } }; class PropertyCombo : public _QueryWidget @@ -3493,6 +3509,7 @@ Ypp::Package::Type m_type; Toolbar *m_toolbar; UndoBox *m_undo_box; +GtkWidget *m_plug_box; public: GtkWidget *getWidget() { return m_widget; } @@ -3686,55 +3703,107 @@ _QueryWidget *category_view; GtkWidget *vpaned = 0, *vbox = 0; StackWidget *stack1 = 0, *stack2 = 0; - if (expander_sidebar) - vbox = gtk_expander_vbox_new (2); - if (layered_sidebar || layered_tabs_sidebar) { - stack1 = new StackWidget(); - stack2 = new StackWidget(); - } - - if (categories_side) { - _QueryWidget *view = new PropertyView (new CategoryModel()); - category_view = view; - m_query.push_back (view); - if (expander_sidebar) { - gtk_expander_set_expanded (GTK_EXPANDER (view->getWidget()), TRUE); - gtk_box_pack_start (GTK_BOX (vbox), view->getWidget(), FALSE, TRUE, 0); - } - else if (grid_sidebar) - ; - else if (stack1) - stack1->append (_("Categories"), view->getWidget()); - else - vpaned = gtk_vpaned_append (vpaned, view->getWidget()); - } - if (repositories_side) { - _QueryWidget *view = new PropertyView (new RepositoryModel()); - m_query.push_back (view); + m_plug_box = 0; + if (!plug_sidebar) { if (expander_sidebar) - gtk_box_pack_start (GTK_BOX (vbox), view->getWidget(), FALSE, TRUE, 0); - else if (stack1) - stack1->append (_("Repositories"), view->getWidget()); - else - vpaned = gtk_vpaned_append (vpaned, view->getWidget()); - } - if (status_side) { - _QueryWidget *view = new PropertyView (new StatusModel()); - m_query.push_back (view); - if (expander_sidebar) { - gtk_expander_set_expanded (GTK_EXPANDER (view->getWidget()), TRUE); - gtk_box_pack_start (GTK_BOX (vbox), view->getWidget(), FALSE, TRUE, 0); + vbox = gtk_expander_vbox_new (2); + if (layered_sidebar || layered_tabs_sidebar) { + stack1 = new StackWidget(); + stack2 = new StackWidget(); } - else if (stack2) - stack2->append (_("Status"), view->getWidget()); - else - vpaned = gtk_vpaned_append (vpaned, view->getWidget()); - } - if (grid_sidebar && category_view && vpaned) { - GtkWidget *hpaned = gtk_hpaned_new(); - gtk_paned_pack1 (GTK_PANED (hpaned), category_view->getWidget(), TRUE, FALSE); - gtk_paned_pack2 (GTK_PANED (hpaned), vpaned, TRUE, FALSE); - vpaned = hpaned; + + if (categories_side) { + _QueryWidget *view = new PropertyView (new CategoryModel()); + category_view = view; + m_query.push_back (view); + if (expander_sidebar) { + gtk_expander_set_expanded (GTK_EXPANDER (view->getWidget()), TRUE); + gtk_box_pack_start (GTK_BOX (vbox), view->getWidget(), FALSE, TRUE, 0); + } + else if (grid_sidebar) + ; + else if (stack1) + stack1->append (_("Categories"), view->getWidget()); + else + vpaned = gtk_vpaned_append (vpaned, view->getWidget()); + } + if (repositories_side) { + _QueryWidget *view = new PropertyView (new RepositoryModel()); + m_query.push_back (view); + if (expander_sidebar) + gtk_box_pack_start (GTK_BOX (vbox), view->getWidget(), FALSE, TRUE, 0); + else if (stack1) + stack1->append (_("Repositories"), view->getWidget()); + else + vpaned = gtk_vpaned_append (vpaned, view->getWidget()); + } + if (status_side) { + _QueryWidget *view = new PropertyView (new StatusModel()); + m_query.push_back (view); + if (expander_sidebar) { + gtk_expander_set_expanded (GTK_EXPANDER (view->getWidget()), TRUE); + gtk_box_pack_start (GTK_BOX (vbox), view->getWidget(), FALSE, TRUE, 0); + } + else if (stack2) + stack2->append (_("Status"), view->getWidget()); + else + vpaned = gtk_vpaned_append (vpaned, view->getWidget()); + } + if (grid_sidebar && category_view && vpaned) { + GtkWidget *hpaned = gtk_hpaned_new(); + gtk_paned_pack1 (GTK_PANED (hpaned), category_view->getWidget(), TRUE, FALSE); + gtk_paned_pack2 (GTK_PANED (hpaned), vpaned, TRUE, FALSE); + vpaned = hpaned; + } + } + else { // plug_sidebar + m_plug_box = gtk_vbox_new (FALSE, 6); + + struct inner { + static void add_filter (_QueryWidget *widget, UI *pThis) + { + pThis->m_query.push_back (widget); + widget->updateType (Ypp::Package::PACKAGE_TYPE); + widget->setListener (pThis); + pThis->refresh(); + + gtk_widget_set_size_request (widget->getWidget(), -1, 200); + gtk_widget_show_all (widget->getWidget()); + gtk_box_pack_start (GTK_BOX (pThis->m_plug_box), widget->getWidget(), FALSE, TRUE, 0); + } + static void add_categories_cb (GtkMenuItem *item, UI *pThis) + { add_filter (new PropertyView (new CategoryModel()), pThis); } + static void add_repositories_cb (GtkMenuItem *item, UI *pThis) + { add_filter (new PropertyView (new RepositoryModel()), pThis); } + static void add_status_cb (GtkMenuItem *item, UI *pThis) + { add_filter (new PropertyView (new StatusModel()), pThis); } + }; + + GtkWidget *add_button = ygtk_menu_button_new_with_label (_("filter")); + GtkWidget *add_box = gtk_hbox_new (FALSE, 4); +// gtk_box_pack_start (GTK_BOX (add_box), gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON), FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (add_box), gtk_label_new (_("Add:")), FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (add_box), add_button, TRUE, TRUE, 0); + + m_plug_box = gtk_vbox_new (FALSE, 6); + gtk_box_pack_start (GTK_BOX (side_vbox), m_plug_box, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (side_vbox), add_box, FALSE, TRUE, 0); + + GtkWidget *popup = gtk_menu_new(), *item; + item = gtk_menu_item_new_with_label (_("Categories")); + g_signal_connect (G_OBJECT (item), "activate", + G_CALLBACK (inner::add_categories_cb), this); + gtk_menu_shell_append (GTK_MENU_SHELL (popup), item); + item = gtk_menu_item_new_with_label (_("Repositories")); + g_signal_connect (G_OBJECT (item), "activate", + G_CALLBACK (inner::add_repositories_cb), this); + gtk_menu_shell_append (GTK_MENU_SHELL (popup), item); + item = gtk_menu_item_new_with_label (_("Status")); + g_signal_connect (G_OBJECT (item), "activate", + G_CALLBACK (inner::add_status_cb), this); + gtk_menu_shell_append (GTK_MENU_SHELL (popup), item); + ygtk_menu_button_set_popup (YGTK_MENU_BUTTON (add_button), popup); + gtk_widget_show_all (popup); } if (vpaned) -- 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] r60452 - in /branches/SuSE-Code-11-SP1-Branch/storage: libstorage/src/Dasd.cc libstorage/src/Disk.cc libstorage/src/Partition.cc libstorage/src/Partition.h package/yast2-storage.changes
by aschnell＠svn.opensuse.org 19 Jan '10

19 Jan '10

Author: aschnell Date: Tue Jan 19 18:11:26 2010 New Revision: 60452 URL: http://svn.opensuse.org/viewcvs/yast?rev=60452&view=rev Log: - zero newly created partitions on DASDs (bnc #571828) Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Dasd.cc branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Disk.cc branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Partition.cc branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Partition.h branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Dasd.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Dasd.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Dasd.cc Tue Jan 19 18:11:26 2010 @@ -405,10 +405,10 @@ ++i; } inpfile.close(); + SystemCmd cmd( "cat " + inpname ); string cmd_line = FDASDBIN " -c " + inpname + " " + quote(device()); if( execCheckFailed( cmd_line ) ) { - SystemCmd cmd( "cat " + inpname ); ret = DASD_FDASD_FAILED; } if( ret==0 ) @@ -433,6 +433,7 @@ { i->setSize( s ); } + ret = i->zeroIfNeeded(); } ++i; } Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Disk.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Disk.cc Tue Jan 19 18:11:26 2010 @@ -2385,14 +2385,8 @@ } if( ret==0 && p->type()!=EXTENDED ) { - bool used_as_pv = p->getUsedByType() == UB_LVM; - y2milestone( "zeroNew:%d used_as_pv:%d", - getStorage()->getZeroNewPartitions(), used_as_pv ); - if( used_as_pv || getStorage()->getZeroNewPartitions() ) - { - ret = getStorage()->zeroDevice(p->device(), p->sizeK()); - } - else if( !dmp_slave && !p->getFormat() ) + ret = p->zeroIfNeeded(); + if( !dmp_slave && !p->getFormat() ) { bool lsave = false; string lbl; Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Partition.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Partition.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Partition.cc Tue Jan 19 18:11:26 2010 @@ -354,6 +354,26 @@ idt==ID_NTFS || idt==0x17 ); } + +int +Partition::zeroIfNeeded() const +{ + int ret = 0; + + bool zero_new = getContainer()->getStorage()->getZeroNewPartitions(); + bool used_as_pv = getUsedByType() == UB_LVM; + + y2milestone( "zero_new:%d used_as_pv:%d", zero_new, used_as_pv ); + + if (zero_new || used_as_pv) + { + ret = getContainer()->getStorage()->zeroDevice(device(), sizeK()); + } + + return ret; +} + + string Partition::removeText( bool doing ) const { string txt; Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Partition.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Partition.h (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Partition.h Tue Jan 19 18:11:26 2010 @@ -95,6 +95,8 @@ void logDifference( const Partition& d ) const; void addUdevData(); + int zeroIfNeeded() const; + bool operator== ( const Partition& rhs ) const; bool operator!= ( const Partition& rhs ) const { return( !(*this==rhs) ); } Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Tue Jan 19 18:11:26 2010 @@ -1,8 +1,13 @@ ------------------------------------------------------------------- +Tue Jan 19 17:49:33 CET 2010 - aschnell(a)suse.de + +- zero newly created partitions on DASDs (bnc #571828) +- 2.17.88 + +------------------------------------------------------------------- Tue Jan 19 14:14:26 CET 2010 - fehr(a)suse.de - allow to use cylinder 0 for partition (bnc #571749) -- 2.17.88 ------------------------------------------------------------------- Fri Jan 08 15:28:03 CET 2010 - aschnell(a)suse.de -- 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] r60451 - in /trunk/printer: VERSION package/yast2-printer.changes src/basicadd.ycp src/basicmodify.ycp
by jsmeix＠svn.opensuse.org 19 Jan '10

19 Jan '10

Author: jsmeix Date: Tue Jan 19 16:42:56 2010 New Revision: 60451 URL: http://svn.opensuse.org/viewcvs/yast?rev=60451&view=rev Log: - More meaningful wording in BasicAdd and BasicModify dialogs. - 2.19.3 Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/basicadd.ycp trunk/printer/src/basicmodify.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=60451&r1=604… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Tue Jan 19 16:42:56 2010 @@ -1 +1 @@ -2.19.2 +2.19.3 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Tue Jan 19 16:42:56 2010 @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 19 16:21:03 CET 2010 - jsmeix(a)suse.de + +- More meaningful wording in BasicAdd and BasicModify dialogs. +- 2.19.3 + ------------------------------------------------------------------ Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz Modified: trunk/printer/src/basicadd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/basicadd.ycp?rev=604… ============================================================================== --- trunk/printer/src/basicadd.ycp (original) +++ trunk/printer/src/basicadd.ycp Tue Jan 19 16:42:56 2010 @@ -45,6 +45,7 @@ */ any BasicAddDialog() { y2milestone( "entering BasicAddDialog" ); + string any_model_driver_filter_input_text = _("any model"); string non_matching_fallback_driver_filter_string = "qqqqqqqqqq"; // Caption for the "Add Printer" dialog (BasicAddDialog): string caption = _("Add New Printer Configuration"); @@ -81,14 +82,15 @@ ( `HBox ( `Label ( // Caption for a Table with a list of printer connections: - _("Determine Connection") + _("Specify the Connection") ), `HStretch(), `PushButton ( `id(`more_connections), - // Label of a PushButton to show more available printer connections + // Label of a PushButton to restart printer autodetection + // to show more available printer connections // in the Table with a list of printer connections: - _("&More Connections") + _("&Detect More") ), `PushButton ( `id(`connection_wizard), @@ -128,7 +130,7 @@ ( `Left ( `Label ( // Caption for a printer driver selection: - _("Assign Driver") + _("Find and Assign a Driver") ) ), `HBox @@ -143,7 +145,7 @@ `opt(`default), // Label of a PushButton to search a list for a search string // and then show the search result: - _("&Search") + _("&Search for") ), `ReplacePoint ( `id(`driver_filter_input_replace_point), @@ -152,19 +154,24 @@ `opt(`hstretch), // No InputField header because there is the "Caption for a printer driver selection": "", - driver_filter_input_text + // Make it lowercase to make it more obvious that this is a search string + // which the user could change as needed and not a final fixed model name. + // Many users do not understand that the model name which is preset here + // (i.e. initially for this dialog and when the user selected a connection) + // as search string can be changed by the user as needed to find drivers. + tolower( driver_filter_input_text ) ) ), `PushButton ( `id(`more_drivers), - // Label of a PushButton to show more available printer drivers: - _("More &Drivers") + // Label of a PushButton to find and show more available printer drivers: + _("&Find More") ), `PushButton ( `id(`add_driver), // Label of a PushButton to go to the "Add Driver" dialog // to install a new driver (and perhaps download it before): - _("&Add Driver") + _("&Install Driver") ) ), `ReplacePoint @@ -211,7 +218,7 @@ // Avoid that it becomes squeezed to only a few characters in text mode: `opt(`hstretch), // Header of a TextEntry to enter the queue name: - _("Set &Name"), + _("Set Arbitrary &Name"), queue_name_proposal ) ), @@ -266,8 +273,15 @@ } UI::FakeUserInput( `connection_selection ); any user_input = nil; - while(true) - { user_input = UI::UserInput(); + while( true ) + { // The [Search for] button must be the default + // (it is activated when the user pressed the Enter key) + // because when the user has clicked into TextEntry to enter something + // it is normal to finish entering by pressing the Enter key + // but if the Enter key was linked to 'Next' or 'Back', + // the user would get the wrong action. + UI::SetFocus( `apply_driver_filter ); + user_input = UI::UserInput(); if( `abort == user_input || `cancel == user_input || `back == user_input ) break; if( `next == user_input ) { if( Printer::selected_connections_index < 0 @@ -449,7 +463,12 @@ ( `id(`driver_filter_input), `opt(`hstretch), // No InputField header because there is the "Caption for a printer driver selection": "", - driver_filter_input_text + // Make it lowercase to make it more obvious that this is a search string + // which the user could change as needed and not a final fixed model name. + // Many users do not understand that the model name which is preset here + // (i.e. initially for this dialog and when the user selected a connection) + // as search string can be changed by the user as needed to find drivers. + tolower( driver_filter_input_text ) ) ); UI::ReplaceWidget( `id(`driver_selection_replace_point), @@ -469,7 +488,7 @@ // Avoid that it becomes squeezed to only a few characters in text mode: `opt(`hstretch), // Header of a TextEntry to enter the queue name: - _("Set &Name"), + _("Set Arbitrary &Name"), queue_name_proposal ) ); @@ -494,9 +513,12 @@ if( `apply_driver_filter == user_input ) { driver_filter_input_text = (string)UI::QueryWidget( `id(`driver_filter_input), `Value ); y2milestone( "Drivers for '%1'", driver_filter_input_text ); + if( any_model_driver_filter_input_text == driver_filter_input_text ) + { driver_filter_input_text = ""; + } driver_filter_string = Printer::DeriveDriverFilterString( driver_filter_input_text ); if( "" == driver_filter_string ) - { driver_filter_input_text = _("any model"); + { driver_filter_input_text = any_model_driver_filter_input_text; } UI::ReplaceWidget( `id(`driver_filter_input_replace_point), `InputField @@ -535,6 +557,7 @@ y2milestone( "More drivers for '%1'", driver_filter_input_text ); if( "" != driver_filter_input_text && "unknown" != tolower( driver_filter_input_text ) + && any_model_driver_filter_input_text != driver_filter_input_text && non_matching_fallback_driver_filter_string != driver_filter_string ) { string manufacturer_and_model_number = Printer::DeriveModelName( driver_filter_input_text, 2 ); @@ -624,7 +647,7 @@ `opt(`hstretch), // No InputField header because there is the "Caption for a printer driver selection": "", - _("any model") + any_model_driver_filter_input_text ) ); driver_items = Printer::DriverItems( "", true ); Modified: trunk/printer/src/basicmodify.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/basicmodify.ycp?rev=… ============================================================================== --- trunk/printer/src/basicmodify.ycp (original) +++ trunk/printer/src/basicmodify.ycp Tue Jan 19 16:42:56 2010 @@ -45,6 +45,7 @@ */ any BasicModifyDialog() { y2milestone( "entering BasicModifyDialog for queue '%1'", Printer::queues[Printer::selected_queues_index]:$[] ); + string any_model_driver_filter_input_text = _("any model"); string non_matching_fallback_driver_filter_string = "qqqqqqqqqq"; string commandline = ""; string name = Printer::queues[Printer::selected_queues_index,"name"]:""; @@ -282,9 +283,10 @@ `HStretch(), `PushButton ( `id(`more_connections), - // Label of a PushButton to show more available printer connections + // Label of a PushButton to restart printer autodetection + // to show more available printer connections // in the Table with a list of printer connections: - _("&More Connections") + _("&Detect More") ), `PushButton ( `id(`connection_wizard), @@ -346,7 +348,7 @@ `opt(`default), // Label of a PushButton to search a list for a search string // and then show the search result: - _("&Search") + _("&Search for") ), `ReplacePoint ( `id(`driver_filter_input_replace_point), @@ -355,19 +357,24 @@ `opt(`hstretch), // No InputField header because there is the "Caption for a printer driver selection": "", - driver_filter_input_text + // Make it lowercase to make it more obvious that this is a search string + // which the user could change as needed and not a final fixed model name. + // Many users do not understand that the model name which is preset here + // (i.e. initially for this dialog and when the user selected a connection) + // as search string can be changed by the user as needed to find drivers. + tolower( driver_filter_input_text ) ) ), `PushButton ( `id(`more_drivers), - // Label of a PushButton to show more available printer drivers: - _("More &Drivers") + // Label of a PushButton to find and show more available printer drivers: + _("&Find More") ), `PushButton ( `id(`add_driver), // Label of a PushButton to go to the "Add Driver" dialog // to install a new driver (and perhaps download it before): - _("&Add Driver") + _("&Install Driver") ) ), `ReplacePoint @@ -391,7 +398,7 @@ ( `id(`description_input), `opt(`hstretch), // Label of a TextEntry for a short printer driver description (only one line): - _("Descri&ption"), + _("Description &Text"), description ), `HSpacing( 2 ), @@ -408,7 +415,7 @@ ( `CheckBox ( `id(`default_queue_checkbox), // CheckBox to set a local print queue to be the default queue: - _("&Default Printer"), + _("Default &Printer"), is_default ), `HSpacing( 2 ), @@ -463,11 +470,18 @@ // becomes usually preselected and this requires different drivers to be shown: UI::FakeUserInput( `connection_selection ); } - any ret = nil; - while(true) - { ret = UI::UserInput(); - if( ret == `abort || ret == `cancel || ret == `back ) break; - if( ret == `next ) + any user_input = nil; + while( true ) + { // The [Search for] button must be the default + // (it is activated when the user pressed the Enter key) + // because when the user has clicked into TextEntry to enter something + // it is normal to finish entering by pressing the Enter key + // but if the Enter key was linked to 'Next' or 'Back', + // the user would get the wrong action. + UI::SetFocus( `apply_driver_filter ); + user_input = UI::UserInput(); + if( `abort == user_input || `cancel == user_input || `back == user_input ) break; + if( `next == user_input ) { commandline = "/usr/sbin/lpadmin -h localhost -p '" + name + "'"; boolean something_has_changed = false; boolean set_paper_size_later = false; @@ -650,15 +664,15 @@ // Exit this dialog in any case: break; } - if( ret == `connection_wizard ) + if( `connection_wizard == user_input ) { // Exit this dialog and go to the ConnectionWizardDialog via the sequencer in wizards.ycp: break; } - if( ret == `add_driver ) + if( `add_driver == user_input ) { // Exit this dialog and go to the AddDriverDialog via the sequencer in wizards.ycp: break; } - if( ret == `driver_options ) + if( `driver_options == user_input ) { if( Printer::selected_queues_index < 0 || "" == Printer::queues[Printer::selected_queues_index,"name"]:"" || "remote" == Printer::queues[Printer::selected_queues_index,"config"]:"remote" @@ -689,7 +703,7 @@ // Exit this dialog and go to the DriverOptionsDialog via the sequencer in wizards.ycp: break; } - if( ret == `more_connections ) + if( `more_connections == user_input ) { UI::ReplaceWidget( `id(`connection_selection_replace_point), `Table( `id(`connection_selection), // By default there is no UserInput() @@ -727,7 +741,7 @@ UI::FakeUserInput( `connection_selection ); continue; } - if( ret == `connection_selection ) + if( `connection_selection == user_input ) { integer selected_connection_index = (integer)UI::QueryWidget( `id(`connection_selection), `CurrentItem ); if( nil == selected_connection_index ) { Popup::AnyMessage( // Header of a Popup::AnyMessage when no connection was selected: @@ -790,7 +804,12 @@ `opt(`hstretch), // No InputField header because there is the "Caption for a printer driver selection": "", - driver_filter_input_text + // Make it lowercase to make it more obvious that this is a search string + // which the user could change as needed and not a final fixed model name. + // Many users do not understand that the model name which is preset here + // (i.e. initially for this dialog and when the user selected a connection) + // as search string can be changed by the user as needed to find drivers. + tolower( driver_filter_input_text ) ) ); UI::ReplaceWidget( `id(`driver_selection_replace_point), @@ -806,7 +825,7 @@ ) ) ); - // Do the same as if ret == `driver_selection + // Do the same as if user_input == `driver_selection // but don't show a popup if nil == selected_ppd_index: integer selected_ppd_index = (integer)UI::QueryWidget( `id(`driver_selection), `CurrentItem ); if( nil == selected_ppd_index ) @@ -849,7 +868,7 @@ } continue; } - if( ret == `driver_selection ) + if( `driver_selection == user_input ) { integer selected_ppd_index = (integer)UI::QueryWidget( `id(`driver_selection), `CurrentItem ); if( nil == selected_ppd_index ) { Popup::AnyMessage( // Header of a Popup::AnyMessage when no driver was selected: @@ -911,12 +930,15 @@ } continue; } - if( ret == `apply_driver_filter ) + if( `apply_driver_filter == user_input ) { driver_filter_input_text = (string)UI::QueryWidget( `id(`driver_filter_input), `Value ); y2milestone( "Drivers for '%1'", driver_filter_input_text ); + if( any_model_driver_filter_input_text == driver_filter_input_text ) + { driver_filter_input_text = ""; + } driver_filter_string = Printer::DeriveDriverFilterString( driver_filter_input_text ); if( "" == driver_filter_string ) - { driver_filter_input_text = _("any model"); + { driver_filter_input_text = any_model_driver_filter_input_text; } UI::ReplaceWidget( `id(`driver_filter_input_replace_point), `InputField @@ -942,7 +964,7 @@ ); continue; } - if( ret == `more_drivers ) + if( `more_drivers == user_input ) { if( non_matching_fallback_driver_filter_string != driver_filter_string ) { driver_filter_string = ""; } @@ -958,6 +980,7 @@ y2milestone( "More drivers for '%1'", driver_filter_input_text ); if( "" != driver_filter_input_text && "unknown" != tolower( driver_filter_input_text ) + && any_model_driver_filter_input_text != driver_filter_input_text && non_matching_fallback_driver_filter_string != driver_filter_string ) { string manufacturer_and_model_number = Printer::DeriveModelName( driver_filter_input_text, 2 ); @@ -1047,7 +1070,7 @@ `opt(`hstretch), // No InputField header because there is the "Caption for a printer driver selection": "", - _("any model") + any_model_driver_filter_input_text ) ); driver_items = Printer::DriverItems( "", true ); @@ -1068,11 +1091,11 @@ ); continue; } - y2milestone( "Ignoring unexpected returncode in BasicModifyDialog: %1", ret ); + y2milestone( "Ignoring unexpected returncode in BasicModifyDialog: %1", user_input ); continue; } y2milestone( "leaving BasicModifyDialog" ); - return ret; + return user_input; } /* EOF */ -- 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] r60450 - in /branches/SuSE-Code-11-SP1-Branch/storage: VERSION libstorage/src/Disk.cc package/yast2-storage.changes storage/src/include/ep-hd-dialogs.ycp
by fehr＠svn.opensuse.org 19 Jan '10

19 Jan '10

Author: fehr Date: Tue Jan 19 14:23:08 2010 New Revision: 60450 URL: http://svn.opensuse.org/viewcvs/yast?rev=60450&view=rev Log: - allow to use cylinder 0 for partition (bnc #571749) - 2.17.88 Modified: branches/SuSE-Code-11-SP1-Branch/storage/VERSION branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Disk.cc branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/ep-hd-dialogs.ycp Modified: branches/SuSE-Code-11-SP1-Branch/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/VERSION Tue Jan 19 14:23:08 2010 @@ -1 +1 @@ -2.17.87 +2.17.88 Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Disk.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Disk.cc Tue Jan 19 14:23:08 2010 @@ -1299,7 +1299,7 @@ { ConstPartPair p = partPair(notDeletedNotLog); - unsigned long start = 1; + unsigned long start = 0; unsigned long end = cylinders(); list<Region> tmp; Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Tue Jan 19 14:23:08 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 19 14:14:26 CET 2010 - fehr(a)suse.de + +- allow to use cylinder 0 for partition (bnc #571749) +- 2.17.88 + +------------------------------------------------------------------- Fri Jan 08 15:28:03 CET 2010 - aschnell(a)suse.de - fixed numbering of RAIDs (bnc #567662) Modified: branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/ep-hd-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/ep-hd-dialogs.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/ep-hd-dialogs.ycp Tue Jan 19 14:23:08 2010 @@ -137,9 +137,9 @@ `LeftRadioButtonWithAttachment(`id(`manual_region), `opt(`notify), _("Custom Region"), `VBox(`id(`manual_region_attachment), `MinWidth(10, `IntField(`id(`start_cyl), _("Start Cylinder"), - 1, cyl_count, Region::Start(region))), + 0, cyl_count, Region::Start(region))), `MinWidth(10, `IntField(`id(`end_cyl), _("End Cylinder"), - 1, cyl_count, Region::End(region))) + 0, cyl_count, Region::End(region))) )) ) ) -- 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] r60449 - /trunk/storage/storage/src/include/ep-hd-dialogs.ycp
by fehr＠svn.opensuse.org 19 Jan '10

19 Jan '10

Author: fehr Date: Tue Jan 19 14:21:19 2010 New Revision: 60449 URL: http://svn.opensuse.org/viewcvs/yast?rev=60449&view=rev Log: limit for partition size is still 1 cylinder Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-dialogs.ycp Tue Jan 19 14:21:19 2010 @@ -104,7 +104,7 @@ list<integer> region = data["region"]:slot; integer size_k = (region[1]:0 * cyl_size) / 1024; - integer min_num_cyl = 0; + integer min_num_cyl = 1; integer max_num_cyl = slot[1]:0; integer min_size_k = tointeger(min_num_cyl * cyl_size / 1024.0); -- 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] r60448 - in /trunk/storage: package/yast2-storage.changes storage/src/include/ep-hd-dialogs.ycp
by fehr＠svn.opensuse.org 19 Jan '10

19 Jan '10

Author: fehr Date: Tue Jan 19 14:15:08 2010 New Revision: 60448 URL: http://svn.opensuse.org/viewcvs/yast?rev=60448&view=rev Log: allow to use cylinder 0 for partition (bnc #571749) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-hd-dialogs.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 Tue Jan 19 14:15:08 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jan 19 14:14:26 CET 2010 - fehr(a)suse.de + +- allow to use cylinder 0 for partition (bnc #571749) + +------------------------------------------------------------------- Mon Jan 18 17:50:59 CET 2010 - aschnell(a)suse.de - added NFS4 support (fate #305171) Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-dialogs.ycp Tue Jan 19 14:15:08 2010 @@ -104,7 +104,7 @@ list<integer> region = data["region"]:slot; integer size_k = (region[1]:0 * cyl_size) / 1024; - integer min_num_cyl = 1; + integer min_num_cyl = 0; integer max_num_cyl = slot[1]:0; integer min_size_k = tointeger(min_num_cyl * cyl_size / 1024.0); @@ -142,9 +142,9 @@ `LeftRadioButtonWithAttachment(`id(`manual_region), `opt(`notify), _("Custom Region"), `VBox(`id(`manual_region_attachment), `MinWidth(10, `IntField(`id(`start_cyl), _("Start Cylinder"), - 1, cyl_count, Region::Start(region))), + 0, cyl_count, Region::Start(region))), `MinWidth(10, `IntField(`id(`end_cyl), _("End Cylinder"), - 1, cyl_count, Region::End(region))) + 0, cyl_count, Region::End(region))) )) ) ) -- 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] r60447 - /trunk/storage/storage/src/include/ep-hd.ycp
by aschnell＠svn.opensuse.org 19 Jan '10

19 Jan '10

Author: aschnell Date: Tue Jan 19 14:09:05 2010 New Revision: 60447 URL: http://svn.opensuse.org/viewcvs/yast?rev=60447&view=rev Log: - fixed Add button in dialog showing partitions Modified: trunk/storage/storage/src/include/ep-hd.ycp Modified: trunk/storage/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd.ycp (original) +++ trunk/storage/storage/src/include/ep-hd.ycp Tue Jan 19 14:09:05 2010 @@ -90,12 +90,7 @@ switch (Event::IsWidgetActivated(event)) { case `add: - if (is_disk) - EpCreatePartition(disk_device); - else - // error popup - Popup::Error(_("Select a hard disks, BIOS RAIDs or multipath -devices to add a partition.")); + EpCreatePartition(disk_device); break; case `edit: -- 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] r60446 - /trunk/autoinstallation/doc/CreateProfileDetails.xml
by ug＠svn.opensuse.org 19 Jan '10

19 Jan '10

Author: ug Date: Tue Jan 19 14:05:19 2010 New Revision: 60446 URL: http://svn.opensuse.org/viewcvs/yast?rev=60446&view=rev Log: docu fix Modified: trunk/autoinstallation/doc/CreateProfileDetails.xml Modified: trunk/autoinstallation/doc/CreateProfileDetails.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/CreateProfi… ============================================================================== --- trunk/autoinstallation/doc/CreateProfileDetails.xml (original) +++ trunk/autoinstallation/doc/CreateProfileDetails.xml Tue Jan 19 14:05:19 2010 @@ -452,11 +452,12 @@ </section> </sections> </screen> +</section> <section><title>Options</title> <para> the options depend on the <emphasis>type</emphasis>. </para> - <section>Options for section type: image and xen </section> + <section><title>Options for section type: image and xen</title> <table frame='top'> <tgroup cols="3"> <thead> @@ -580,10 +581,8 @@ </tbody> </tgroup> </table> - - </section> - <section>Options for section type: other (chainloader)</section> + <section><title>Options for section type: other (chainloader)</title> <table frame='top'> <tgroup cols="3"> <thead> @@ -764,6 +763,7 @@ </table> </section> </section> +</section> <section id="CreateProfile.Partitioning"> <title> -- 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 #722
by Hudson Integration Service 19 Jan '10

19 Jan '10

See <http://yast.suse.de:3334/job/webyast-service-11.1-i586/722/changes> Changes: [Josef Reidinger] use correct 'or' statement with correct priority [Josef Reidinger] use full path to polkit-action [Josef Reidinger] fix comment [Josef Reidinger] add fixme to problematic parts ------------------------------------------ [...truncated 839 lines...] from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:158:in `require' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:265:in `require_or_load' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:224:in `depend_on' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:136:in `require_dependency' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:414:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:413:in `each' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:413:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:411:in `each' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:411:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:197:in `process' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:113:in `send' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:113:in `run' from /src/rest-service/webservice/config/environment.rb:22 from /src/rest-service/webservice/test/test_helper.rb:2:in `require' from /src/rest-service/webservice/test/test_helper.rb:2 from /src/rest-service/webservice/lib/tasks/plugin_test/test_helper.rb:12:in `require' from /src/rest-service/webservice/lib/tasks/plugin_test/test_helper.rb:12 from plugin_test/functional/plugin_show_test.rb:6:in `require' from plugin_test/functional/plugin_show_test.rb:6 /usr/lib/ruby/vendor_ruby/1.8/rubygems/custom_require.rb:31:in `gem_original_require': /src/rest-service/webservice/app/models/account.rb:27: syntax error, unexpected tREGEXP_BEG, expecting kEND (SyntaxError) ...gin.match "'" || login.match /\\$/ #don't allow ' or \ in lo... ^ from /usr/lib/ruby/vendor_ruby/1.8/rubygems/custom_require.rb:31:in `require' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:158:in `require' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:265:in `require_or_load' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:224:in `depend_on' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:136:in `require_dependency' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:414:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:413:in `each' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:413:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:411:in `each' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:411:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:197:in `process' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:113:in `send' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:113:in `run' from /src/rest-service/webservice/config/environment.rb:22 from /src/rest-service/webservice/test/test_helper.rb:2:in `require' from /src/rest-service/webservice/test/test_helper.rb:2 from /src/rest-service/webservice/lib/tasks/plugin_test/test_helper.rb:12:in `require' from /src/rest-service/webservice/lib/tasks/plugin_test/test_helper.rb:12 from plugin_test/functional/plugin_index_test.rb:6:in `require' from plugin_test/functional/plugin_index_test.rb:6 *** WARNING: plugin NtpController does not work correctly. Please Have a look to log/test.log for additional information Checking plugin LogsController via HTTP GET requests... /usr/lib/ruby/vendor_ruby/1.8/rubygems/custom_require.rb:31:in `gem_original_require': /src/rest-service/webservice/app/models/account.rb:27: syntax error, unexpected tREGEXP_BEG, expecting kEND (SyntaxError) ...gin.match "'" || login.match /\\$/ #don't allow ' or \ in lo... ^ from /usr/lib/ruby/vendor_ruby/1.8/rubygems/custom_require.rb:31:in `require' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:158:in `require' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:265:in `require_or_load' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:224:in `depend_on' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:136:in `require_dependency' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:414:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:413:in `each' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:413:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:411:in `each' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:411:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:197:in `process' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:113:in `send' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:113:in `run' from /src/rest-service/webservice/config/environment.rb:22 from /src/rest-service/webservice/test/test_helper.rb:2:in `require' from /src/rest-service/webservice/test/test_helper.rb:2 from /src/rest-service/webservice/lib/tasks/plugin_test/test_helper.rb:12:in `require' from /src/rest-service/webservice/lib/tasks/plugin_test/test_helper.rb:12 from plugin_test/functional/plugin_show_test.rb:6:in `require' from plugin_test/functional/plugin_show_test.rb:6 /usr/lib/ruby/vendor_ruby/1.8/rubygems/custom_require.rb:31:in `gem_original_require': /src/rest-service/webservice/app/models/account.rb:27: syntax error, unexpected tREGEXP_BEG, expecting kEND (SyntaxError) ...gin.match "'" || login.match /\\$/ #don't allow ' or \ in lo... ^ from /usr/lib/ruby/vendor_ruby/1.8/rubygems/custom_require.rb:31:in `require' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:158:in `require' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:265:in `require_or_load' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:224:in `depend_on' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:136:in `require_dependency' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:414:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:413:in `each' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:413:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:411:in `each' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:411:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:197:in `process' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:113:in `send' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:113:in `run' from /src/rest-service/webservice/config/environment.rb:22 from /src/rest-service/webservice/test/test_helper.rb:2:in `require' from /src/rest-service/webservice/test/test_helper.rb:2 from /src/rest-service/webservice/lib/tasks/plugin_test/test_helper.rb:12:in `require' from /src/rest-service/webservice/lib/tasks/plugin_test/test_helper.rb:12 from plugin_test/functional/plugin_index_test.rb:6:in `require' from plugin_test/functional/plugin_index_test.rb:6 *** WARNING: plugin LogsController does not work correctly. Please Have a look to log/test.log for additional information Checking plugin GraphsController via HTTP GET requests... /usr/lib/ruby/vendor_ruby/1.8/rubygems/custom_require.rb:31:in `gem_original_require': /src/rest-service/webservice/app/models/account.rb:27: syntax error, unexpected tREGEXP_BEG, expecting kEND (SyntaxError) ...gin.match "'" || login.match /\\$/ #don't allow ' or \ in lo... ^ from /usr/lib/ruby/vendor_ruby/1.8/rubygems/custom_require.rb:31:in `require' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:158:in `require' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:265:in `require_or_load' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:224:in `depend_on' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:136:in `require_dependency' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:414:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:413:in `each' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:413:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:411:in `each' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:411:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:197:in `process' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:113:in `send' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:113:in `run' from /src/rest-service/webservice/config/environment.rb:22 from /src/rest-service/webservice/test/test_helper.rb:2:in `require' from /src/rest-service/webservice/test/test_helper.rb:2 from /src/rest-service/webservice/lib/tasks/plugin_test/test_helper.rb:12:in `require' from /src/rest-service/webservice/lib/tasks/plugin_test/test_helper.rb:12 from plugin_test/functional/plugin_show_test.rb:6:in `require' from plugin_test/functional/plugin_show_test.rb:6 /usr/lib/ruby/vendor_ruby/1.8/rubygems/custom_require.rb:31:in `gem_original_require': /src/rest-service/webservice/app/models/account.rb:27: syntax error, unexpected tREGEXP_BEG, expecting kEND (SyntaxError) ...gin.match "'" || login.match /\\$/ #don't allow ' or \ in lo... ^ from /usr/lib/ruby/vendor_ruby/1.8/rubygems/custom_require.rb:31:in `require' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:158:in `require' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:265:in `require_or_load' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:224:in `depend_on' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:136:in `require_dependency' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:414:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:413:in `each' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:413:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:411:in `each' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:411:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:197:in `process' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:113:in `send' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:113:in `run' from /src/rest-service/webservice/config/environment.rb:22 from /src/rest-service/webservice/test/test_helper.rb:2:in `require' from /src/rest-service/webservice/test/test_helper.rb:2 from /src/rest-service/webservice/lib/tasks/plugin_test/test_helper.rb:12:in `require' from /src/rest-service/webservice/lib/tasks/plugin_test/test_helper.rb:12 from plugin_test/functional/plugin_index_test.rb:6:in `require' from plugin_test/functional/plugin_index_test.rb:6 *** WARNING: plugin GraphsController does not work correctly. Please Have a look to log/test.log for additional information Checking plugin MetricsController via HTTP GET requests... /usr/lib/ruby/vendor_ruby/1.8/rubygems/custom_require.rb:31:in `gem_original_require': /src/rest-service/webservice/app/models/account.rb:27: syntax error, unexpected tREGEXP_BEG, expecting kEND (SyntaxError) ...gin.match "'" || login.match /\\$/ #don't allow ' or \ in lo... ^ from /usr/lib/ruby/vendor_ruby/1.8/rubygems/custom_require.rb:31:in `require' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:158:in `require' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:265:in `require_or_load' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:224:in `depend_on' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:136:in `require_dependency' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:414:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:413:in `each' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:413:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:411:in `each' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:411:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:197:in `process' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:113:in `send' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:113:in `run' from /src/rest-service/webservice/config/environment.rb:22 from /src/rest-service/webservice/test/test_helper.rb:2:in `require' from /src/rest-service/webservice/test/test_helper.rb:2 from /src/rest-service/webservice/lib/tasks/plugin_test/test_helper.rb:12:in `require' from /src/rest-service/webservice/lib/tasks/plugin_test/test_helper.rb:12 from plugin_test/functional/plugin_show_test.rb:6:in `require' from plugin_test/functional/plugin_show_test.rb:6 /usr/lib/ruby/vendor_ruby/1.8/rubygems/custom_require.rb:31:in `gem_original_require': /src/rest-service/webservice/app/models/account.rb:27: syntax error, unexpected tREGEXP_BEG, expecting kEND (SyntaxError) ...gin.match "'" || login.match /\\$/ #don't allow ' or \ in lo... ^ from /usr/lib/ruby/vendor_ruby/1.8/rubygems/custom_require.rb:31:in `require' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:158:in `require' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:265:in `require_or_load' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:224:in `depend_on' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:136:in `require_dependency' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:414:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:413:in `each' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:413:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:411:in `each' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:411:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:197:in `process' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:113:in `send' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:113:in `run' from /src/rest-service/webservice/config/environment.rb:22 from /src/rest-service/webservice/test/test_helper.rb:2:in `require' from /src/rest-service/webservice/test/test_helper.rb:2 from /src/rest-service/webservice/lib/tasks/plugin_test/test_helper.rb:12:in `require' from /src/rest-service/webservice/lib/tasks/plugin_test/test_helper.rb:12 from plugin_test/functional/plugin_index_test.rb:6:in `require' from plugin_test/functional/plugin_index_test.rb:6 *** WARNING: plugin MetricsController does not work correctly. Please Have a look to log/test.log for additional information ******************************************************* Please, fix the above errors before running the service ******************************************************* + 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 + rake check_syntax (in /src/rest-service) app/models/account.rb:27: syntax error, unexpected tREGEXP_BEG, expecting kEND ...gin.match "'" || login.match /\\$/ #don't allow ' or \ in lo... ^ (in /src/rest-service/webservice) * Starting syntax check... ERROR: Syntax error found rake aborted! Error on execute '/usr/bin/rake check_syntax' inside webservice/ /src/rest-service/Rakefile:29 (See full trace by running task with --trace) ++ error_exit 1 ++ echo 'ERROR: detected exit code 1' ERROR: detected exit code 1 ++ 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 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 1

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

19 Jan '10

See <http://yast.suse.de:3334/job/webyast-service-head-i586/675/changes> Changes: [Josef Reidinger] use correct 'or' statement with correct priority [Josef Reidinger] use full path to polkit-action [Josef Reidinger] fix comment [Josef Reidinger] add fixme to problematic parts ------------------------------------------ [...truncated 842 lines...] from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:265:in `require_or_load' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:224:in `depend_on' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:136:in `require_dependency' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:414:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:413:in `each' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:413:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:411:in `each' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:411:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:197:in `process' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:113:in `send' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:113:in `run' from /src/rest-service/webservice/config/environment.rb:22 from /src/rest-service/webservice/test/test_helper.rb:2:in `require' from /src/rest-service/webservice/test/test_helper.rb:2 from /src/rest-service/webservice/lib/tasks/plugin_test/test_helper.rb:12:in `require' from /src/rest-service/webservice/lib/tasks/plugin_test/test_helper.rb:12 from plugin_test/functional/plugin_show_test.rb:6:in `require' from plugin_test/functional/plugin_show_test.rb:6 /usr/lib/ruby/vendor_ruby/1.8/rubygems/custom_require.rb:31:in `gem_original_require': /src/rest-service/webservice/app/models/account.rb:27: syntax error, unexpected tREGEXP_BEG, expecting kEND (SyntaxError) ...gin.match "'" || login.match /\\$/ #don't allow ' or \ in lo... ^ from /usr/lib/ruby/vendor_ruby/1.8/rubygems/custom_require.rb:31:in `require' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:158:in `require' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:265:in `require_or_load' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:224:in `depend_on' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:136:in `require_dependency' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:414:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:413:in `each' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:413:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:411:in `each' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:411:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:197:in `process' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:113:in `send' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:113:in `run' from /src/rest-service/webservice/config/environment.rb:22 from /src/rest-service/webservice/test/test_helper.rb:2:in `require' from /src/rest-service/webservice/test/test_helper.rb:2 from /src/rest-service/webservice/lib/tasks/plugin_test/test_helper.rb:12:in `require' from /src/rest-service/webservice/lib/tasks/plugin_test/test_helper.rb:12 from plugin_test/functional/plugin_index_test.rb:6:in `require' from plugin_test/functional/plugin_index_test.rb:6 *** WARNING: plugin NtpController does not work correctly. Please Have a look to log/test.log for additional information Checking plugin LogsController via HTTP GET requests... /usr/lib/ruby/vendor_ruby/1.8/rubygems/custom_require.rb:31:in `gem_original_require': /src/rest-service/webservice/app/models/account.rb:27: syntax error, unexpected tREGEXP_BEG, expecting kEND (SyntaxError) ...gin.match "'" || login.match /\\$/ #don't allow ' or \ in lo... ^ from /usr/lib/ruby/vendor_ruby/1.8/rubygems/custom_require.rb:31:in `require' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:158:in `require' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:265:in `require_or_load' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:224:in `depend_on' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:136:in `require_dependency' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:414:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:413:in `each' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:413:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:411:in `each' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:411:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:197:in `process' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:113:in `send' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:113:in `run' from /src/rest-service/webservice/config/environment.rb:22 from /src/rest-service/webservice/test/test_helper.rb:2:in `require' from /src/rest-service/webservice/test/test_helper.rb:2 from /src/rest-service/webservice/lib/tasks/plugin_test/test_helper.rb:12:in `require' from /src/rest-service/webservice/lib/tasks/plugin_test/test_helper.rb:12 from plugin_test/functional/plugin_show_test.rb:6:in `require' from plugin_test/functional/plugin_show_test.rb:6 /usr/lib/ruby/vendor_ruby/1.8/rubygems/custom_require.rb:31:in `gem_original_require': /src/rest-service/webservice/app/models/account.rb:27: syntax error, unexpected tREGEXP_BEG, expecting kEND (SyntaxError) ...gin.match "'" || login.match /\\$/ #don't allow ' or \ in lo... ^ from /usr/lib/ruby/vendor_ruby/1.8/rubygems/custom_require.rb:31:in `require' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:158:in `require' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:265:in `require_or_load' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:224:in `depend_on' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:136:in `require_dependency' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:414:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:413:in `each' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:413:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:411:in `each' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:411:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:197:in `process' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:113:in `send' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:113:in `run' from /src/rest-service/webservice/config/environment.rb:22 from /src/rest-service/webservice/test/test_helper.rb:2:in `require' from /src/rest-service/webservice/test/test_helper.rb:2 from /src/rest-service/webservice/lib/tasks/plugin_test/test_helper.rb:12:in `require' from /src/rest-service/webservice/lib/tasks/plugin_test/test_helper.rb:12 from plugin_test/functional/plugin_index_test.rb:6:in `require' from plugin_test/functional/plugin_index_test.rb:6 *** WARNING: plugin LogsController does not work correctly. Please Have a look to log/test.log for additional information Checking plugin GraphsController via HTTP GET requests... /usr/lib/ruby/vendor_ruby/1.8/rubygems/custom_require.rb:31:in `gem_original_require': /src/rest-service/webservice/app/models/account.rb:27: syntax error, unexpected tREGEXP_BEG, expecting kEND (SyntaxError) ...gin.match "'" || login.match /\\$/ #don't allow ' or \ in lo... ^ from /usr/lib/ruby/vendor_ruby/1.8/rubygems/custom_require.rb:31:in `require' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:158:in `require' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:265:in `require_or_load' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:224:in `depend_on' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:136:in `require_dependency' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:414:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:413:in `each' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:413:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:411:in `each' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:411:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:197:in `process' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:113:in `send' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:113:in `run' from /src/rest-service/webservice/config/environment.rb:22 from /src/rest-service/webservice/test/test_helper.rb:2:in `require' from /src/rest-service/webservice/test/test_helper.rb:2 from /src/rest-service/webservice/lib/tasks/plugin_test/test_helper.rb:12:in `require' from /src/rest-service/webservice/lib/tasks/plugin_test/test_helper.rb:12 from plugin_test/functional/plugin_show_test.rb:6:in `require' from plugin_test/functional/plugin_show_test.rb:6 /usr/lib/ruby/vendor_ruby/1.8/rubygems/custom_require.rb:31:in `gem_original_require': /src/rest-service/webservice/app/models/account.rb:27: syntax error, unexpected tREGEXP_BEG, expecting kEND (SyntaxError) ...gin.match "'" || login.match /\\$/ #don't allow ' or \ in lo... ^ from /usr/lib/ruby/vendor_ruby/1.8/rubygems/custom_require.rb:31:in `require' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:158:in `require' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:265:in `require_or_load' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:224:in `depend_on' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:136:in `require_dependency' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:414:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:413:in `each' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:413:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:411:in `each' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:411:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:197:in `process' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:113:in `send' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:113:in `run' from /src/rest-service/webservice/config/environment.rb:22 from /src/rest-service/webservice/test/test_helper.rb:2:in `require' from /src/rest-service/webservice/test/test_helper.rb:2 from /src/rest-service/webservice/lib/tasks/plugin_test/test_helper.rb:12:in `require' from /src/rest-service/webservice/lib/tasks/plugin_test/test_helper.rb:12 from plugin_test/functional/plugin_index_test.rb:6:in `require' from plugin_test/functional/plugin_index_test.rb:6 *** WARNING: plugin GraphsController does not work correctly. Please Have a look to log/test.log for additional information Checking plugin MetricsController via HTTP GET requests... /usr/lib/ruby/vendor_ruby/1.8/rubygems/custom_require.rb:31:in `gem_original_require': /src/rest-service/webservice/app/models/account.rb:27: syntax error, unexpected tREGEXP_BEG, expecting kEND (SyntaxError) ...gin.match "'" || login.match /\\$/ #don't allow ' or \ in lo... ^ from /usr/lib/ruby/vendor_ruby/1.8/rubygems/custom_require.rb:31:in `require' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:158:in `require' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:265:in `require_or_load' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:224:in `depend_on' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:136:in `require_dependency' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:414:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:413:in `each' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:413:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:411:in `each' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:411:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:197:in `process' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:113:in `send' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:113:in `run' from /src/rest-service/webservice/config/environment.rb:22 from /src/rest-service/webservice/test/test_helper.rb:2:in `require' from /src/rest-service/webservice/test/test_helper.rb:2 from /src/rest-service/webservice/lib/tasks/plugin_test/test_helper.rb:12:in `require' from /src/rest-service/webservice/lib/tasks/plugin_test/test_helper.rb:12 from plugin_test/functional/plugin_show_test.rb:6:in `require' from plugin_test/functional/plugin_show_test.rb:6 /usr/lib/ruby/vendor_ruby/1.8/rubygems/custom_require.rb:31:in `gem_original_require': /src/rest-service/webservice/app/models/account.rb:27: syntax error, unexpected tREGEXP_BEG, expecting kEND (SyntaxError) ...gin.match "'" || login.match /\\$/ #don't allow ' or \ in lo... ^ from /usr/lib/ruby/vendor_ruby/1.8/rubygems/custom_require.rb:31:in `require' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:158:in `require' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:265:in `require_or_load' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:224:in `depend_on' from /usr/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/active_support/dependencies.rb:136:in `require_dependency' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:414:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:413:in `each' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:413:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:411:in `each' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:411:in `load_application_classes' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:197:in `process' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:113:in `send' from /usr/lib/ruby/gems/1.8/gems/rails-2.3.5/lib/initializer.rb:113:in `run' from /src/rest-service/webservice/config/environment.rb:22 from /src/rest-service/webservice/test/test_helper.rb:2:in `require' from /src/rest-service/webservice/test/test_helper.rb:2 from /src/rest-service/webservice/lib/tasks/plugin_test/test_helper.rb:12:in `require' from /src/rest-service/webservice/lib/tasks/plugin_test/test_helper.rb:12 from plugin_test/functional/plugin_index_test.rb:6:in `require' from plugin_test/functional/plugin_index_test.rb:6 *** WARNING: plugin MetricsController does not work correctly. Please Have a look to log/test.log for additional information ******************************************************* Please, fix the above errors before running the service ******************************************************* + 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 + rake check_syntax (in /src/rest-service) app/models/account.rb:27: syntax error, unexpected tREGEXP_BEG, expecting kEND ...gin.match "'" || login.match /\\$/ #don't allow ' or \ in lo... ^ (in /src/rest-service/webservice) * Starting syntax check... ERROR: Syntax error found rake aborted! Error on execute '/usr/bin/rake check_syntax' inside webservice/ /src/rest-service/Rakefile:29 (See full trace by running task with --trace) ++ error_exit 1 ++ echo 'ERROR: detected exit code 1' ERROR: detected exit code 1 ++ 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 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 1

[yast-commit] r60445 - in /trunk/autoinstallation: doc/CreateProfileDetails.xml package/autoyast2.changes
by ug＠svn.opensuse.org 19 Jan '10

19 Jan '10

Author: ug Date: Tue Jan 19 13:27:39 2010 New Revision: 60445 URL: http://svn.opensuse.org/viewcvs/yast?rev=60445&view=rev Log: bootloader docu rewritten Modified: trunk/autoinstallation/doc/CreateProfileDetails.xml trunk/autoinstallation/package/autoyast2.changes Modified: trunk/autoinstallation/doc/CreateProfileDetails.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/CreateProfi… ============================================================================== --- trunk/autoinstallation/doc/CreateProfileDetails.xml (original) +++ trunk/autoinstallation/doc/CreateProfileDetails.xml Tue Jan 19 13:27:39 2010 @@ -214,138 +214,556 @@ <section id="CreateProfile.Bootloader"> <title>The Boot loader</title> + <para>This documentation is for yast2-bootloader and is is valid for SLE11 and openSUSE 11.0+. For older versions please use the documentation that comes with your distribution in /usr/share/doc/packages/autoyast2/</para> <para> - It is now possible to specify which bootloader needs to be - installed and it is possible to specify sections and - more bootloader options. - </para> - <para> - If the bootloader resource is not configured at all, the system will - propose a configuration based on the partitioning scheme. If no global - variables are configured, the system will propose a configuration for the - global variables based on the partitioning scheme. Similarly, if no - sections are configured, the system will propose a section configuration. - No changes or additions will be made to existing global variables or - existing sections. - Only for the grub bootloader, missing standard values in the global - variables will be filled with default values. - </para> - <para> - In some cases you must decide where to install the bootloader (the - Master Boot Record or the first sector of the <filename>/boot</filename> - partition) and must specify additional options for the bootloader to be - installed correctly. + General scope of autoyast profile only bootloader part. + <screen> +<bootloader> + <device_map config:type="list"> + - info about order of devices in device.map + </device_map> + <global> + - info about configuration of installation (installation settings for GRUB and generic boot code) + </global> + <initrd_modules config:type="list"> + - list of initrd modules + </initrd_modules> + <loader_type>grub</loader_type> - type of bootloader + <sections config:type="list"> + - bootloader sections in menu.lst + </sections> + </bootloader> +</screen> +</para> + <section><title>Device map</title> +<para> +You can define devices and their order in device.map but it is not necessary. yast2-bootloader checks the devices during the installation and proposes a device.map by itself. It can happen that the order of the devices is wrong or you have defined a different order than it is in the BIOS (please take care about changes there. it can leads to unbootable system). +</para> +<screen> +<device_map config:type="list"> + <device_map_entry> + <firmware>hd0</firmware>  + <linux>/dev/disk/by-id/ata-ST3500418AS_6VM23FX0</linux>  + </device_map_entry> +</device_map> +</screen> + </section> + <section><title>Globals</title> + <para> + This is an important part where you can define where to install GRUB and also how the boot process will work. It is not necessary to define this part as mentioned before, yast2-bootloader proposes a configuration by itself and so this is optional. Usually the AutoYaST profile includes only this part and all other parts are added automatically during installation by yast2-bootloader. Unless you have some special needs, you don't have to specify the bootloader config in the XML file. +<screen> + <global> + <activate>true</activate> + <default>openSUSE 11.2 - 2.6.31.5-0.1</default> + <gfxmenu>(hd0,1)/boot/message</gfxmenu> + <lines_cache_id>4</lines_cache_id> + <timeout config:type="integer">10</timeout> + </global> +</screen> </para> - <note> - <title>Boot Partition on IA64 Systems</title> - <para> - The boot partition on <emphasis>IA64</emphasis> is - <emphasis>/boot/efi</emphasis> and is set to this value if only - <emphasis>/boot</emphasis> is configured in the control - file. - </para> - </note> +<para> + <table frame='top'> + <tgroup cols="3"> + <thead> + <row> + <entry>Attribute</entry> + <entry>Values</entry> + <entry>Description</entry> + </row> + </thead> + <tbody> + <row> + <entry>activate</entry> + <entry> + <para>set boot flag on boot partition. The boot partition can be "/" if there is no separate /boot partition. If the boot partition is on logical partition, the boot flag is set to the extended partition. + </para> + <para><screen><activate>true</activate></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>default</entry> + <entry> + <para> + name(title) of the default boot section from menu.lst + </para> + <para><screen><default>openSUSE 11.2 - 2.6.31.5-0.1</default></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>gfxmenu</entry> + <entry> + <para> + path to the graphical boot menu (/boot/message). 'none' means don't use graphical boot menu + </para> + <para><screen><gfxmenu>(hd0,1)/boot/message</gfxmenu></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>timeout</entry> + <entry> + <para> + timeout in seconds for automatic booting the default boot section from menu.lst + </para> + <para><screen><timeout config:type="integer">10</timeout></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>generic_mbr</entry> + <entry> + <para> + write generic boot code to MBR. (It is ignored if boot_mbr is set to true) + </para> + <para><screen><generic_mbr>false</generic_mbr></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>boot_mbr</entry> + <entry> + <para> + write GRUB to MBR of the first disk in the order (device.map include order of disks) + </para> + <para><screen><boot_mbr>false</boot_mbr></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>boot_boot</entry> + <entry> + <para> + write GRUB to separate /boot partition (if separate /boot partition missing GRUB will be written to "/") + </para> + <para><screen><boot_boot>false</boot_boot></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>boot_root</entry> + <entry> + <para> + write GRUB to "/" partition + </para> + <para><screen><boot_root>false</boot_root></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>boot_extended</entry> + <entry> + <para> +write GRUB to the extended partition (it is important if you want to use a generic boot code and the "boot" partition is logical) NOTE: if the boot partition is logical it should use boot_mbr (write GRUB to MBR) instead of generic_mbr. + </para> + <para><screen><boot_extended>false</boot_extended></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>boot_custom</entry> + <entry> + <para> + write GRUB to custom device. + </para> + <para><screen><boot_custom>/dev/sda3</boot_custom></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>trusted_grub</entry> + <entry> + <para> + use trusted GRUB instead of the classical GRUB (gfxmenu is deleted automatically if this option is true) please doesn't use trusted GRUB if your hardware doesn't support it. + </para> + <para><screen><trusted_grub>false</trusted_grub></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>lines_cache_id</entry> + <entry> + <para> + internal option which means cache id for perl-Bootloader. Please don't use it or change it in a cloned XML file. + </para> + <para><screen></screen></para> + </entry> + <entry></entry> + </row> + </tbody> + </tgroup> +</table> +</para> + </section> + <section><title>Initrd modules </title> +<para> + This is a list of initrd modules. It is not necessary to add this part it should be added automatically. Please don't modify it if you are not sure what the initrd modules are. +</para> + </section> + <section><title>Loader Type</title> <para> - Additionally, you can configure special kernel and boot parameters, Kernel - parameters can be configured using the <emphasis>kernel_parameters</emphasis> property. + This part defines the type of the bootloader. It could be grub, lilo, ppc or elilo. </para> - <example> - <title>Bootloader configuration</title> - <screen> - <xi:include href="examples/example.bootloader.xml" parse="text" - xmlns:xi="http://www.w3.org/2001/XInclude"/> - </screen> - </example> - - <para> - The <emphasis>global</emphasis> resource is used to configure additional - boot loader options. Note that bootloaders can have different configurable - options. Consult the documentation for the specific bootloader you want to - use before adding any options. - </para> - <para> - For example, to configure the serial console with - <emphasis>grub</emphasis>, you can add the following options: - </para> - <example> - <title>Serial console configuration with GRUB</title> - <screen> - <xi:include href="examples/example.bootloader1.xml" parse="text" - xmlns:xi="http://www.w3.org/2001/XInclude"/> - </screen> - </example> - - <tip> + <screen> +<loader_type>grub</loader_type> + </screen> + </section> + <section><title>Sections</title> <para> - The bootloader configuration interface offers more - configuration options than one might need for a regular setup. The - options described in the example above should be sufficient for most - cases. +This includes the configuration of the boot sections in the menu.lst. This part is added by yast2-bootloader during installation automatically. It is good to know that yast2-bootloader deletes boot sections with no valid kernel and initrd path. It also deletes such boot sections. </para> - </tip> - - <para> - In the current version, bootloader configuration also supports different - architectures and boards. The configuration of the bootloader can be done - offline using &autoyast;. For example, the bootloader configuration for - PPC has the following additional options: - - </para> - <example> - <title>Bootloader configuration for PPC</title> - <screen> - <xi:include href="examples/example.bootloader2.xml" parse="text" - xmlns:xi="http://www.w3.org/2001/XInclude"/> - </screen> - </example> - <para>Currently the following bootloaders can be configured offline using the - &autoyast; interface:</para> - <itemizedlist> - <listitem> - <para>LILO</para> - </listitem> - <listitem> - <para>GRUB</para> - </listitem> - <listitem> - <para>ELILO</para> - </listitem> - <listitem> - <para>zipl</para> - </listitem> - <listitem> - <para>yaboot</para> - </listitem> - </itemizedlist> - <para> -Here are some important options for handling the content of the MBR: -<itemizedlist> - <listitem> - <para><boot_mbr> means write GRUB stage1 to MBR (if it is true)</para> - </listitem> - <listitem> - <para><generic_mbr> means write generic boot code to MBR (if it is true)</para> - </listitem> - <listitem> - <para><activate> set boot flag to boot or root partition (if it is true) it depends on partitioning of disk and moinpoints</para> - </listitem> - </itemizedlist> -If you want to disable the overwriting of the MBR set <boot_mbr> and <generic_mbr> to false: <screen> -<bootloader> - .... - <global> - <activate>true</activate> - <generic_mbr>false</generic_mbr> - <boot_mbr>false</boot_mbr> - </global> - .... -</bootloader> + <sections config:type="list"> + <section> + <append>resume=/dev/disk/by-id/raid-sil_ajacccbhejai-part2 splash=silent quiet showotps</append> + <image>(hd0,0)/vmlinuz-2.6.31-10-default</image> + <initial>1</initial> + <initrd>(hd0,0)/initrd-2.6.31-10-default</initrd> + <lines_cache_id>0</lines_cache_id> + <name>openSUSE 11.2 Milestone 8 - 2.6.31-10 (default)</name> + <original_name>linux</original_name> + <root>/dev/mapper/sil_ajacccbhejai_part3</root> + <type>image</type> + <vgamode>0x31a</vgamode> + </section> + <section> + <append>resume=/dev/disk/by-id/raid-sil_ajacccbhejai-part2 splash=silent quiet showopts</append> + <image>(hd0,0)/vmlinuz-2.6.31-10-xen</image> + <initrd>(hd0,0)/initrd-2.6.31-10-xen</initrd> + <lines_cache_id>2</lines_cache_id> + <name>Xen -- openSUSE 11.2 Milestone 8 - 2.6.31-10</name> + <nounzip>0</nounzip> + <original_name>xen</original_name> + <root>/dev/mapper/sil_ajacccbhejai_part3</root> + <type>xen</type> + <vgamode>0x31a</vgamode> + <xen>(hd0,0)/xen.gz</xen> + <xen_append></xen_append> + </section> + <section> + <blockoffset>1</blockoffset> + <chainloader>/dev/fd0</chainloader> + <lines_cache_id>3</lines_cache_id> + <name>Floppy</name> + <noverifyroot>true</noverifyroot> + <original_name>floppy</original_name> + <type>other</type> + </section> + </sections> </screen> -If <activate> is true the boot flag is changed to the boot or root partition. -If the boot partition is missing and root partition is on a logical partition, the boot flag will be set to extended partition. - </para> - </section> + <section><title>Options</title> + <para> +the options depend on the <emphasis>type</emphasis>. + </para> + <section>Options for section type: image and xen </section> + <table frame='top'> + <tgroup cols="3"> + <thead> + <row> + <entry>Attribute</entry> + <entry>Values</entry> + <entry>Description</entry> + </row> + </thead> + <tbody> + <row> + <entry>append</entry> + <entry> + <para> + list of kernel args but without(!) vga= and root= + </para> + <para><screen><append>splash=silent quiet showopts</append></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>image</entry> + <entry> + <para> + path to the kernel + </para> + <para><screen><image>(hd0,0)/vmlinuz-2.6.31-10</image></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>initrd</entry> + <entry> + <para> + path to the initrd + </para> + <para><screen><initrd>(hd0,0)/my-initrd</initrd></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>lines_cache_id</entry> + <entry> + <para> + internal option which means cache id for perl-Bootloader. Please don't use it or change it in a cloned XML file. + </para> + <para><screen></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>name</entry> + <entry> + <para> + name of section + </para> + <para><screen><name>Productive System</name></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>original_name</entry> + <entry> + <para> + internal name of section parsed by YaST from a comment in the config file. There are some rules for names and original_name helps to determine if boot section is linux or failsafe and for chainloader it helps to determine if it is windows or other linux/floppy etc. Please use simple original_name: linux, xen, windows, floppy etc. + </para> + <para><screen><original_name>linux</original_name></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>root</entry> + <entry> + <para> + location of the root partition ("/") + </para> + <para><screen><root>/dev/mapper/sil_ajacccbhejai_part3</root></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>type</entry> + <entry> + <para> + type of section it could (image/xen/other/menu) + </para> + <para><screen><type>xen</type></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>vgamode</entry> + <entry> + <para> + kernel arg for vga (vga=) + </para> + <para><screen><vgamode>0x31a</vgamode></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>xen</entry> + <entry> + <para> + path to xen.gz + </para> + <para><screen><xen>(hd0,0)/xen.gz</xen></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>xen_append</entry> + <entry> + <para> + kernel args for XEN + </para> + <para><screen><xen_append></xen_append></screen></para> + </entry> + <entry></entry> + </row> + </tbody> + </tgroup> +</table> + + + </section> + <section>Options for section type: other (chainloader)</section> + <table frame='top'> + <tgroup cols="3"> + <thead> + <row> + <entry>Attribute</entry> + <entry>Values</entry> + <entry>Description</entry> + </row> + </thead> + <tbody> + <row> + <entry>lines_cache_id</entry> + <entry> + <para> + internal option which means cache id for perl-Bootloader. Please don't use it or change it in a cloned XML file. + </para> + <para><screen></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>name</entry> + <entry> + <para> + name or title of section + </para> + <para><screen><name>Floppy</name></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>original_name</entry> + <entry> + <para> + internal name of section parsed by YaST from a comment in the config file. There are some rules for names and original_name helps to determine if boot section is linux or failsafe and for chainloader it helps to determine if it is windows or other linux/floppy etc. Please use simple original_name: linux, xen, windows, floppy etc. + </para> + <para><screen><original_name>linux</original_name></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>type</entry> + <entry> + <para> + type of section it could (image/xen/other/menu) + </para> + <para><screen><type>other</type></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>blockoffset</entry> + <entry> + <para> + offset in chainloader (used only in grub) + </para> + <para><screen><blockoffset>1</blockoffset></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>chainloader</entry> + <entry> + <para> + partition part for chainloader (so chainloader+blockoffset get final chainloader item in grub) + </para> + <para><screen><chainloader>/dev/fd0</chainloader></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>noverifyroot</entry> + <entry> + <para> + with/without checking root + </para> + <para><screen><noverifyroot>true</noverifyroot></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>remap</entry> + <entry> + <para> + it is special for windows and it means remapping disk which makes the second disk the first e.g. map (hd0) (hd1) map (hd1) (hd0) + </para> + <para><screen><remap>false</remap></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>makeactive</entry> + <entry> + <para> + add the makeactive argument for chainloader section + </para> + <para><screen><makeactive>false</makeactive></screen></para> + </entry> + <entry></entry> + </row> + </tbody> + </tgroup> +</table> +</section> + <section><title>Options for section type: menu (configfile)</title> + <table frame='top'> + <tgroup cols="3"> + <thead> + <row> + <entry>Attribute</entry> + <entry>Values</entry> + <entry>Description</entry> + </row> + </thead> + <tbody> + <row> + <entry>lines_cache_id</entry> + <entry> + <para> + internal option which means cache id for perl-Bootloader. Please don't use it or change it in a cloned XML file. + </para> + <para><screen></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>name</entry> + <entry> + <para> + name or title of section + </para> + <para><screen><name>Floppy</name></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>original_name</entry> + <entry> + <para> + internal name of section parsed by YaST from a comment in the config file. There are some rules for names and original_name helps to determine if boot section is linux or failsafe and for chainloader it helps to determine if it is windows or other linux/floppy etc. Please use simple original_name: linux, xen, windows, floppy etc. + </para> + <para><screen><original_name>linux</original_name></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>type</entry> + <entry> + <para> + type of section it could (image/xen/other/menu) + </para> + <para><screen><type>other</type></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>configfile</entry> + <entry> + <para> + path to menu.lst config file + </para> + <para><screen><configfile>1</configfile></screen></para> + </entry> + <entry></entry> + </row> + <row> + <entry>root</entry> + <entry> + <para> + device name for loading menu.lst from other installation of linux + </para> + <para><screen><root>/dev/sda1</root></screen></para> + </entry> + <entry></entry> + </row> + </tbody> + </tgroup> +</table> +</section> +</section> <section id="CreateProfile.Partitioning"> <title> Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Tue Jan 19 13:27:39 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 19 13:26:19 CET 2010 - ug(a)suse.de + +- bootloader docu rewritten - thanx to Jozef Uhliarik for + helping me (bnc#529967) + +------------------------------------------------------------------- Thu Jan 14 15:05:16 CET 2010 - ug(a)suse.de - autoyast=label://LABEL/PATH implemented (fate#308525) -- 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] r60444 - /branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp
by kmachalkova＠svn.opensuse.org 19 Jan '10

19 Jan '10

Author: kmachalkova Date: Tue Jan 19 13:15:51 2010 New Revision: 60444 URL: http://svn.opensuse.org/viewcvs/yast?rev=60444&view=rev Log: Normal indentation. See also: http://forgeftp.novell.com/yast/doc/SL11.1/codingrules/indentation.html Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp Tue Jan 19 13:15:51 2010 @@ -383,6 +383,7 @@ // if(!write_only && NetHwDetection::running) NetHwDetection::Stop(); /* Stop the detection */ + //FIXME: not only LanItems if(!LanItems::modified) { y2milestone("No changes to network setup -> nothing to write"); return true; @@ -434,7 +435,8 @@ if(Abort()) return false; /* Progress step 3 - multiple devices may be present, really plural*/ ProgressNextStage(_("Writing device configuration...")); - if (!Mode::autoinst()) LanItems::WriteUdevDriverRules(); + if (!Mode::autoinst()) + LanItems::WriteUdevDriverRules(); NetworkInterfaces::Write("netcard"); // WriteDevices(); sleep(sl); @@ -483,94 +485,99 @@ } if(!write_only) { - if(Abort()) return false; - /* Progress step 9 */ - ProgressNextStage(_("Activating network services...")); -// NetworkModules::HwUp (); - // during installation export sysconfig settings into NetworkManager (bnc#433084) - if (Mode::installation() && NetworkService::IsManaged()) y2internal("Export sysconfig settings into NetworkManager %1", SCR::Execute(.target.bash_output, "/usr/lib/NetworkManager/nm-opensuse-sysconfig-merge --connections")); - -y2internal("virt_net_proposal %1", virt_net_proposal); - if (Stage::cont() && virt_net_proposal && (Linuxrc::usessh() || Linuxrc::vnc() || Linuxrc::display_ip())) { - UI::OpenDialog(`opt(`decorated), `HBox( - `HSpacing(1), - `HCenter(`HSquash(`VBox( - `HCenter(`HSquash(`VBox( - // This is the heading of the popup box - `Left(`Heading(_("Confirm Network Restart"))), - `VSpacing(0.5), - // This is in information message. Next come the - // hardware class name (network cards). - `HVCenter(`Label(_("Because of bridged network YaST2 needs to restart network to apply the settings."))), - `VSpacing(0.5) - ))), - `ButtonBox ( - `HWeight (1, `PushButton (`id(`ok), `opt(`default, `okButton), Label::OKButton())), - /* PushButton label */ - `HWeight (1, `PushButton (`id (`cancel), `opt (`cancelButton), Label::CancelButton())) - ), - `VSpacing(0.2) - ))), - `HSpacing(1) - )); - - UI::SetFocus (`id(`ok)); - - // for autoinstallation popup has timeout 10 seconds (#192181) - // timeout for every case (bnc#429562) - any ret = UI::TimeoutUserInput(10*1000); - if (ret==`ok){ - y2internal("Restarting network because of bridged proposal"); - Service::Restart("network"); - } - UI::CloseDialog(); - } + if(Abort()) + return false; + /* Progress step 9 */ + ProgressNextStage(_("Activating network services...")); - // For ssh/vnc installation don't reload/restart network because possibility of IP change (bnc#347482) - else if (Stage::cont() && (Linuxrc::usessh() || Linuxrc::vnc() || Linuxrc::display_ip())) - y2milestone("For ssh or vnc installation don't reload/restart network during installation."); - else if (LanItems::force_restart) - Service::Restart("network"); - else if(Service::Status("network")==0){ - Service::Reload("network"); - } - else Service::Restart("network"); -// NetworkService::StartStop (); - sleep(sl); + // NetworkModules::HwUp (); + // during installation export sysconfig settings into NetworkManager (bnc#433084) + if (Mode::installation() && NetworkService::IsManaged()) + y2internal("Export sysconfig settings into NetworkManager %1", SCR::Execute(.target.bash_output, "/usr/lib/NetworkManager/nm-opensuse-sysconfig-merge --connections")); + + y2internal("virt_net_proposal %1", virt_net_proposal); + if (Stage::cont() && virt_net_proposal && (Linuxrc::usessh() || Linuxrc::vnc() || Linuxrc::display_ip())) { + UI::OpenDialog(`opt(`decorated), `HBox( + `HSpacing(1), + `HCenter(`HSquash(`VBox( + `HCenter(`HSquash(`VBox( + // This is the heading of the popup box + `Left(`Heading(_("Confirm Network Restart"))), + `VSpacing(0.5), + // This is in information message. Next come the + // hardware class name (network cards). + `HVCenter(`Label(_("Because of bridged network YaST2 needs to restart network to apply the settings."))), + `VSpacing(0.5) + ))), + `ButtonBox ( + `HWeight (1, `PushButton (`id(`ok), `opt(`default, `okButton), Label::OKButton())), + /* PushButton label */ + `HWeight (1, `PushButton (`id (`cancel), `opt (`cancelButton), Label::CancelButton())) + ), + `VSpacing(0.2) + ))), + `HSpacing(1) + )); + + UI::SetFocus (`id(`ok)); + + // for autoinstallation popup has timeout 10 seconds (#192181) + // timeout for every case (bnc#429562) + any ret = UI::TimeoutUserInput(10*1000); + if (ret==`ok){ + y2internal("Restarting network because of bridged proposal"); + Service::Restart("network"); + } + UI::CloseDialog(); + } + + // For ssh/vnc installation don't reload/restart network because possibility of IP change (bnc#347482) + else if (Stage::cont() && (Linuxrc::usessh() || Linuxrc::vnc() || Linuxrc::display_ip())) + y2milestone("For ssh or vnc installation don't reload/restart network during installation."); + else if (LanItems::force_restart) + Service::Restart("network"); + else if(Service::Status("network")==0){ + Service::Reload("network"); + } + else Service::Restart("network"); +// NetworkService::StartStop (); + sleep(sl); } if(Abort()) return false; /* Progress step 10 */ ProgressNextStage(_("Running SuSEconfig...")); - if(!write_only) RunSuSEconfig(); + if(!write_only) + RunSuSEconfig(); sleep(sl); if (!NetworkService::IsManaged() /*&& (boolean) SCR::Read(.init.scripts.exists, "smpppd")*/ && !write_only ) - { + { if(Abort()) return false; /* Progress step 11 */ ProgressNextStage(_("Setting up smpppd(8)...")); // takes care of autoinst by itself SetupSMPPPD(false); sleep(sl); + } - } - + // can't there just be 'else' instead of 'if'? fB. if (NetworkService::IsManaged()) - { - boolean network=false; - integer timeout=15; - while(timeout>0) - { - if (NetworkService::isNetworkRunning()){ - network=true; - break; + { + boolean network=false; + integer timeout=15; + while(timeout>0) + { + if (NetworkService::isNetworkRunning()){ + network=true; + break; + } + y2milestone("waiting for network ... %1", timeout); + sleep(1000); + timeout = timeout-1; } - y2milestone("waiting for network ... %1", timeout); - sleep(1000); - timeout = timeout-1; - } - if (!network) y2error("No network running"); + if (!network) + y2error("No network running"); } /* Final progress step */ -- 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 #720
by Hudson Integration Service 19 Jan '10

19 Jan '10

See <http://yast.suse.de:3334/job/webyast-service-11.1-i586/720/changes> Changes: [Josef Reidinger] add readme for documentation ------------------------------------------ [...truncated 4802 lines...] + rm -rf www + /usr/bin/bzip2 -dc /src/rest-service/plugins/eulas/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.593 + umask 022 + cd /tmp/rpmbuild + /bin/rm -rf /var/tmp/yast2-webservice-eulas-0.0.5-build ++ dirname /var/tmp/yast2-webservice-eulas-0.0.5-build + /bin/mkdir -p /var/tmp + /bin/mkdir /var/tmp/yast2-webservice-eulas-0.0.5-build + cd www + exit 0 Executing(%install): /bin/sh -e /var/tmp/rpm-tmp.593 + umask 022 + cd /tmp/rpmbuild + cd www + mkdir -p /var/tmp/yast2-webservice-eulas-0.0.5-build/usr/share/yastws/eulas + rm -r config/resources/licenses/openSUSE-11.1 + mv config/resources/licenses /var/tmp/yast2-webservice-eulas-0.0.5-build/usr/share/yastws/eulas/ + mkdir -p /var/tmp/yast2-webservice-eulas-0.0.5-build/var/lib/yastws/eulas/accepted-licenses + mkdir -p /var/tmp/yast2-webservice-eulas-0.0.5-build/srv/www/yastws/vendor/plugins/eulas + cp -a COPYING README Rakefile app config doc init.rb install.rb uninstall.rb /var/tmp/yast2-webservice-eulas-0.0.5-build/srv/www/yastws/vendor/plugins/eulas + rm -f /var/tmp/yast2-webservice-eulas-0.0.5-build/srv/www/yastws/vendor/plugins/eulas/COPYING + mkdir -p /var/tmp/yast2-webservice-eulas-0.0.5-build/etc/webyast/ + cp /src/rest-service/plugins/eulas/package/eulas-sles11.yml /var/tmp/yast2-webservice-eulas-0.0.5-build/etc/webyast/eulas.yml + RPM_BUILD_ROOT=/var/tmp/yast2-webservice-eulas-0.0.5-build + export RPM_BUILD_ROOT + test -x /usr/sbin/Check -a 0 = 0 -o -x /usr/sbin/Check -a '!' -z /var/tmp/yast2-webservice-eulas-0.0.5-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-eulas-0.0.5-0 Executing(%doc): /bin/sh -e /var/tmp/rpm-tmp.81698 + umask 022 + cd /tmp/rpmbuild + cd www + DOCDIR=/var/tmp/yast2-webservice-eulas-0.0.5-build/usr/share/doc/packages/yast2-webservice-eulas + export DOCDIR + rm -rf /var/tmp/yast2-webservice-eulas-0.0.5-build/usr/share/doc/packages/yast2-webservice-eulas + /bin/mkdir -p /var/tmp/yast2-webservice-eulas-0.0.5-build/usr/share/doc/packages/yast2-webservice-eulas + cp -pr COPYING /var/tmp/yast2-webservice-eulas-0.0.5-build/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 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.81698 + 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.83283 + 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.83283 + 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.92344 + 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 doc 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.79020 + 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 error: Installed (but unpackaged) file(s) found: /srv/www/yastws/vendor/plugins/ntp/doc/README_FOR_APP RPM build errors: Installed (but unpackaged) file(s) found: /srv/www/yastws/vendor/plugins/ntp/doc/README_FOR_APP + 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 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 1

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

19 Jan '10

See <http://yast.suse.de:3334/job/webyast-service-head-i586/673/changes> Changes: [Josef Reidinger] add readme for documentation ------------------------------------------ [...truncated 4813 lines...] + echo 'exit code: 0 ... good, lets continue' exit code: 0 ... good, lets continue + return + /usr/bin/rpmbuild -bb --define 'run_testsuite 1' yast2-webservice-eulas.spec Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.50hDQf + umask 022 + cd /tmp/rpmbuild + cd /tmp/rpmbuild + rm -rf www + /usr/bin/bzip2 -dc /src/rest-service/plugins/eulas/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.cyGtRl + umask 022 + cd /tmp/rpmbuild + /bin/rm -rf /usr/src/packages/BUILDROOT/yast2-webservice-eulas-0.0.5-0.i386 ++ dirname /usr/src/packages/BUILDROOT/yast2-webservice-eulas-0.0.5-0.i386 + /bin/mkdir -p /usr/src/packages/BUILDROOT + /bin/mkdir /usr/src/packages/BUILDROOT/yast2-webservice-eulas-0.0.5-0.i386 + cd www + exit 0 Executing(%install): /bin/sh -e /var/tmp/rpm-tmp.BgwzJs + umask 022 + cd /tmp/rpmbuild + cd www + mkdir -p /usr/src/packages/BUILDROOT/yast2-webservice-eulas-0.0.5-0.i386/usr/share/yastws/eulas + rm -r config/resources/licenses/openSUSE-11.1 + mv config/resources/licenses /usr/src/packages/BUILDROOT/yast2-webservice-eulas-0.0.5-0.i386/usr/share/yastws/eulas/ + mkdir -p /usr/src/packages/BUILDROOT/yast2-webservice-eulas-0.0.5-0.i386/var/lib/yastws/eulas/accepted-licenses + mkdir -p /usr/src/packages/BUILDROOT/yast2-webservice-eulas-0.0.5-0.i386/srv/www/yastws/vendor/plugins/eulas + cp -a COPYING README Rakefile app config doc init.rb install.rb uninstall.rb /usr/src/packages/BUILDROOT/yast2-webservice-eulas-0.0.5-0.i386/srv/www/yastws/vendor/plugins/eulas + rm -f /usr/src/packages/BUILDROOT/yast2-webservice-eulas-0.0.5-0.i386/srv/www/yastws/vendor/plugins/eulas/COPYING + mkdir -p /usr/src/packages/BUILDROOT/yast2-webservice-eulas-0.0.5-0.i386/etc/webyast/ + cp /src/rest-service/plugins/eulas/package/eulas-sles11.yml /usr/src/packages/BUILDROOT/yast2-webservice-eulas-0.0.5-0.i386/etc/webyast/eulas.yml + RPM_BUILD_ROOT=/usr/src/packages/BUILDROOT/yast2-webservice-eulas-0.0.5-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-eulas-0.0.5-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-eulas-0.0.5-0.noarch Executing(%doc): /bin/sh -e /var/tmp/rpm-tmp.fxO4Lt + umask 022 + cd /tmp/rpmbuild + cd www + 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.NbJ5VO + 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.d0hNsB + 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.iFLS21 + 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.2eeyDh + 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 doc 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.BKPdyY + 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 error: Installed (but unpackaged) file(s) found: /srv/www/yastws/vendor/plugins/ntp/doc/README_FOR_APP RPM build errors: Installed (but unpackaged) file(s) found: /srv/www/yastws/vendor/plugins/ntp/doc/README_FOR_APP + 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 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 1