Hello community,
here is the log from the commit of package yast2 for openSUSE:Factory checked
in at 2012-11-02 17:44:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2 (Old)
and /work/SRC/openSUSE:Factory/.yast2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2", Maintainer is "jsr...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2012-10-31
07:04:43.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2012-11-02
17:44:25.000000000 +0100
@@ -1,0 +2,7 @@
+Fri Nov 2 11:43:01 CET 2012 - jsuch...@suse.cz
+
+- move Log Viewer client here from dropped repair module
+ (bnc#787070)
+- 2.23.11
+
+-------------------------------------------------------------------
Old:
----
yast2-2.23.10.tar.bz2
New:
----
yast2-2.23.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.Q0zlDB/_old 2012-11-02 17:44:27.000000000 +0100
+++ /var/tmp/diff_new_pack.Q0zlDB/_new 2012-11-02 17:44:27.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2
-Version: 2.23.10
+Version: 2.23.11
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -239,6 +239,7 @@
#system
%dir /usr/share/YaST2/include/hwinfo
/usr/share/YaST2/include/hwinfo/*.ycp
+%{_prefix}/share/applications/YaST2/messages.desktop
# documentation
++++++ yast2-2.23.10.tar.bz2 -> yast2-2.23.11.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-2.23.10/VERSION new/yast2-2.23.11/VERSION
--- old/yast2-2.23.10/VERSION 2012-10-30 08:00:46.000000000 +0100
+++ new/yast2-2.23.11/VERSION 2012-11-02 11:43:42.000000000 +0100
@@ -1 +1 @@
-2.23.10
+2.23.11
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-2.23.10/configure new/yast2-2.23.11/configure
--- old/yast2-2.23.10/configure 2012-10-30 08:05:18.000000000 +0100
+++ new/yast2-2.23.11/configure 2012-11-02 11:57:19.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for yast2 2.23.10.
+# Generated by GNU Autoconf 2.69 for yast2 2.23.11.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -579,8 +579,8 @@
# Identity of this package.
PACKAGE_NAME='yast2'
PACKAGE_TARNAME='yast2'
-PACKAGE_VERSION='2.23.10'
-PACKAGE_STRING='yast2 2.23.10'
+PACKAGE_VERSION='2.23.11'
+PACKAGE_STRING='yast2 2.23.11'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1250,7 +1250,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 2.23.10 to adapt to many kinds of systems.
+\`configure' configures yast2 2.23.11 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1321,7 +1321,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2 2.23.10:";;
+ short | recursive ) echo "Configuration of yast2 2.23.11:";;
esac
cat <<\_ACEOF
@@ -1401,7 +1401,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2 configure 2.23.10
+yast2 configure 2.23.11
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1418,7 +1418,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 $as_me 2.23.10, which was
+It was created by yast2 $as_me 2.23.11, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2357,7 +2357,7 @@
# Define the identity of the package.
PACKAGE='yast2'
- VERSION='2.23.10'
+ VERSION='2.23.11'
cat >>confdefs.h <<_ACEOF
@@ -2480,7 +2480,7 @@
-VERSION="2.23.10"
+VERSION="2.23.11"
RPMNAME="yast2"
MAINTAINER="Jiri Srain <jsr...@suse.cz>"
@@ -3522,7 +3522,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2 $as_me 2.23.10, which was
+This file was extended by yast2 $as_me 2.23.11, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3575,7 +3575,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 config.status 2.23.10
+yast2 config.status 2.23.11
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-2.23.10/configure.in
new/yast2-2.23.11/configure.in
--- old/yast2-2.23.10/configure.in 2012-10-30 08:05:14.000000000 +0100
+++ new/yast2-2.23.11/configure.in 2012-11-02 11:57:16.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2
dnl
-dnl -- This file is generated by y2autoconf 2.23.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.23.1 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.23.10, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.23.11, http://bugs.opensuse.org/, yast2)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.23.10"
+VERSION="2.23.11"
RPMNAME="yast2"
MAINTAINER="Jiri Srain <jsr...@suse.cz>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-2.23.10/library/modules/Version.ycp
new/yast2-2.23.11/library/modules/Version.ycp
--- old/yast2-2.23.10/library/modules/Version.ycp 2012-10-30
08:05:24.000000000 +0100
+++ new/yast2-2.23.11/library/modules/Version.ycp 2012-11-02
11:57:25.000000000 +0100
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.23.10";
+global string yast2 = "2.23.11";
/* EOF */
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-2.23.10/library/system/src/Makefile.am
new/yast2-2.23.11/library/system/src/Makefile.am
--- old/yast2-2.23.10/library/system/src/Makefile.am 2012-10-18
10:31:39.000000000 +0200
+++ new/yast2-2.23.11/library/system/src/Makefile.am 2012-11-02
11:55:33.000000000 +0100
@@ -1,12 +1,15 @@
# Makefile.am for yast2/library/modules
-#module_DATA = HWConfig.ycp Initrd.ycp Kernel.ycp ModuleLoading.ycp
ModulesConf.ycp Hotplug.ycp HwStatus.ycp
module_DATA = $(wildcard [A-Z]*.ycp)
yncludedir = @yncludedir@/hwinfo
ynclude_DATA = classnames.ycp
-EXTRA_DIST = $(module_DATA) $(ynclude_DATA)
+client_DATA = view_anymsg.ycp
+
+desktop_DATA = messages.desktop
+
+EXTRA_DIST = $(module_DATA) $(ynclude_DATA) $(client_DATA) $(desktop_DATA)
YCPCFLAGS = -M ../../wizard/src -M ../../modules -M ../../types/src -M
../../types/src
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-2.23.10/library/system/src/Makefile.in
new/yast2-2.23.11/library/system/src/Makefile.in
--- old/yast2-2.23.10/library/system/src/Makefile.in 2012-10-30
08:05:22.000000000 +0100
+++ new/yast2-2.23.11/library/system/src/Makefile.in 2012-11-02
11:57:23.000000000 +0100
@@ -100,9 +100,11 @@
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
-am__installdirs = "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" \
+am__installdirs = "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(desktopdir)" \
+ "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" \
"$(DESTDIR)$(yncludedir)"
-DATA = $(module_DATA) $(modulebin_DATA) $(ynclude_DATA)
+DATA = $(client_DATA) $(desktop_DATA) $(module_DATA) $(modulebin_DATA) \
+ $(ynclude_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -224,11 +226,11 @@
ydatadir = @ydatadir@
yncludedir = @yncludedir@/hwinfo
ystartupdir = @ystartupdir@
-
-#module_DATA = HWConfig.ycp Initrd.ycp Kernel.ycp ModuleLoading.ycp
ModulesConf.ycp Hotplug.ycp HwStatus.ycp
module_DATA = $(wildcard [A-Z]*.ycp)
ynclude_DATA = classnames.ycp
-EXTRA_DIST = $(module_DATA) $(ynclude_DATA)
+client_DATA = view_anymsg.ycp
+desktop_DATA = messages.desktop
+EXTRA_DIST = $(module_DATA) $(ynclude_DATA) $(client_DATA) $(desktop_DATA)
YCPCFLAGS = -M ../../wizard/src -M ../../modules -M ../../types/src -M
../../types/src
modulebin_DATA = $(patsubst %.ycp,%.ybc,$(module_DATA))
modulebindir = $(moduledir)
@@ -277,6 +279,48 @@
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+install-clientDATA: $(client_DATA)
+ @$(NORMAL_INSTALL)
+ @list='$(client_DATA)'; test -n "$(clientdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(clientdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(clientdir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(clientdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(clientdir)" || exit $$?; \
+ done
+
+uninstall-clientDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(client_DATA)'; test -n "$(clientdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(clientdir)'; $(am__uninstall_files_from_dir)
+install-desktopDATA: $(desktop_DATA)
+ @$(NORMAL_INSTALL)
+ @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \
+ done
+
+uninstall-desktopDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
install-moduleDATA: $(module_DATA)
@$(NORMAL_INSTALL)
@list='$(module_DATA)'; test -n "$(moduledir)" || list=; \
@@ -386,7 +430,7 @@
check: check-am
all-am: Makefile $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)"
"$(DESTDIR)$(yncludedir)"; do \
+ for dir in "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(desktopdir)"
"$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" "$(DESTDIR)$(yncludedir)";
do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -441,8 +485,8 @@
info-am:
-install-data-am: install-moduleDATA install-modulebinDATA \
- install-yncludeDATA
+install-data-am: install-clientDATA install-desktopDATA \
+ install-moduleDATA install-modulebinDATA install-yncludeDATA
install-dvi: install-dvi-am
@@ -486,22 +530,25 @@
ps-am:
-uninstall-am: uninstall-moduleDATA uninstall-modulebinDATA \
+uninstall-am: uninstall-clientDATA uninstall-desktopDATA \
+ uninstall-moduleDATA uninstall-modulebinDATA \
uninstall-yncludeDATA
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic dist-hook \
distclean distclean-generic distdir dvi dvi-am html html-am \
- info info-am install install-am install-data install-data-am \
- install-dvi install-dvi-am install-exec install-exec-am \
- install-html install-html-am install-info install-info-am \
- install-man install-moduleDATA install-modulebinDATA \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip install-yncludeDATA installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-moduleDATA uninstall-modulebinDATA \
+ info info-am install install-am install-clientDATA \
+ install-data install-data-am install-desktopDATA install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-moduleDATA install-modulebinDATA install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ install-yncludeDATA installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
+ uninstall-clientDATA uninstall-desktopDATA \
+ uninstall-moduleDATA uninstall-modulebinDATA \
uninstall-yncludeDATA
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-2.23.10/library/system/src/messages.desktop
new/yast2-2.23.11/library/system/src/messages.desktop
--- old/yast2-2.23.10/library/system/src/messages.desktop 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-2.23.11/library/system/src/messages.desktop 2012-11-02
11:41:21.000000000 +0100
@@ -0,0 +1,25 @@
+[Desktop Entry]
+Type=Application
+Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Misc;
+
+X-KDE-ModuleType=Library
+X-KDE-RootOnly=true
+X-KDE-HasReadOnlyMode=true
+X-KDE-Library=yast2
+X-SuSE-YaST-Call=view_anymsg
+
+X-SuSE-YaST-Group=Misc
+X-SuSE-YaST-Argument=/var/log/messages
+X-SuSE-YaST-RootOnly=true
+X-SuSE-YaST-AutoInst=
+X-SuSE-YaST-Geometry=
+X-SuSE-YaST-SortKey=
+X-SuSE-YaST-AutoInstResource=
+
+Icon=yast-messages
+Exec=/sbin/yast2 view_anymsg /var/log/messages
+
+Name=System Log
+GenericName=Display the system's log (/var/log/messages)
+X-KDE-SubstituteUID=true
+StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-2.23.10/library/system/src/view_anymsg.ycp
new/yast2-2.23.11/library/system/src/view_anymsg.ycp
--- old/yast2-2.23.10/library/system/src/view_anymsg.ycp 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-2.23.11/library/system/src/view_anymsg.ycp 2012-11-02
11:41:08.000000000 +0100
@@ -0,0 +1,242 @@
+/*
+ * view_anymsg.ycp
+ *
+ * small script for easy /var/log/* and /proc/* viewing
+ *
+ * Author: Klaus Kaempf <kkae...@suse.de>
+ *
+ * $Id$
+ *
+ * Reads a \n separated list of filenames from
+ * /var/lib/YaST2/filenames
+ * Lines starting with "#" are ignored (comments)
+ * A line starting with "*" is taken as the default filename, the "*" is
stripped
+ *
+ * All files are listed in an editable combo box, where the user can
+ * easily switch between files and even add a new file
+ *
+ * At finish, the list of filenames is written back to
+ * /var/lib/YaST2/filenames
+ * adapting the default line (starting with "*") accordingly.
+ *
+ * The default is either given as WFM::Args(0) or is the file last viewed.
+ */
+
+{
+ textdomain "repair";
+
+ import "CommandLine";
+ import "Directory";
+ import "FileUtils";
+ import "Label";
+
+ string vardir = Directory::vardir;
+
+ // Check if the filename list is present
+ if (!FileUtils::Exists (vardir + "/filenames"))
+ {
+ SCR::Execute(.target.bash, "/bin/cp " + Directory::ydatadir +
"/filenames " + vardir + "/filenames");
+ }
+
+ // get filename list
+ string filenames = (string) SCR::Read(.target.string, vardir +
"/filenames");
+ if ((filenames == nil)
+ || (size (filenames) <= 0))
+ {
+ filenames = "/var/log/boot.msg\n/var/log/messages\n";
+ }
+
+ // convert \n separated string to ycp list.
+
+ list<string> all_files = splitstring (filenames, "\n");
+
+ boolean set_default = false;
+ list<term> combo_files = [];
+
+ // check if default given as argument
+
+ string filename = "";
+ if ((size(WFM::Args()) > 0)
+ && is(WFM::Args(0), string))
+ {
+ filename = (string)WFM::Args(0);
+ if (filename != "")
+ {
+ combo_files = [ `item(`id(filename), filename, true) ];
+ set_default = true;
+ }
+ }
+
+ /* the command line description map */
+ map cmdline = $[
+ "id" : "view_anymsg",
+ ];
+ if (filename == "help") return CommandLine::Run (cmdline);
+
+ // build up ComboBox
+
+ foreach (string name, all_files,
+ {
+ // empty lines or lines starting with "#" are ignored
+ if (name != ""
+ && substring (name, 0, 1) != "#")
+ {
+ // the default is either given via WFM::Args() -> filename != ""
+ // or by a filename starting with "*"
+ if (substring (name, 0, 1) == "*")
+ {
+ name = substring (name, 1); // strip leading "*"
+ if (name != filename) // do not add it twice
+ {
+ combo_files =
+ add (combo_files,`item (`id(name),name, !set_default));
+ }
+ if (!set_default)
+ {
+ if (filename == "")
+ filename = name;
+ set_default = true;
+ }
+ }
+ else if (name != filename) // do not add it twice
+ {
+ combo_files = add (combo_files, `item(`id(name), name));
+ }
+ }
+ });
+
+ if (!set_default
+ && (filename != ""))
+ {
+ all_files = add (all_files, "*" + filename);
+ combo_files = add (combo_files, `item(`id(filename), filename));
+ }
+
+ // set up dialogue
+
+ UI::OpenDialog( `opt(`decorated, `defaultsize ),
+ `VBox(
+ `HSpacing( 70 ), // force width
+ `HBox (`HSpacing (1.0), `ComboBox
(`id(`custom_file), `opt(`editable, `notify, `hstretch), "", combo_files),
`HStretch()),
+ `VSpacing( 0.3 ),
+ `VWeight( 1,
+ `HBox(
+ `VSpacing( 18 ), // force height
+ `HSpacing( 0.7 ),
+ `LogView( `id(`log ),
+ "",
+ 3, // height
+ 0 ), // number of
lines to show
+ `HSpacing( 0.7 )
+ )
+ ),
+ `VSpacing( 0.3 ),
+ `PushButton( `id(`ok), Label::OKButton() ),
+ `VSpacing( 0.3 )
+ )
+ );
+
+
+ string file_contents = "";
+ boolean go_on = true;
+
+ // wait until user clicks "OK"
+ // check if ComboBox selected and change view accordingly
+
+ while (go_on)
+ {
+ // read file contents
+ file_contents = (string)SCR::Read (.target.string, filename);
+
+ // Fill the LogView with file contents
+ UI::ChangeWidget( `id(`log ), `Value, file_contents );
+
+ string heading = sformat( _("System Log (%1)"), filename );
+ UI::ChangeWidget( `id(`log ), `Label, heading);
+
+ // wait for user input
+
+ symbol ret = (symbol)UI::UserInput();
+
+ // clicked "OK" -> exit
+
+ if (ret == `ok)
+ {
+ go_on = false;
+ }
+ else if (ret == `cancel) // close window
+ {
+ UI::CloseDialog();
+ return true;
+ }
+ else if (ret == `custom_file)
+ {
+ // adapt to combo box settings
+
+ string new_file = (string)UI::QueryWidget(`id(`custom_file),
`Value);
+ if (new_file != nil)
+ {
+ filename = new_file;
+ }
+ }
+ else
+ {
+ y2milestone ("bad UserInput (%1)", ret);
+ }
+ }
+
+ // write new list of filenames
+
+ list<string> new_files = [];
+ set_default = false;
+
+ // re-build list to get new default correct
+ foreach (string file, all_files,
+ {
+ if (substring (file, 0, 1) == "*")
+ {
+ string old_default = substring (file, 1); // strip leading "*"
+ if (old_default == filename) // default unchanged
+ {
+ new_files = add (new_files, file);
+ set_default = true;
+ }
+ else // new default
+ {
+ new_files = add (new_files, old_default);
+ }
+ }
+ else if (file != "")
+ {
+ if (file == filename) // mark new default
+ {
+ new_files = add (new_files, "*" + filename);
+ set_default = true;
+ }
+ else
+ {
+ new_files = add (new_files, file);
+ }
+ }
+ });
+ // if we don't have a default by now, it wasn't in the list before
+ // so add it here.
+
+ if (!set_default
+ && (filename != ""))
+ {
+ new_files = add (new_files, "*" + filename);
+ }
+
+ new_files = toset (new_files);
+
+ // convert ycp list back to \n separated string
+
+ filenames = mergestring (new_files, "\n") + "\n";
+
+ SCR::Write(.target.string, vardir + "/filenames", filenames);
+
+ UI::CloseDialog();
+
+ return true;
+}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
