Hello community, here is the log from the commit of package yast2-support for openSUSE:Factory checked in at 2013-08-23 11:07:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-support (Old) and /work/SRC/openSUSE:Factory/.yast2-support.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-support" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-support/yast2-support.changes 2013-08-01 11:10:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-support.new/yast2-support.changes 2013-08-23 11:07:01.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Aug 19 10:50:52 CEST 2013 - [email protected] + +- added option to include additional logs (bnc#806924) +- 3.0.1 + +------------------------------------------------------------------- Old: ---- yast2-support-3.0.0.tar.bz2 New: ---- yast2-support-3.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-support.spec ++++++ --- /var/tmp/diff_new_pack.kmD0XS/_old 2013-08-23 11:07:02.000000000 +0200 +++ /var/tmp/diff_new_pack.kmD0XS/_new 2013-08-23 11:07:02.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-support -Version: 3.0.0 +Version: 3.0.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-support-3.0.0.tar.bz2 -> yast2-support-3.0.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-support-3.0.0/Makefile.am.common new/yast2-support-3.0.1/Makefile.am.common --- old/yast2-support-3.0.0/Makefile.am.common 2013-07-31 12:35:47.000000000 +0200 +++ new/yast2-support-3.0.1/Makefile.am.common 2013-08-19 11:26:59.000000000 +0200 @@ -15,6 +15,7 @@ CLEANFILES = ${ybcfiles} DISTCLEANFILES = .dep +if HAS_YCP_MODULES # Needs to be outside "." because of cases # where ycpchook contains a symlink to "." # Otherwise "." keeps being newer than .dep and we loop. @@ -26,14 +27,16 @@ ${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP} cat ${NEWDEP} > .dep rm ${NEWDEP} +-include .dep +endif dist-hook: check-syntax CHECK_SYNTAX = true -check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(filter %.ycp,client_DATA)"; then \ +check-syntax: $(client_DATA) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles) + @if test "$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; then \ if $(CHECK_SYNTAX); then \ - TO_CHECK="$(filter %.ycp,$^)"; \ + TO_CHECK="$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; \ echo "Checking syntax of $${TO_CHECK}"; \ if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ @@ -43,5 +46,18 @@ echo "Syntax check disabled"; \ fi; \ fi + @if test "$(filter %.rb, $^)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.rb, $^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + for f in $${TO_CHECK}; do \ + if ! ruby -c $$f > /dev/null; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + done; \ + else \ + echo "Syntax check disabled"; \ + fi; \ + fi --include .dep diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-support-3.0.0/VERSION new/yast2-support-3.0.1/VERSION --- old/yast2-support-3.0.0/VERSION 2013-07-30 13:51:10.000000000 +0200 +++ new/yast2-support-3.0.1/VERSION 2013-08-19 11:26:51.000000000 +0200 @@ -1 +1 @@ -3.0.0 +3.0.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-support-3.0.0/autodocs-ycp.ami new/yast2-support-3.0.1/autodocs-ycp.ami --- old/yast2-support-3.0.0/autodocs-ycp.ami 2013-07-31 12:35:47.000000000 +0200 +++ new/yast2-support-3.0.1/autodocs-ycp.ami 2013-08-19 11:26:59.000000000 +0200 @@ -17,8 +17,11 @@ htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs +# find all files in Yast/ subdirectory if it exists +YARD_YAST_FILES = $(shell test -d Yast && find Yast -type f) + # use nobase_ prefix to keep the directory structure -nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) $(wildcard js/*) $(wildcard css/*) $(wildcard Yast/*) +nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) $(wildcard js/*) $(wildcard css/*) $(YARD_YAST_FILES) CLEANFILES = $(nobase_html_DATA) pod2htm*.tmp AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-support-3.0.0/configure new/yast2-support-3.0.1/configure --- old/yast2-support-3.0.0/configure 2013-07-31 12:35:51.000000000 +0200 +++ new/yast2-support-3.0.1/configure 2013-08-19 11:27:02.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2-support 3.0.0. +# Generated by GNU Autoconf 2.69 for yast2-support 3.0.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='yast2-support' PACKAGE_TARNAME='yast2-support' -PACKAGE_VERSION='3.0.0' -PACKAGE_STRING='yast2-support 3.0.0' +PACKAGE_VERSION='3.0.1' +PACKAGE_STRING='yast2-support 3.0.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -588,6 +588,8 @@ ac_default_prefix=/usr ac_subst_vars='LTLIBOBJS LIBOBJS +HAS_YCP_MODULES_FALSE +HAS_YCP_MODULES_TRUE YCPC YCPMAKEDEP YCPDOC @@ -1247,7 +1249,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-support 3.0.0 to adapt to many kinds of systems. +\`configure' configures yast2-support 3.0.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1318,7 +1320,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-support 3.0.0:";; + short | recursive ) echo "Configuration of yast2-support 3.0.1:";; esac cat <<\_ACEOF @@ -1398,7 +1400,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-support configure 3.0.0 +yast2-support configure 3.0.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1415,7 +1417,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-support $as_me 3.0.0, which was +It was created by yast2-support $as_me 3.0.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2354,7 +2356,7 @@ # Define the identity of the package. PACKAGE='yast2-support' - VERSION='3.0.0' + VERSION='3.0.1' cat >>confdefs.h <<_ACEOF @@ -2477,7 +2479,7 @@ -VERSION="3.0.0" +VERSION="3.0.1" RPMNAME="yast2-support" MAINTAINER="YaST2 Maintainers <[email protected]>" @@ -2841,6 +2843,29 @@ fi +# handle .dep files in Makefile.am.common if any YCP module is present +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for YCP modules" >&5 +$as_echo_n "checking for YCP modules... " >&6; } + +# YCP module file name starts with an upper case letter +find . -type f | grep -q "[[:upper:]][^/]*\.ycp$" && has_ycp_modules=1 + if test -n "$has_ycp_modules"; then + HAS_YCP_MODULES_TRUE= + HAS_YCP_MODULES_FALSE='#' +else + HAS_YCP_MODULES_TRUE='#' + HAS_YCP_MODULES_FALSE= +fi + + +if test -n "$has_ycp_modules"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 +$as_echo "found" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } +fi + ac_config_files="$ac_config_files Makefile agents/Makefile doc/autodocs/Makefile doc/Makefile src/Makefile testsuite/Makefile" @@ -3006,6 +3031,10 @@ as_fn_error $? "conditional \"CREATE_PKGCONFIG_NOARCH\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAS_YCP_MODULES_TRUE}" && test -z "${HAS_YCP_MODULES_FALSE}"; then + as_fn_error $? "conditional \"HAS_YCP_MODULES\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -3403,7 +3432,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-support $as_me 3.0.0, which was +This file was extended by yast2-support $as_me 3.0.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3456,7 +3485,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-support config.status 3.0.0 +yast2-support config.status 3.0.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-support-3.0.0/configure.ac new/yast2-support-3.0.1/configure.ac --- old/yast2-support-3.0.0/configure.ac 2013-07-31 12:35:47.000000000 +0200 +++ new/yast2-support-3.0.1/configure.ac 2013-08-19 11:26:59.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.ac for yast2-support dnl -dnl -- This file is generated by y2autoconf 2.24.7 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 3.0.4 - DO NOT EDIT! -- dnl (edit configure.ac.in or configure.in.in instead) -AC_INIT(yast2-support, 3.0.0, http://bugs.opensuse.org/, yast2-support) +AC_INIT(yast2-support, 3.0.1, http://bugs.opensuse.org/, yast2-support) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="3.0.0" +VERSION="3.0.1" RPMNAME="yast2-support" MAINTAINER="YaST2 Maintainers <[email protected]>" @@ -149,6 +149,19 @@ AC_MSG_WARN([yast2-testsuite.rpm is not installed]) ]) +# handle .dep files in Makefile.am.common if any YCP module is present +AC_MSG_CHECKING([for YCP modules]) + +# YCP module file name starts with an upper case letter +[find . -type f | grep -q "[[:upper:]][^/]*\.ycp$" && has_ycp_modules=1] +AM_CONDITIONAL([HAS_YCP_MODULES], [test -n "$has_ycp_modules"]) + +if test -n "$has_ycp_modules"; then + AC_MSG_RESULT([found]) +else + AC_MSG_RESULT([not found]) +fi + AC_CONFIG_FILES(Makefile agents/Makefile doc/autodocs/Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-support-3.0.0/doc/autodocs/Makefile.in new/yast2-support-3.0.1/doc/autodocs/Makefile.in --- old/yast2-support-3.0.0/doc/autodocs/Makefile.in 2013-07-31 12:35:52.000000000 +0200 +++ new/yast2-support-3.0.1/doc/autodocs/Makefile.in 2013-08-19 11:27:04.000000000 +0200 @@ -235,8 +235,11 @@ yncludedir = @yncludedir@ ystartupdir = @ystartupdir@ +# find all files in Yast/ subdirectory if it exists +YARD_YAST_FILES = $(shell test -d Yast && find Yast -type f) + # use nobase_ prefix to keep the directory structure -nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) $(wildcard js/*) $(wildcard css/*) $(wildcard Yast/*) +nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) $(wildcard js/*) $(wildcard css/*) $(YARD_YAST_FILES) CLEANFILES = $(nobase_html_DATA) pod2htm*.tmp all: all-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-support-3.0.0/src/Makefile.in new/yast2-support-3.0.1/src/Makefile.in --- old/yast2-support-3.0.0/src/Makefile.in 2013-07-31 12:35:52.000000000 +0200 +++ new/yast2-support-3.0.1/src/Makefile.in 2013-08-19 11:27:04.000000000 +0200 @@ -256,7 +256,7 @@ # Needs to be outside "." because of cases # where ycpchook contains a symlink to "." # Otherwise "." keeps being newer than .dep and we loop. -NEWDEP = ${top_builddir}/.dep.new +@HAS_YCP_MODULES_TRUE@NEWDEP = ${top_builddir}/.dep.new CHECK_SYNTAX = true all: all-am @@ -594,16 +594,17 @@ # generate dependencies # two steps not to lose the file if the command fails # hook: create the links before we look for files -.dep: $(wildcard *.ycp) ${ycpchook} - ${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP} - cat ${NEWDEP} > .dep - rm ${NEWDEP} +@[email protected]: $(wildcard *.ycp) ${ycpchook} +@HAS_YCP_MODULES_TRUE@ ${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP} +@HAS_YCP_MODULES_TRUE@ cat ${NEWDEP} > .dep +@HAS_YCP_MODULES_TRUE@ rm ${NEWDEP} +@HAS_YCP_MODULES_TRUE@-include .dep dist-hook: check-syntax -check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(filter %.ycp,client_DATA)"; then \ +check-syntax: $(client_DATA) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles) + @if test "$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; then \ if $(CHECK_SYNTAX); then \ - TO_CHECK="$(filter %.ycp,$^)"; \ + TO_CHECK="$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; \ echo "Checking syntax of $${TO_CHECK}"; \ if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ @@ -613,8 +614,20 @@ echo "Syntax check disabled"; \ fi; \ fi - --include .dep + @if test "$(filter %.rb, $^)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.rb, $^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + for f in $${TO_CHECK}; do \ + if ! ruby -c $$f > /dev/null; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + done; \ + else \ + echo "Syntax check disabled"; \ + fi; \ + fi # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-support-3.0.0/src/include/support/complex.rb new/yast2-support-3.0.1/src/include/support/complex.rb --- old/yast2-support-3.0.0/src/include/support/complex.rb 2013-07-30 13:51:10.000000000 +0200 +++ new/yast2-support-3.0.1/src/include/support/complex.rb 2013-08-19 11:26:51.000000000 +0200 @@ -161,7 +161,7 @@ ) ) end - Builtins.y2internal( + Builtins.y2milestone( "Read 2: %1", SCR.Read(path(".etc.supportconfig.all")) ) @@ -174,7 +174,6 @@ # @return `abort if aborted and `next otherwise def WriteDialog Wizard.RestoreHelp(Ops.get_string(@HELPS, "write", "")) - # Support::SetAbortFunction(PollAbort); ret = Support.Write ret ? :next : :abort end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-support-3.0.0/src/include/support/dialogs.rb new/yast2-support-3.0.1/src/include/support/dialogs.rb --- old/yast2-support-3.0.0/src/include/support/dialogs.rb 2013-07-30 13:51:10.000000000 +0200 +++ new/yast2-support-3.0.1/src/include/support/dialogs.rb 2013-08-19 11:26:51.000000000 +0200 @@ -291,9 +291,6 @@ if Convert.to_boolean(UI.QueryWidget(:upload, :Value)) url2 = Convert.to_string(UI.QueryWidget(:url, :Value)) if Ops.greater_than(Builtins.size(url2), 0) #{ - # if (issubstring(url, "https://secure-www.novell.com/upload?appname=supportconfig&file";)) - # command = sformat("%1 -u -U %2", command, sformat("https://secure-www.novell.com/upload?appname=supportconfig&file=%1";, Support::log_files["tarball"]:"")); - # else command = Builtins.sformat("%1 -u -U '%2'", command, url2) end # } @@ -332,7 +329,7 @@ Ops.get_string(Support.log_files, "tmp_dir", ""), Ops.get_string(Support.log_files, "log_dir", "") ) - Builtins.y2internal("command %1", command) + Builtins.y2milestone("command %1", command) output = Convert.convert( SCR.Execute(path(".target.bash_output"), command), :from => "any", @@ -352,7 +349,7 @@ "tarball", Ops.get_string(output, "stdout", "") ) - Builtins.y2internal( + Builtins.y2milestone( "input tarball : %1", Ops.get_string(Support.log_files, "tarball", "") ) @@ -421,7 +418,6 @@ caption = _("Supportconfig Parameters Configuration") items = [ - # `item(`id(`use_defaults), _("Use Defaults (ignore /etc/supportconfig.conf)"), Support::use_defaults), Item( Id(:full_listening), _("Create a full file listing from '/'"), @@ -437,8 +433,6 @@ _("Search root filesystem for eDirectory instances"), Support.search_for_edir ), - # `item(`id(`full_logging), _("Activates all support functions"), Support::full_logging), - # `item(`id(`minimal_logs), _("Only gather a minimum amount of info"), Support::minimal_logs), Item( Id(:include_slp), _("Include full SLP service lists"), @@ -448,6 +442,11 @@ Id(:rpm_check), _("Performs an rpm -V for each installed rpm"), Support.rpm_check + ), + Item( + Id(:additional_logs), + _("Include all log file lines, gather additional rotated logs"), + Support.additional_logs ) ] # Support configure1 dialog contents @@ -489,12 +488,7 @@ ) ) ) - ), # `Left( - # `HBox( - # `InputField(`id(`log_dir), _("Log directory"), Support::log_files["tmp_dir"]:""), - # `VBox(`Label(""), `PushButton(`id(`browse), Label::BrowseButton())) - # )), - # `MultiSelectionBox(`id(`options), _("Options"), items), + ), MultiSelectionBox(Id(:options), _("Options"), items) ) @@ -558,6 +552,7 @@ Support.minimal_logs = Builtins.contains(selected, :minimal_logs) Support.include_slp = Builtins.contains(selected, :include_slp) Support.rpm_check = Builtins.contains(selected, :rpm_check) + Support.additional_logs = Builtins.contains(selected, :additional_logs) case Convert.to_symbol(UI.QueryWidget(:rb, :CurrentButton)) when :use_defaults @@ -608,17 +603,12 @@ Ops.get_string(Support.options, key, "") == "1" ) ) - end # else - # table_items = add(table_items, `item(`id(key), key, Support::options[key]:"")); + end end # FIXME table header contents = HBox( MultiSelectionBox(Id(:opt_msb), _("Default Options"), bool_items) #, - # `VBox( - # `Table(`id(`var_table), `header(_("Name"), _("Value")), table_items), - # `PushButton(`id(`edit), Label::EditButton()) - # ) ) Wizard.SetContentsButtons( @@ -640,29 +630,6 @@ else next end - # edit - # else if(ret == `edit) { - # any id = UI::QueryWidget(`var_table, `CurrentItem); - # term row = (term)UI::QueryWidget(`var_table, `Item(id)); - # UI::OpenDialog(`VBox( - # `InputField(`id(`changed_value), row[1]:"", row[2]:""), - # `HBox( - # `PushButton(`id(`cancel), Label::CancelButton()), - # `PushButton(`id(`ok), Label::OKButton()) - # ) - # )); - # any ret=UI::UserInput(); - # if (ret==`ok){ - # string new_value = (string)UI::QueryWidget(`id(`changed_value), `Value); - # if (new_value != row[2]:"") { - # UI::CloseDialog(); - # UI::ChangeWidget(`id(`var_table), `Cell(`id(id), 1), new_value); - # continue; - # } - # } - # UI::CloseDialog(); - # continue; - # } elsif ret == :next Builtins.y2milestone( "store configuration for /etc/supportconfig.conf" @@ -681,7 +648,7 @@ if !Builtins.issubstring(key, "VAR_OPTION") bool_val = Builtins.contains(selected_items, key) if (val == "1") != bool_val - Builtins.y2internal( + Builtins.y2milestone( "value changed %1=%2, new value %3", key, val, @@ -689,13 +656,7 @@ ) Ops.set(Support.options, key, bool_val ? "1" : "0") end - end # else{ - # string new_val = (string)UI::QueryWidget(`var_table, `Cell(`id(key), 1)); - # if(new_val!=val){ - # y2internal("value changed %1=%2, new value %3", key, val, new_val); - # Support::options[key]=new_val; - # } - # } + end end break elsif ret == :back @@ -705,7 +666,7 @@ next end end - Builtins.y2internal("%1", Support.options) + Builtins.y2milestone("%1", Support.options) Convert.to_symbol(ret) end @@ -975,7 +936,7 @@ ) ) ) - Builtins.y2internal("output %1", output) + Builtins.y2milestone("output %1", output) if Ops.get_integer(output, "exit", -1) != 0 Popup.Error(Ops.get_string(output, "stderr", "")) return :back @@ -1045,25 +1006,9 @@ Id(:file_rp), RichText(Id(:file), Opt(:plainText), data) ) - # UI::ChangeWidget (`id (`file), `Value, data); end ret = Convert.to_symbol(UI.UserInput) if ret == :next - # string command = sformat("supportconfig %1 -f %2", Support::GetParameterList(), Support::log_files["tmp_dir"]:""); - # y2internal("executing %1", command); - # map<string, any> output = (map<string, any>)SCR::Execute(.target.bash_output, command); - # y2milestone("output %1", output); - # if (output["exit"]:-1 != 0) Report::Error (sformat("%1 : %2",_("Cannot write settings"), output)); - # else{ - # command = sformat("find \"%1\" -type f -name \"%2*\"|tr -d '\n'", Support::log_files["tmp_dir"]:"", Support::log_files["log_dir"]:""); - # y2internal("command %1", command); - # output=(map<string, any>)SCR::Execute(.target.bash_output, command); - # if (output["exit"]:-1 != 0) Report::Error (sformat("%1 : %2", _("Cannot write settings."), output)); - # else{ - # if(size(output["stdout"]:"")>0) Support::log_files["tarball"]=output["stdout"]:""; - # else y2error("Empty filename : %1", output); - # } - # } break end break if ret == :abort || ret == :back @@ -1081,7 +1026,7 @@ ) ret = :filelist # FIXME uncomment, following line not tested - Builtins.y2internal("removing %1%2", full_log_path, file) + Builtins.y2milestone("removing %1%2", full_log_path, file) SCR.Execute( path(".target.bash"), Builtins.sformat("/bin/rm %1%2", full_log_path, file) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-support-3.0.0/src/modules/Support.rb new/yast2-support-3.0.1/src/modules/Support.rb --- old/yast2-support-3.0.0/src/modules/Support.rb 2013-07-30 13:51:10.000000000 +0200 +++ new/yast2-support-3.0.1/src/modules/Support.rb 2013-08-19 11:26:51.000000000 +0200 @@ -78,6 +78,7 @@ @minimal_logs = false @include_slp = false @rpm_check = false + @additional_logs = false @novell_number = "" @log_files = {} @@ -230,6 +231,7 @@ parameters = Builtins.sformat("%1 %2", parameters, "-m") if @minimal_logs parameters = Builtins.sformat("%1 %2", parameters, "-s") if @include_slp parameters = Builtins.sformat("%1 %2", parameters, "-v") if @rpm_check + parameters = Builtins.sformat("%1 %2", parameters, "-l") if @additional_logs if Ops.greater_than(Builtins.size(@novell_number), 0) parameters = Builtins.sformat( "%1 %2 %3", @@ -466,6 +468,7 @@ publish :variable => :minimal_logs, :type => "boolean" publish :variable => :include_slp, :type => "boolean" publish :variable => :rpm_check, :type => "boolean" + publish :variable => :additional_logs, :type => "boolean" publish :variable => :novell_number, :type => "string" publish :variable => :log_files, :type => "map <string, any>" publish :variable => :browser, :type => "string" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
