openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
March 2006
- 2 participants
- 169 discussions
Hello community,
here is the log from the commit of package autoyast2
checked in at Wed Mar 29 21:11:54 CEST 2006.
--------
--- autoyast2/autoyast2.changes 2006-03-29 16:55:35.000000000 +0200
+++ autoyast2/autoyast2.changes 2006-03-29 20:07:23.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Mar 29 19:27:40 CEST 2006 - jsrain(a)suse.de
+
+- fixed add-on products installation integration (#161792)
+- 2.13.37
+
+-------------------------------------------------------------------
Old:
----
autoyast2-2.13.…
[View More]36.tar.bz2
New:
----
autoyast2-2.13.37.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.CfO8cD/_old 2006-03-29 21:11:28.000000000 +0200
+++ /var/tmp/diff_new_pack.CfO8cD/_new 2006-03-29 21:11:28.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package autoyast2 (Version 2.13.36)
+# spec file for package autoyast2 (Version 2.13.37)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: autoyast2
URL: http://www.suse.com/
-Version: 2.13.36
+Version: 2.13.37
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: autoyast2-2.13.36.tar.bz2
+Source0: autoyast2-2.13.37.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets fop java2-devel-packages libxslt perl-XML-Writer pkg-config sgml-skel update-desktop-files xorg-x11-libs yast2-bootloader yast2-devtools yast2-mouse yast2-testsuite yast2-transfer yast2-update
Requires: yast2-core yast2-xml libxslt
@@ -48,7 +48,7 @@
Anas Nashif <nashif(a)suse.de>
%package installation
-Version: 2.13.36
+Version: 2.13.37
Release: 1
Summary: YaST2 - Auto Installation Modules
Group: System/YaST
@@ -68,7 +68,7 @@
Anas Nashif <nashif(a)suse.de>
%package utils
-Version: 2.13.36
+Version: 2.13.37
Release: 1
Summary: YaST2 - Auto Installation Utilities
Group: System/YaST
@@ -81,7 +81,7 @@
%prep
-%setup -n autoyast2-2.13.36
+%setup -n autoyast2-2.13.37
%build
%{prefix}/bin/y2tool y2autoconf
@@ -228,6 +228,9 @@
/usr/bin/create_update_source.sh
%changelog -n autoyast2
+* Wed Mar 29 2006 - jsrain(a)suse.de
+- fixed add-on products installation integration (#161792)
+- 2.13.37
* Wed Mar 29 2006 - ug(a)suse.de
- set SoftLock to avoid the installation of recommended
patterns (#159466)
++++++ autoyast2-2.13.36.tar.bz2 -> autoyast2-2.13.37.tar.bz2 ++++++
++++ 2503 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.13.36/Makefile.am new/autoyast2-2.13.37/Makefile.am
--- old/autoyast2-2.13.36/Makefile.am 2006-03-29 16:51:16.000000000 +0200
+++ new/autoyast2-2.13.37/Makefile.am 2006-03-29 20:06:51.000000000 +0200
@@ -6,7 +6,8 @@
# (Edit ./SUBDIRS instead)
#
-PREFIX = /usr
+#where devtools are
+PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -30,6 +31,10 @@
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
AUTOMAKE_OPTIONS = foreign dist-bzip2
+# where devtools instal m4 snippets
+# argh, executed literally
+#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
+ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
cmp -s $< $@ || cp -f $< $@
@@ -57,12 +62,8 @@
# info '(automake)Conditionals'
if CREATE_PKGCONFIG
-# pkg-config
-# if a package does not have its own pc, copy the generic one
-$(RPMNAME).pc.in: $(DEVTOOLS_DIR)/admin/generic.pc.in
- test -f $@ || cp -p $< $@
# create the file here instead of by configure
-# because the prerequisite is made here
+# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
$(RPMNAME).pc: $(RPMNAME).pc.in
@@ -153,7 +154,7 @@
$(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages package-local
+package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
TAGVERSION = $(PREFIX)/bin/y2tool tagversion
@@ -198,6 +199,9 @@
false; \
fi
+check-textdomain:
+ $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
+
stable: checkin-stable
checkin-stable: package
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.13.36/Makefile.am.common new/autoyast2-2.13.37/Makefile.am.common
--- old/autoyast2-2.13.36/Makefile.am.common 2006-03-29 16:51:16.000000000 +0200
+++ new/autoyast2-2.13.37/Makefile.am.common 2006-03-29 20:06:51.000000000 +0200
@@ -9,7 +9,7 @@
# suffix mapping: info '(make)Static Usage'
# apply only to our modules, not external ones
${ybcfiles}: %.ybc: %.ycp $(ycpchook)
- Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) $(bindir)/ycpc -c -M. -I. -q $(YCPCFLAGS) $<
+ Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) ${YCPC} -c -M. -I. -q $(YCPCFLAGS) $<
# files to clean
CLEANFILES = ${ybcfiles}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.13.36/VERSION new/autoyast2-2.13.37/VERSION
--- old/autoyast2-2.13.36/VERSION 2006-03-29 16:50:43.000000000 +0200
+++ new/autoyast2-2.13.37/VERSION 2006-03-29 20:06:03.000000000 +0200
@@ -1 +1 @@
-2.13.36
+2.13.37
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.13.36/configure.in new/autoyast2-2.13.37/configure.in
--- old/autoyast2-2.13.36/configure.in 2006-03-29 16:51:16.000000000 +0200
+++ new/autoyast2-2.13.37/configure.in 2006-03-29 20:06:51.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(autoyast2, 2.13.36, http://www.suse.de/feedback, autoyast2)
+AC_INIT(autoyast2, 2.13.37, http://www.suse.de/feedback, autoyast2)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.36"
+VERSION="2.13.37"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert <ug(a)suse.de>"
@@ -114,8 +114,8 @@
AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
-devtools_ybindir=`pkg-config --variable=ybindir yast2-devtools`
-devtools_yast2dir=`pkg-config --variable=yast2dir yast2-devtools`
+devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
+devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
dnl producing pkg-config for others?
AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x)
@@ -142,6 +142,10 @@
if test "$YCPMAKEDEP" = "false"; then
AC_MSG_ERROR([ycpmakedep is not installed])
fi
+AC_PATH_PROG(YCPC, ycpc, false, $PATH:$bindir)
+if test "$YCPC" = "false"; then
+ AC_MSG_ERROR([ycpc is not installed])
+fi
AX_CHECK_DOCBOOK
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.13.36/src/clients/inst_autosetup.ycp new/autoyast2-2.13.37/src/clients/inst_autosetup.ycp
--- old/autoyast2-2.13.36/src/clients/inst_autosetup.ycp 2006-03-28 11:30:38.000000000 +0200
+++ new/autoyast2-2.13.37/src/clients/inst_autosetup.ycp 2006-03-29 20:05:58.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Anas Nashif <nashif(a)suse.de>
* Uwe Gansert <ug(a)suse.de>
*
- * $Id: inst_autosetup.ycp 29454 2006-03-28 09:30:36Z ug $
+ * $Id: inst_autosetup.ycp 29544 2006-03-29 18:05:28Z jsrain $
*/
{
@@ -114,10 +114,6 @@
askDialog();
Call::Function("add-on_auto", ["Import", Profile::current["add-on"]:$[]] );
Call::Function("add-on_auto", ["Write"]);
- /* FIXME: this breaks autoinstallation but is needed for addon support.
- if( ProductControl::RunFrom ( ProductControl::CurrentStep () + 1, true) == `next )
- return `finish;
- */
//
// Set Mouse and other workflow variables
@@ -224,5 +220,8 @@
AutoInstall::TurnOff();
Progress::Finish();
- return `next;
+ symbol ret = ProductControl::RunFrom ( ProductControl::CurrentStep () + 1, true);
+ if (ret == `next)
+ return `finish;
+ return ret;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package yast2
checked in at Wed Mar 29 20:58:40 CEST 2006.
--------
--- yast2/yast2.changes 2006-03-22 13:01:56.000000000 +0100
+++ yast2/yast2.changes 2006-03-29 17:04:40.000000000 +0200
@@ -1,0 +2,11 @@
+Wed Mar 29 17:04:09 CEST 2006 - mvidner(a)suse.cz
+
+- Added PackageLock, a module to handle the big Zypp lock (#160319).
+- 2.13.41
+
+-------------------------------------------------------------------
+Mon Mar 27 10:24:51 CEST 2006 - …
[View More]locilka(a)suse.cz
+
+- TERM=raw -> TERM=dumb in Service::RunInitScriptWithTimeOut()
+
+-------------------------------------------------------------------
Old:
----
yast2-2.13.40.tar.bz2
New:
----
yast2-2.13.41.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.vUqjTB/_old 2006-03-29 20:57:47.000000000 +0200
+++ /var/tmp/diff_new_pack.vUqjTB/_new 2006-03-29 20:57:47.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.13.40)
+# spec file for package yast2 (Version 2.13.41)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,22 +11,24 @@
# norootforbuild
Name: yast2
-Version: 2.13.40
+Version: 2.13.41
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.13.40.tar.bz2
+Source0: yast2-2.13.41.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pkg-bindings yast2-testsuite
# Need the new file popups
Requires: yast2-core >= 2.7.1
+# Pkg::Connect
+Requires: yast2-pkg-bindings >= 2.13.43
Requires: yast2_ui yast2_theme
# For Cron Agent, Module
Requires: perl-Config-Crontab
# for ag_tty (/bin/stty)
Requires: coreutils
-Requires: yast2-pkg-bindings, yast2-xml, yast2-hardware-detection
+Requires: yast2-xml, yast2-hardware-detection
Requires: SuSEfirewall2
Provides: yast2-lib-sequencer
Obsoletes: yast2-lib-sequencer
@@ -91,7 +93,7 @@
Steffen Winterfeldt <snwint(a)suse.de>
%prep
-%setup -n yast2-2.13.40
+%setup -n yast2-2.13.41
%build
%{prefix}/bin/y2tool y2autoconf
@@ -190,6 +192,11 @@
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog -n yast2
+* Wed Mar 29 2006 - mvidner(a)suse.cz
+- Added PackageLock, a module to handle the big Zypp lock (#160319).
+- 2.13.41
+* Mon Mar 27 2006 - locilka(a)suse.cz
+- TERM=raw -> TERM=dumb in Service::RunInitScriptWithTimeOut()
* Wed Mar 22 2006 - locilka(a)suse.cz
- better testing of UTF-8 support using the testutf8 binary
(#158001)
++++++ yast2-2.13.40.tar.bz2 -> yast2-2.13.41.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/Makefile.am new/yast2-2.13.41/Makefile.am
--- old/yast2-2.13.40/Makefile.am 2006-03-22 13:03:49.000000000 +0100
+++ new/yast2-2.13.41/Makefile.am 2006-03-29 17:06:25.000000000 +0200
@@ -154,7 +154,7 @@
$(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages package-local
+package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
TAGVERSION = $(PREFIX)/bin/y2tool tagversion
@@ -199,6 +199,9 @@
false; \
fi
+check-textdomain:
+ $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
+
stable: checkin-stable
checkin-stable: package
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/Makefile.in new/yast2-2.13.41/Makefile.in
--- old/yast2-2.13.40/Makefile.in 2006-03-22 13:04:04.000000000 +0100
+++ new/yast2-2.13.41/Makefile.in 2006-03-29 17:07:07.000000000 +0200
@@ -789,7 +789,7 @@
$(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages package-local
+package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -832,6 +832,9 @@
false; \
fi
+check-textdomain:
+ $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
+
stable: checkin-stable
checkin-stable: package
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/VERSION new/yast2-2.13.41/VERSION
--- old/yast2-2.13.40/VERSION 2006-03-22 13:01:38.000000000 +0100
+++ new/yast2-2.13.41/VERSION 2006-03-29 17:03:01.000000000 +0200
@@ -1 +1 @@
-2.13.40
+2.13.41
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/base.pot new/yast2-2.13.41/base.pot
--- old/yast2-2.13.40/base.pot 2006-02-07 16:03:17.000000000 +0100
+++ new/yast2-2.13.41/base.pot 2005-12-14 16:33:36.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-07 16:03+0100\n"
+"POT-Creation-Date: 2005-12-14 16:33+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -258,53 +258,53 @@
msgstr ""
#. translators: progress message - command line interface ready
-#: library/commandline/src/CommandLine.ycp:1258
+#: library/commandline/src/CommandLine.ycp:1263
msgid "Ready"
msgstr ""
#. non-GUI handling
-#: library/commandline/src/CommandLine.ycp:1282
+#: library/commandline/src/CommandLine.ycp:1287
msgid "Initializing"
msgstr ""
#. translators: Progress message - the command line interface is about to finish
-#: library/commandline/src/CommandLine.ycp:1321
+#: library/commandline/src/CommandLine.ycp:1326
msgid "Finishing"
msgstr ""
#. translators: The command line interface is finished
-#: library/commandline/src/CommandLine.ycp:1328
+#: library/commandline/src/CommandLine.ycp:1333
msgid "Done"
msgstr ""
#. translators: The command line interface is finished without writing the changes
-#: library/commandline/src/CommandLine.ycp:1331
+#: library/commandline/src/CommandLine.ycp:1336
msgid "Quitting (without changes)"
msgstr ""
#. prompt message displayed in the commandline mode
#. when user is asked to replay "yes" or "no" (localized)
-#: library/commandline/src/CommandLine.ycp:1346
-msgid "yes or no?"
+#: library/commandline/src/CommandLine.ycp:1351
+msgid "yes/no?: "
msgstr ""
#. yes - used in the command line mode as input text for yes/no confirmation
-#: library/commandline/src/CommandLine.ycp:1351
+#: library/commandline/src/CommandLine.ycp:1356
msgid "yes"
msgstr ""
#. no - used in the command line mode as input text for yes/no confirmation
-#: library/commandline/src/CommandLine.ycp:1354
+#: library/commandline/src/CommandLine.ycp:1359
msgid "no"
msgstr ""
#. error report
-#: library/control/src/ProductControl.ycp:813
+#: library/control/src/ProductControl.ycp:811
msgid "No workflow defined for this installation mode."
msgstr ""
#. message popup, %1 is a label of some widget
-#: library/cwm/src/CWM.ycp:626
+#: library/cwm/src/CWM.ycp:630
#, ycp-format
msgid "The value of %1 is invalid."
msgstr ""
@@ -598,37 +598,37 @@
msgstr ""
#. combobox header
-#: library/cwm/src/TablePopup.ycp:417
+#: library/cwm/src/TablePopup.ycp:413
msgid "&Selected Option"
msgstr ""
#. heading / label
-#: library/cwm/src/TablePopup.ycp:463
+#: library/cwm/src/TablePopup.ycp:459
msgid "Current Option: "
msgstr ""
#. error report
-#: library/cwm/src/TablePopup.ycp:663
+#: library/cwm/src/TablePopup.ycp:652
msgid "The selected option is already present."
msgstr ""
#. table header, shortcut for changed, keep very short
-#: library/cwm/src/TablePopup.ycp:835
+#: library/cwm/src/TablePopup.ycp:823
msgid "Ch."
msgstr ""
#. table header
-#: library/cwm/src/TablePopup.ycp:837 library/cwm/src/TablePopup.ycp:842
+#: library/cwm/src/TablePopup.ycp:825 library/cwm/src/TablePopup.ycp:830
msgid "Option"
msgstr ""
#. table header
-#: library/cwm/src/TablePopup.ycp:839 library/cwm/src/TablePopup.ycp:844
+#: library/cwm/src/TablePopup.ycp:827 library/cwm/src/TablePopup.ycp:832
msgid "Value"
msgstr ""
#. help 1/4
-#: library/cwm/src/TablePopup.ycp:848
+#: library/cwm/src/TablePopup.ycp:836
msgid ""
"<p><b><big>Editing the Settings</big></b><br>\n"
"To edit the settings, choose the appropriate\n"
@@ -636,21 +636,21 @@
msgstr ""
#. help 2/4, optional
-#: library/cwm/src/TablePopup.ycp:853
+#: library/cwm/src/TablePopup.ycp:841
msgid ""
"<p>To add a new option, click <b>Add</b>. To remove\n"
"an option, select it and click <b>Delete</b>.</p>"
msgstr ""
#. help 3/4, optional
-#: library/cwm/src/TablePopup.ycp:858
+#: library/cwm/src/TablePopup.ycp:846
msgid ""
"<P>The <B>Ch.</B> column of the table shows \n"
"whether the option was changed.</P>"
msgstr ""
#. help 4/4, optional
-#: library/cwm/src/TablePopup.ycp:863
+#: library/cwm/src/TablePopup.ycp:851
msgid ""
"<p>To reorder the options, select an option\n"
"and use <b>Up</b> and <b>Down</b> to move it up or down\n"
@@ -659,12 +659,12 @@
#. push button
#. Button label
-#: library/cwm/src/TablePopup.ycp:871 library/modules/Label.ycp:184
+#: library/cwm/src/TablePopup.ycp:859 library/modules/Label.ycp:184
msgid "&Up"
msgstr ""
#. push button
-#: library/cwm/src/TablePopup.ycp:873
+#: library/cwm/src/TablePopup.ycp:861
msgid "&Down"
msgstr ""
@@ -1277,176 +1277,43 @@
msgid "All changes will be lost!"
msgstr ""
-#. translators: summary header for messages generated through autoinstallation
-#: library/modules/Report.ycp:81
-msgid "Messages"
-msgstr ""
-
-#. Report configuration - will be normal messages displayed?
-#. '%1' will be replaced by translated string "Yes" or "No"
-#: library/modules/Report.ycp:86
-#, ycp-format
-msgid "Display Messages: %1"
-msgstr ""
-
-#. translators: summary if the messages should be displayed
-#. translators: summary if the messages should be written to log file
-#. translators: summary if the warnings should be displayed
-#. translators: summary if the warnings should be written to log file
-#. translators: summary if the errors should be displayed
-#. translators: summary if the errors should be written to log file
-#: library/modules/Report.ycp:88 library/modules/Report.ycp:96
-#: library/modules/Report.ycp:105 library/modules/Report.ycp:113
-#: library/modules/Report.ycp:122 library/modules/Report.ycp:130
-msgid "Yes"
-msgstr ""
-
-#. translators: summary if the errors should be written to log file
-#: library/modules/Report.ycp:88 library/modules/Report.ycp:96
-#: library/modules/Report.ycp:105 library/modules/Report.ycp:113
-#: library/modules/Report.ycp:122 library/modules/Report.ycp:132
-msgid "No"
-msgstr ""
-
-#. Report configuration - will have normal messages timeout?
-#. '%1' will be replaced by number of seconds
-#: library/modules/Report.ycp:91
-#, ycp-format
-msgid "Time-out Messages: %1"
-msgstr ""
-
-#. Report configuration - will be normal messages logged to file?
-#. '%1' will be replaced by translated string "Yes" or "No"
-#: library/modules/Report.ycp:94
-#, ycp-format
-msgid "Log Messages: %1"
-msgstr ""
-
-#. translators: summary header for warnings generated through autoinstallation
-#: library/modules/Report.ycp:99
-msgid "Warnings"
-msgstr ""
-
-#. Report configuration - will be warning messages displayed?
-#. '%1' will be replaced by translated string "Yes" or "No"
-#: library/modules/Report.ycp:103
-#, ycp-format
-msgid "Display Warnings: %1"
-msgstr ""
-
-#. Report configuration - will have warning messages timeout?
-#. '%1' will be replaced by number of seconds
-#: library/modules/Report.ycp:108
-#, ycp-format
-msgid "Time-out Warnings: %1"
-msgstr ""
-
-#. Report configuration - will be warning messages logged to file?
-#. '%1' will be replaced by translated string "Yes" or "No"
-#: library/modules/Report.ycp:111
-#, ycp-format
-msgid "Log Warnings: %1"
-msgstr ""
-
-#. translators: summary header for errors generated through autoinstallation
-#: library/modules/Report.ycp:116
-msgid "Errors"
-msgstr ""
-
-#. Report configuration - will be error messages displayed?
-#. '%1' will be replaced by translated string "Yes" or "No"
-#: library/modules/Report.ycp:120
-#, ycp-format
-msgid "Display Errors: %1"
-msgstr ""
-
-#. Report configuration - will have error messages timeout?
-#. '%1' will be replaced by number of seconds
-#: library/modules/Report.ycp:125
-#, ycp-format
-msgid "Time-out Errors: %1"
-msgstr ""
-
-#. Report configuration - will be error messages logged to file?
-#. '%1' will be replaced by translated string "Yes" or "No"
-#: library/modules/Report.ycp:128
-#, ycp-format
-msgid "Log Errors: %1"
-msgstr ""
-
-#. translators: warnings summary header
-#: library/modules/Report.ycp:635
-msgid "Warning:"
-msgid_plural "Warnings:"
-msgstr[0] ""
-msgstr[1] ""
-
-#. translators: errors summary header
-#: library/modules/Report.ycp:649
-msgid "Error:"
-msgid_plural "Errors:"
-msgstr[0] ""
-msgstr[1] ""
-
-#. translators: message summary header
-#: library/modules/Report.ycp:663 library/modules/Report.ycp:677
-msgid "Message:"
-msgid_plural "Messages:"
-msgstr[0] ""
-msgstr[1] ""
-
-#. translators: summary if the module has not been used yet in AutoYaST profile
-#: library/modules/Summary.ycp:49
-msgid "Not configured yet."
-msgstr ""
-
-#. translators: summary if no hardware was detected
-#: library/modules/Summary.ycp:65
-msgid "Not detected."
-msgstr ""
-
#. translators: Tree header
#: library/modules/ValueBrowser.ycp:141
msgid "&Variable"
msgstr ""
#. label
-#: library/network/src/CWMFirewallInterfaces.ycp:104
+#: library/network/src/CWMFirewallInterfaces.ycp:77
msgid "Firewall is disabled"
msgstr ""
#. label
-#: library/network/src/CWMFirewallInterfaces.ycp:109
+#: library/network/src/CWMFirewallInterfaces.ycp:82
msgid "Firewall port is closed"
msgstr ""
#. label
-#: library/network/src/CWMFirewallInterfaces.ycp:114
+#: library/network/src/CWMFirewallInterfaces.ycp:87
msgid "Firewall port is open on all interfaces"
msgstr ""
#. label
-#: library/network/src/CWMFirewallInterfaces.ycp:119
+#: library/network/src/CWMFirewallInterfaces.ycp:92
msgid "Firewall port is open on selected interfaces"
msgstr ""
#. label
-#: library/network/src/CWMFirewallInterfaces.ycp:124
+#: library/network/src/CWMFirewallInterfaces.ycp:97
msgid "No network interfaces are configured"
msgstr ""
-#. multi selection box item
-#: library/network/src/CWMFirewallInterfaces.ycp:186
-msgid "All NetworkManager Interfaces"
-msgstr ""
-
#. transaltors: selection box title
-#: library/network/src/CWMFirewallInterfaces.ycp:365
+#: library/network/src/CWMFirewallInterfaces.ycp:278
msgid "&Network Interfaces with Open Port in Firewall"
msgstr ""
#. question popup
-#: library/network/src/CWMFirewallInterfaces.ycp:431
+#: library/network/src/CWMFirewallInterfaces.ycp:338
msgid ""
"No interface is selected. Service will not\n"
"be available for other computers.\n"
@@ -1455,7 +1322,7 @@
msgstr ""
#. yes-no popup
-#: library/network/src/CWMFirewallInterfaces.ycp:475
+#: library/network/src/CWMFirewallInterfaces.ycp:358
#, ycp-format
msgid ""
"Because of SuSE Firewall settings, the port\n"
@@ -1466,7 +1333,7 @@
msgstr ""
#. yes-no popup
-#: library/network/src/CWMFirewallInterfaces.ycp:492
+#: library/network/src/CWMFirewallInterfaces.ycp:373
#, ycp-format
msgid ""
"Because of SuSE Firewall settings, the port\n"
@@ -1477,23 +1344,23 @@
msgstr ""
#. translators: selection box title
-#: library/network/src/CWMFirewallInterfaces.ycp:569
+#: library/network/src/CWMFirewallInterfaces.ycp:450
msgid "Network &Interfaces with Open Port in Firewall"
msgstr ""
#. push button to select all network intefaces for firewall
-#: library/network/src/CWMFirewallInterfaces.ycp:578
+#: library/network/src/CWMFirewallInterfaces.ycp:459
msgid "Select &All"
msgstr ""
#. push button to deselect all network intefaces for firewall
-#: library/network/src/CWMFirewallInterfaces.ycp:581
+#: library/network/src/CWMFirewallInterfaces.ycp:462
msgid "Select &None"
msgstr ""
#. help text for firewall settings widget 1/3,
#. %1 is check box label, eg. "Open Port in Firewall" (without quotes)
-#: library/network/src/CWMFirewallInterfaces.ycp:799
+#: library/network/src/CWMFirewallInterfaces.ycp:680
#, ycp-format
msgid ""
"<p><b><big>Firewall Settings</big></b><br>\n"
@@ -1504,7 +1371,7 @@
#. help text for firewall port openning widget 2/3, optional
#. %1 is push button label, eg. "Firewall &Details" (without quotes)
#. note: %2 is correct, do not replace with %1!!!
-#: library/network/src/CWMFirewallInterfaces.ycp:807
+#: library/network/src/CWMFirewallInterfaces.ycp:688
#, ycp-format
msgid ""
"To select interfaces on which to open the port,\n"
@@ -1512,46 +1379,37 @@
msgstr ""
#. help text for firewall settings widget 3/3,
-#: library/network/src/CWMFirewallInterfaces.ycp:811
+#: library/network/src/CWMFirewallInterfaces.ycp:692
msgid ""
"This option is available only if the firewall\n"
"is enabled.</p>"
msgstr ""
#. part of help text - check box label, NO SHORTCUT!!!
-#: library/network/src/CWMFirewallInterfaces.ycp:824
+#: library/network/src/CWMFirewallInterfaces.ycp:705
msgid "Open Port in Firewall"
msgstr ""
#. part of help text - push button label, NO SHORTCUT!!!
-#: library/network/src/CWMFirewallInterfaces.ycp:826
+#: library/network/src/CWMFirewallInterfaces.ycp:707
msgid "Firewall Details"
msgstr ""
#. check box
-#: library/network/src/CWMFirewallInterfaces.ycp:855
+#: library/network/src/CWMFirewallInterfaces.ycp:736
msgid "Open Port in &Firewall"
msgstr ""
#. push button
-#: library/network/src/CWMFirewallInterfaces.ycp:858
+#: library/network/src/CWMFirewallInterfaces.ycp:739
msgid "Firewall &Details"
msgstr ""
#. label text
-#: library/network/src/CWMFirewallInterfaces.ycp:887
+#: library/network/src/CWMFirewallInterfaces.ycp:768
msgid "Firewall is open"
msgstr ""
-#. TRANSLATORS: pop-up question when reading the service configuration
-#: library/network/src/NetworkService.ycp:108
-msgid ""
-"Your network interfaces are currently controlled by NetworkManager\n"
-"but the service to configure might not work well with it.\n"
-"\n"
-"Really continue?"
-msgstr ""
-
#. TRANSLATORS: popup informing message, allowed characters for port-names
#: library/network/src/PortAliases.ycp:112
msgid ""
@@ -1561,39 +1419,39 @@
msgstr ""
#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/SuSEFirewall.ycp:79
+#: library/network/src/SuSEFirewall.ycp:72
msgid "External Zone"
msgstr ""
#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/SuSEFirewall.ycp:81
+#: library/network/src/SuSEFirewall.ycp:74
msgid "Internal Zone"
msgstr ""
#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/SuSEFirewall.ycp:83
+#: library/network/src/SuSEFirewall.ycp:76
msgid "Demilitarized Zone"
msgstr ""
#. TRANSLATORS: Firewall zone full-name, used as combo box item or dialog title
-#: library/network/src/SuSEFirewall.ycp:1140
+#: library/network/src/SuSEFirewall.ycp:1103
msgid "Unknown Zone"
msgstr ""
#. TRANSLATORS: a popup error message
-#: library/network/src/SuSEFirewall.ycp:1360
+#: library/network/src/SuSEFirewall.ycp:1323
#, ycp-format
msgid "Cannot enable service '%1'."
msgstr ""
#. TRANSLATORS: a popup error message
-#: library/network/src/SuSEFirewall.ycp:1382
+#: library/network/src/SuSEFirewall.ycp:1345
#, ycp-format
msgid "Cannot disable service '%1'."
msgstr ""
#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#: library/network/src/SuSEFirewall.ycp:1497
+#: library/network/src/SuSEFirewall.ycp:1458
#, ycp-format
msgid ""
"Interface '%1' is included in multiple firewall zones.\n"
@@ -1604,8 +1462,8 @@
msgstr ""
#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#: library/network/src/SuSEFirewall.ycp:1782
-#: library/network/src/SuSEFirewall.ycp:1843
+#: library/network/src/SuSEFirewall.ycp:1730
+#: library/network/src/SuSEFirewall.ycp:1787
#, ycp-format
msgid ""
"Interface '%1' is not assigned to any firewall zone.\n"
@@ -1613,78 +1471,78 @@
msgstr ""
#. TRANSLATORS: Dialog caption
-#: library/network/src/SuSEFirewall.ycp:2175
+#: library/network/src/SuSEFirewall.ycp:2111
msgid "Initializing Firewall Configuration"
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2180
+#: library/network/src/SuSEFirewall.ycp:2116
msgid "Check for network devices"
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2182
+#: library/network/src/SuSEFirewall.ycp:2118
msgid "Read current configuration"
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2184
+#: library/network/src/SuSEFirewall.ycp:2120
msgid "Check possibly conflicting services"
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2188
+#: library/network/src/SuSEFirewall.ycp:2124
msgid "Checking for network devices..."
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2190
+#: library/network/src/SuSEFirewall.ycp:2126
msgid "Reading current configuration..."
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2192
+#: library/network/src/SuSEFirewall.ycp:2128
msgid "Checking possibly conflicting services..."
msgstr ""
#. TRANSLATORS: Dialog caption
-#: library/network/src/SuSEFirewall.ycp:2291
+#: library/network/src/SuSEFirewall.ycp:2227
msgid "Writing Firewall Configuration"
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2296
+#: library/network/src/SuSEFirewall.ycp:2232
msgid "Write firewall settings"
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2298
+#: library/network/src/SuSEFirewall.ycp:2234
msgid "Adjust firewall service"
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2302
+#: library/network/src/SuSEFirewall.ycp:2238
msgid "Writing firewall settings..."
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2304
+#: library/network/src/SuSEFirewall.ycp:2240
msgid "Adjusting firewall service..."
msgstr ""
#. TRANSLATORS: a popup error message
-#: library/network/src/SuSEFirewall.ycp:2320
+#: library/network/src/SuSEFirewall.ycp:2256
msgid "Writing settings failed"
msgstr ""
#. TRANSLATORS: Warning in installation proposal, %1 is a device name (eth0, sl0, ...)
-#: library/network/src/SuSEFirewallProposal.ycp:137
+#: library/network/src/SuSEFirewallProposal.ycp:136
#, ycp-format
msgid "New network device '%1' found; added as an internal firewall interface"
msgstr ""
#. TRANSLATORS: Warning in installation proposal, %1 is a device name (eth0, sl0, ...)
-#: library/network/src/SuSEFirewallProposal.ycp:144
+#: library/network/src/SuSEFirewallProposal.ycp:143
#, ycp-format
msgid "New network device '%1' found; added as an external firewall interface"
msgstr ""
@@ -1692,7 +1550,7 @@
#. TRANSLATORS: Proposal informative text "Firewall is enabled" with link around
#. "enabled" must be surrounded with the "%1" and "%2" strings
#. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>"
-#: library/network/src/SuSEFirewallProposal.ycp:349
+#: library/network/src/SuSEFirewallProposal.ycp:330
#, ycp-format
msgid "Firewall is %1enabled%2"
msgstr ""
@@ -1700,7 +1558,7 @@
#. TRANSLATORS: Proposal informative text "Firewall is disabled" with link around
#. "disabled" must be surrounded with the "%1" and "%2" strings
#. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>"
-#: library/network/src/SuSEFirewallProposal.ycp:354
+#: library/network/src/SuSEFirewallProposal.ycp:335
#, ycp-format
msgid "Firewall is %1disabled%2"
msgstr ""
@@ -1708,7 +1566,7 @@
#. TRANSLATORS: Network proposal informative text "SSH is enabled" with link around
#. "enabled" must be surrounded with the "%1" and "%2" strings
#. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>"
-#: library/network/src/SuSEFirewallProposal.ycp:384
+#: library/network/src/SuSEFirewallProposal.ycp:353
#, ycp-format
msgid "SSH port is %1open%2"
msgstr ""
@@ -1716,20 +1574,20 @@
#. TRANSLATORS: Network proposal informative text "SSH is disabled" with link around
#. "disabled" must be surrounded with the "%1" and "%2" strings
#. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>"
-#: library/network/src/SuSEFirewallProposal.ycp:389
+#: library/network/src/SuSEFirewallProposal.ycp:358
#, ycp-format
msgid "SSH port is %1blocked%2"
msgstr ""
#. TRANSLATORS: This is a warning message. Installation over SSH without SSH allowed on firewall
-#: library/network/src/SuSEFirewallProposal.ycp:395
-msgid "You are installing a system over SSH, but you have not opened the SSH port on the firewall."
+#: library/network/src/SuSEFirewallProposal.ycp:364
+msgid "You are installing system over the SSH but you have not opened the SSH port on the firewall."
msgstr ""
#. TRANSLATORS: Network proposal informative text "Remote Administration (VNC) is enabled" with link around
#. "enabled" must be surrounded with the "%1" and "%2" strings
#. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>"
-#: library/network/src/SuSEFirewallProposal.ycp:414
+#: library/network/src/SuSEFirewallProposal.ycp:383
#, ycp-format
msgid "Remote Administration (VNC) ports are %1open%2"
msgstr ""
@@ -1737,14 +1595,14 @@
#. TRANSLATORS: Network proposal informative text "Remote Administration (VNC) is disabled" with link around
#. "disabled" must be surrounded with the "%1" and "%2" strings
#. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>"
-#: library/network/src/SuSEFirewallProposal.ycp:419
+#: library/network/src/SuSEFirewallProposal.ycp:388
#, ycp-format
msgid "Remote Administration (VNC) ports are %1blocked%2"
msgstr ""
#. TRANSLATORS: This is a warning message. Installation over VNC without VNC allowed on firewall
-#: library/network/src/SuSEFirewallProposal.ycp:424
-msgid "You are installing a system using remote administration (VNC), but you have not opened the VNC ports on the firewall."
+#: library/network/src/SuSEFirewallProposal.ycp:393
+msgid "You are installing system over the Remote Administration (VNC) but you have not opened the VNC ports on the firewall."
msgstr ""
#. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box...
@@ -1878,43 +1736,49 @@
msgstr ""
#. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box...
-#: library/network/src/SuSEFirewallServices.ycp:185
+#: library/network/src/SuSEFirewallServices.ycp:183
msgid "Remote Access to Display Manager"
msgstr ""
#. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box...
-#: library/network/src/SuSEFirewallServices.ycp:193
+#: library/network/src/SuSEFirewallServices.ycp:191
msgid "Remote File Alteration Monitor"
msgstr ""
#. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box...
-#: library/network/src/SuSEFirewallServices.ycp:199
+#: library/network/src/SuSEFirewallServices.ycp:197
msgid "Portable Batch System (PBS)"
msgstr ""
#. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box...
-#: library/network/src/SuSEFirewallServices.ycp:206
+#: library/network/src/SuSEFirewallServices.ycp:204
msgid "MySQL Remote Access"
msgstr ""
#. TRANSLATORS: Name of unknown service. This should never happen, just for cases..., %1 is a requested service id like nis-server
-#: library/network/src/SuSEFirewallServices.ycp:236
+#: library/network/src/SuSEFirewallServices.ycp:234
#, ycp-format
msgid "Unknown service '%1'"
msgstr ""
#. Popup when initializing the package manager
+#. popup when initializing the package manager
#: library/packages/src/PackageSystem.ycp:77
+#: library/packages/src/Require.ycp:75
msgid "Reading package information..."
msgstr ""
#. Error message, no packages sources found
+#. error popup, no packages sources
+#. FIXME: translation
#: library/packages/src/PackageSystem.ycp:99
+#: library/packages/src/Require.ycp:87
msgid "No package source defined."
msgstr ""
#. popup heading, with rich text widget and Yes/No buttons
#: library/packages/src/PackageSystem.ycp:128
+#: library/packages/src/Require.ycp:343
msgid "Do you accept this license agreement?"
msgid_plural "Do you accept these license agreements?"
msgstr[0] ""
@@ -1945,14 +1809,19 @@
"packages, YaST may not work properly.\n"
msgstr ""
+#. this is a separator used at merging package list items
+#: library/packages/src/common.ycp:83
+msgid ", "
+msgstr ""
+
#. the message is followed by list of required packages
#. Popup Text
-#: library/packages/src/common.ycp:84 library/packages/src/common.ycp:108
+#: library/packages/src/common.ycp:85 library/packages/src/common.ycp:109
msgid "These packages need to be installed:"
msgstr ""
#. Popup Text
-#: library/packages/src/common.ycp:110
+#: library/packages/src/common.ycp:111
msgid "These packages need to be removed:"
msgstr ""
@@ -2064,22 +1933,22 @@
msgstr ""
#. KiloByte abbreviated
-#: library/types/src/String.ycp:96
+#: library/types/src/String.ycp:80
msgid "KB"
msgstr ""
#. MegaByte abbreviated
-#: library/types/src/String.ycp:98
+#: library/types/src/String.ycp:82
msgid "MB"
msgstr ""
#. GigaByte abbreviated
-#: library/types/src/String.ycp:100
+#: library/types/src/String.ycp:84
msgid "GB"
msgstr ""
#. TeraByte abbreviated
-#: library/types/src/String.ycp:102
+#: library/types/src/String.ycp:86
msgid "TB"
msgstr ""
@@ -2155,6 +2024,134 @@
msgid "&Exported Directories"
msgstr ""
+#. translators: summary header for messages generated through autoinstallation
+#: library/wizard/src/Report.ycp:81
+msgid "Messages"
+msgstr ""
+
+#. Report configuration - will be normal messages displayed?
+#. '%1' will be replaced by translated string "Yes" or "No"
+#: library/wizard/src/Report.ycp:86
+#, ycp-format
+msgid "Display Messages: %1"
+msgstr ""
+
+#. translators: summary if the messages should be displayed
+#. translators: summary if the messages should be written to log file
+#. translators: summary if the warnings should be displayed
+#. translators: summary if the warnings should be written to log file
+#. translators: summary if the errors should be displayed
+#. translators: summary if the errors should be written to log file
+#: library/wizard/src/Report.ycp:88 library/wizard/src/Report.ycp:96
+#: library/wizard/src/Report.ycp:105 library/wizard/src/Report.ycp:113
+#: library/wizard/src/Report.ycp:122 library/wizard/src/Report.ycp:130
+msgid "Yes"
+msgstr ""
+
+#. translators: summary if the errors should be written to log file
+#: library/wizard/src/Report.ycp:88 library/wizard/src/Report.ycp:96
+#: library/wizard/src/Report.ycp:105 library/wizard/src/Report.ycp:113
+#: library/wizard/src/Report.ycp:122 library/wizard/src/Report.ycp:132
+msgid "No"
+msgstr ""
+
+#. Report configuration - will have normal messages timeout?
+#. '%1' will be replaced by number of seconds
+#: library/wizard/src/Report.ycp:91
+#, ycp-format
+msgid "Time-out Messages: %1"
+msgstr ""
+
+#. Report configuration - will be normal messages logged to file?
+#. '%1' will be replaced by translated string "Yes" or "No"
+#: library/wizard/src/Report.ycp:94
+#, ycp-format
+msgid "Log Messages: %1"
+msgstr ""
+
+#. translators: summary header for warnings generated through autoinstallation
+#: library/wizard/src/Report.ycp:99
+msgid "Warnings"
+msgstr ""
+
+#. Report configuration - will be warning messages displayed?
+#. '%1' will be replaced by translated string "Yes" or "No"
+#: library/wizard/src/Report.ycp:103
+#, ycp-format
+msgid "Display Warnings: %1"
+msgstr ""
+
+#. Report configuration - will have warning messages timeout?
+#. '%1' will be replaced by number of seconds
+#: library/wizard/src/Report.ycp:108
+#, ycp-format
+msgid "Time-out Warnings: %1"
+msgstr ""
+
+#. Report configuration - will be warning messages logged to file?
+#. '%1' will be replaced by translated string "Yes" or "No"
+#: library/wizard/src/Report.ycp:111
+#, ycp-format
+msgid "Log Warnings: %1"
+msgstr ""
+
+#. translators: summary header for errors generated through autoinstallation
+#: library/wizard/src/Report.ycp:116
+msgid "Errors"
+msgstr ""
+
+#. Report configuration - will be error messages displayed?
+#. '%1' will be replaced by translated string "Yes" or "No"
+#: library/wizard/src/Report.ycp:120
+#, ycp-format
+msgid "Display Errors: %1"
+msgstr ""
+
+#. Report configuration - will have error messages timeout?
+#. '%1' will be replaced by number of seconds
+#: library/wizard/src/Report.ycp:125
+#, ycp-format
+msgid "Time-out Errors: %1"
+msgstr ""
+
+#. Report configuration - will be error messages logged to file?
+#. '%1' will be replaced by translated string "Yes" or "No"
+#: library/wizard/src/Report.ycp:128
+#, ycp-format
+msgid "Log Errors: %1"
+msgstr ""
+
+#. translators: warnings summary header
+#: library/wizard/src/Report.ycp:635
+msgid "Warning:"
+msgid_plural "Warnings:"
+msgstr[0] ""
+msgstr[1] ""
+
+#. translators: errors summary header
+#: library/wizard/src/Report.ycp:649
+msgid "Error:"
+msgid_plural "Errors:"
+msgstr[0] ""
+msgstr[1] ""
+
+#. translators: message summary header
+#: library/wizard/src/Report.ycp:663 library/wizard/src/Report.ycp:677
+msgid "Message:"
+msgid_plural "Messages:"
+msgstr[0] ""
+msgstr[1] ""
+
+#. translators: summary if the module has not been used yet in AutoYaST profile
+#: library/wizard/src/Summary.ycp:49
+msgid "Not configured yet."
+msgstr ""
+
+#. translators: summary if no hardware was detected
+#: library/wizard/src/Summary.ycp:65
+msgid "Not detected."
+msgstr ""
+
#. button text
#: library/wizard/src/Wizard.ycp:153 library/wizard/src/Wizard.ycp:306
msgid "&Apply"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/configure new/yast2-2.13.41/configure
--- old/yast2-2.13.40/configure 2006-03-22 13:03:53.000000000 +0100
+++ new/yast2-2.13.41/configure 2006-03-29 17:06:37.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2 2.13.40.
+# Generated by GNU Autoconf 2.59 for yast2 2.13.41.
#
# Report bugs to <http://www.suse.de/feedback>.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2'
PACKAGE_TARNAME='yast2'
-PACKAGE_VERSION='2.13.40'
-PACKAGE_STRING='yast2 2.13.40'
+PACKAGE_VERSION='2.13.41'
+PACKAGE_STRING='yast2 2.13.41'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
ac_unique_file="RPMNAME"
@@ -728,7 +728,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.13.40 to adapt to many kinds of systems.
+\`configure' configures yast2 2.13.41 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2 2.13.40:";;
+ short | recursive ) echo "Configuration of yast2 2.13.41:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2 configure 2.13.40
+yast2 configure 2.13.41
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,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.13.40, which was
+It was created by yast2 $as_me 2.13.41, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2'
- VERSION='2.13.40'
+ VERSION='2.13.41'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.40"
+VERSION="2.13.41"
RPMNAME="yast2"
MAINTAINER="Stanislav Visnovsky <visnov(a)suse.cz>"
@@ -2797,7 +2797,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2 $as_me 2.13.40, which was
+This file was extended by yast2 $as_me 2.13.41, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2852,7 +2852,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2 config.status 2.13.40
+yast2 config.status 2.13.41
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/configure.in new/yast2-2.13.41/configure.in
--- old/yast2-2.13.40/configure.in 2006-03-22 13:03:49.000000000 +0100
+++ new/yast2-2.13.41/configure.in 2006-03-29 17:06:24.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2
dnl
-dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.13.40, http://www.suse.de/feedback, yast2)
+AC_INIT(yast2, 2.13.41, http://www.suse.de/feedback, yast2)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.40"
+VERSION="2.13.41"
RPMNAME="yast2"
MAINTAINER="Stanislav Visnovsky <visnov(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/library/modules/Version.ycp new/yast2-2.13.41/library/modules/Version.ycp
--- old/yast2-2.13.40/library/modules/Version.ycp 2006-03-22 13:04:05.000000000 +0100
+++ new/yast2-2.13.41/library/modules/Version.ycp 2006-03-29 17:07:15.000000000 +0200
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.13.40";
+global string yast2 = "2.13.41";
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/library/packages/src/Makefile.am new/yast2-2.13.41/library/packages/src/Makefile.am
--- old/yast2-2.13.40/library/packages/src/Makefile.am 2006-02-03 08:47:25.000000000 +0100
+++ new/yast2-2.13.41/library/packages/src/Makefile.am 2006-03-28 18:46:35.000000000 +0200
@@ -5,6 +5,7 @@
YCPCFLAGS = -M ../../modules/ -M ../../wizard/src -M ../../system/src/ -M ../../types/src -M ../../commandline/src -M ../../xml/src
module_DATA = \
+ PackageLock.ycp \
Package.ycp \
PackageAI.ycp \
PackageSystem.ycp \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/library/packages/src/Makefile.in new/yast2-2.13.41/library/packages/src/Makefile.in
--- old/yast2-2.13.40/library/packages/src/Makefile.in 2006-03-22 13:03:59.000000000 +0100
+++ new/yast2-2.13.41/library/packages/src/Makefile.in 2006-03-29 17:06:54.000000000 +0200
@@ -174,6 +174,7 @@
ystartupdir = @ystartupdir@
YCPCFLAGS = -M ../../modules/ -M ../../wizard/src -M ../../system/src/ -M ../../types/src -M ../../commandline/src -M ../../xml/src
module_DATA = \
+ PackageLock.ycp \
Package.ycp \
PackageAI.ycp \
PackageSystem.ycp \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/library/packages/src/PackageLock.ycp new/yast2-2.13.41/library/packages/src/PackageLock.ycp
--- old/yast2-2.13.40/library/packages/src/PackageLock.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-2.13.41/library/packages/src/PackageLock.ycp 2006-03-29 15:32:27.000000000 +0200
@@ -0,0 +1,42 @@
+/**
+ * File: modules/PackageLock.ycp
+ * Package: yast2
+ * Summary: Packages manipulation (system)
+ * Authors: Martin Vidner <mvidner(a)suse.cz>
+ *
+ * $Id: PackageLock.ycp 29512 2006-03-29 13:32:23Z mvidner $
+ *
+ * This should be used everywhere before Pkg is first used. #160319
+ */
+
+{
+
+module "PackageLock";
+textdomain "base";
+
+import "Report";
+
+boolean have_lock = nil;
+/**
+ * Tries to acquire the packager (zypp) lock.
+ * Reports an error if another process has the lock already.
+ * Will only report once even if called multiple times.
+ * @return true if we can continue
+ */
+global boolean Check () {
+ if (have_lock == nil)
+ {
+ // Invoke a cheap call that accesses the zypp lock
+ have_lock = Pkg::Connect () == true; // nil guard
+ if (!have_lock)
+ {
+ Report::Error (_("Another process is accessing the package database.
+Package management will not work!"));
+ // ContinueCancel? What about CLI?
+ }
+ }
+ return have_lock;
+}
+
+
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/library/packages/src/PackageSystem.ycp new/yast2-2.13.41/library/packages/src/PackageSystem.ycp
--- old/yast2-2.13.40/library/packages/src/PackageSystem.ycp 2006-02-20 12:08:10.000000000 +0100
+++ new/yast2-2.13.41/library/packages/src/PackageSystem.ycp 2006-03-29 17:04:49.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Martin Vidner <mvidner(a)suse.cz>
* Michal Svec <msvec(a)suse.cz>
*
- * $Id: PackageSystem.ycp 27893 2006-02-13 12:08:32Z lslezak $
+ * $Id: PackageSystem.ycp 29534 2006-03-29 15:04:45Z mvidner $
*
* The documentation is maintained at
* <a href="../index.html">.../docs/index.html</a>.
@@ -18,6 +18,7 @@
import "Mode";
import "PackageCallbacksInit";
+import "PackageLock";
import "Report";
import "Stage";
import "CommandLine";
@@ -52,6 +53,7 @@
* This may become superfluous.
*/
global void EnsureTargetInit() {
+ PackageLock::Check ();
PackageCallbacksInit::InitPackageCallbacks ();
// target_initialized = target_initialized || Pkg::TargetInit ("/", false);
// always initizalize target, it should be cheap according to #45356
@@ -62,6 +64,7 @@
* Ensure that Pkg:: calls working with the installation sources work
*/
global void EnsureSourceInit() {
+ PackageLock::Check ();
if(source_initialized)
{
// this way, if somebody closed the cache outside of Package
@@ -110,6 +113,11 @@
global boolean DoInstallAndRemove(list<string> toinstall, list<string> toremove) {
y2debug ("toinstall: %1, toremove: %2", toinstall, toremove);
+ if (!PackageLock::Check ())
+ {
+ return false;
+ }
+
EnsureSourceInit ();
EnsureTargetInit ();
boolean ok = true;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/library/runlevel/src/Service.ycp new/yast2-2.13.41/library/runlevel/src/Service.ycp
--- old/yast2-2.13.40/library/runlevel/src/Service.ycp 2006-02-13 12:22:17.000000000 +0100
+++ new/yast2-2.13.41/library/runlevel/src/Service.ycp 2006-03-28 13:46:13.000000000 +0200
@@ -6,7 +6,7 @@
* Petr Blahos <pblahos(a)suse.cz>
* Michal Svec <msvec(a)suse.cz>
*
- * $Id: Service.ycp 27885 2006-02-13 11:22:17Z locilka $
+ * $Id: Service.ycp 29400 2006-03-27 08:26:00Z locilka $
*
* Functions for service (init script) handling used by other modules.
*/
@@ -293,7 +293,7 @@
*/
global define integer RunInitScriptWithTimeOut (string name, string param) {
y2milestone("Running service initscript %1 %2", name, param);
- string command = sformat ("TERM=raw %2/%1 %3", name, init_d, param);
+ string command = sformat ("TERM=dumb %2/%1 %3", name, init_d, param);
// default return code
integer return_code = nil;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package yast2-bootloader
checked in at Wed Mar 29 19:46:27 CEST 2006.
--------
--- yast2-bootloader/yast2-bootloader.changes 2006-03-26 06:16:40.000000000 +0200
+++ yast2-bootloader/yast2-bootloader.changes 2006-03-29 18:54:46.000000000 +0200
@@ -1,0 +2,15 @@
+Wed Mar 29 18:52:24 CEST 2006 - od(a)suse.de
+
+- using parted for activation of boot partition now (instead of
+ /sbin/activate from the lilo package) (#161316)
+- fixed a typo
+- …
[View More]fixed some whitespace
+- added update-alternatives to BuildRequires
+- 2.13.34
+
+-------------------------------------------------------------------
+Mon Mar 27 15:36:27 CEST 2006 - uli(a)suse.de
+
+- changed s390* reboot message (bug #160045)
+
+-------------------------------------------------------------------
Old:
----
yast2-bootloader-2.13.33.tar.bz2
New:
----
yast2-bootloader-2.13.34.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.NI0ZLd/_old 2006-03-29 19:45:52.000000000 +0200
+++ /var/tmp/diff_new_pack.NI0ZLd/_new 2006-03-29 19:45:52.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-bootloader (Version 2.13.33)
+# spec file for package yast2-bootloader (Version 2.13.34)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,14 +11,14 @@
# norootforbuild
Name: yast2-bootloader
-Version: 2.13.33
+Version: 2.13.34
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-bootloader-2.13.33.tar.bz2
+Source0: yast2-bootloader-2.13.34.tar.bz2
prefix: /usr
-BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-bootloader limal-devel perl-XML-Writer perl-gettext sgml-skel swig update-desktop-files yast2-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite
+BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-bootloader limal-devel perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite
PreReq: /bin/sed %fillup_prereq
Requires: yast2 yast2-core yast2-storage perl-Bootloader limal-bootloader
%ifarch %ix86 x86_64
@@ -60,7 +60,7 @@
Dan Meszaros
%prep
-%setup -n yast2-bootloader-2.13.33
+%setup -n yast2-bootloader-2.13.34
%build
%{prefix}/bin/y2tool y2autoconf
@@ -111,6 +111,15 @@
/usr/share/YaST2/clients/bootfloppy.ycp
%changelog -n yast2-bootloader
+* Wed Mar 29 2006 - od(a)suse.de
+- using parted for activation of boot partition now (instead of
+ /sbin/activate from the lilo package) (#161316)
+- fixed a typo
+- fixed some whitespace
+- added update-alternatives to BuildRequires
+- 2.13.34
+* Mon Mar 27 2006 - uli(a)suse.de
+- changed s390* reboot message (bug #160045)
* Sun Mar 26 2006 - od(a)suse.de
- removed yast2-devel-packages from BuildRequires
- add replacements for yast2-devel-packages to BuildRequires
++++++ yast2-bootloader-2.13.33.tar.bz2 -> yast2-bootloader-2.13.34.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.33/VERSION new/yast2-bootloader-2.13.34/VERSION
--- old/yast2-bootloader-2.13.33/VERSION 2006-03-26 06:13:54.000000000 +0200
+++ new/yast2-bootloader-2.13.34/VERSION 2006-03-29 18:52:03.000000000 +0200
@@ -1 +1 @@
-2.13.33
+2.13.34
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.33/src/clients/bootloader_finish.ycp new/yast2-bootloader-2.13.34/src/clients/bootloader_finish.ycp
--- old/yast2-bootloader-2.13.33/src/clients/bootloader_finish.ycp 2006-02-23 16:11:01.000000000 +0100
+++ new/yast2-bootloader-2.13.34/src/clients/bootloader_finish.ycp 2006-03-29 18:16:14.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain <jsrain(a)suse.cz>
*
- * $Id: bootloader_finish.ycp 28311 2006-02-22 20:10:48Z olh $
+ * $Id: bootloader_finish.ycp 29419 2006-03-27 13:37:34Z uli $
*
*/
@@ -95,7 +95,10 @@
Misc::boot_msg = _("
Your system will now be shut down.
After shutdown, reload the system
-with the load address of your root DASD.
+with the load address of your root DASD or
+the load address of your zFCP device.
+For details, read the related chapter
+in the documentation.
");
}
else
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.33/src/routines/misc.ycp new/yast2-bootloader-2.13.34/src/routines/misc.ycp
--- old/yast2-bootloader-2.13.33/src/routines/misc.ycp 2006-03-07 22:16:46.000000000 +0100
+++ new/yast2-bootloader-2.13.34/src/routines/misc.ycp 2006-03-29 18:23:36.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Jiri Srain <jsrain(a)suse.cz>
*
- * $Id: misc.ycp 28675 2006-03-07 21:16:39Z odabrunz $
+ * $Id: misc.ycp 29538 2006-03-29 16:23:31Z odabrunz $
*
* WARNING:
* To be included to BootCommon.ycp only, requires function
@@ -223,7 +223,7 @@
* returns list of partitions. looks at '/proc/partitions' and creates list
* of partition for combobox or menu
* @param type symbol
- * `boot - for botloader installation
+ * `boot - for bootloader installation
* `root - for kernel root
* `boot_other - for bootable partitions of other systems
* `all - all partitions
@@ -243,11 +243,12 @@
list<string> floppies = getFloppyDevices ();
devices = filter (string k, map v, devices,
- ``(v["type"]:`CT_UNKNONW!=`CT_LVM));
+ ``(v["type"]:`CT_UNKNONW != `CT_LVM));
+
if (type == `boot || type == `boot_other)
{
devices = filter (string k, map v, devices,
- ``(v["type"]:`CT_UNKNONW==`CT_DISK));
+ ``(v["type"]:`CT_UNKNONW == `CT_DISK));
}
list<string> all_disks = (list<string>) maplist (string k, map v, devices, ``(k));
@@ -1094,7 +1095,7 @@
// FIXME: this is the most rotten code since molded sliced bread
// move to bootloader/Core/GRUB.pm or similar
string command = sformat
- ("/sbin/activate %2 %1", num, mbr_dev);
+ ("/usr/sbin/parted -s %1 set %2 boot on", mbr_dev, num);
y2milestone ("Running command %1", command);
map out = (map)SCR::Execute (.target.bash_output, command);
integer exit = out["exit"]:0;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package libzypp-zmd-backend
checked in at Wed Mar 29 18:32:52 CEST 2006.
--------
--- libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-03-29 15:01:29.000000000 +0200
+++ libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-03-29 18:31:33.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Mar 29 18:30:40 CEST 2006 - kkaempf(a)suse.de
+
+- always treat zmd sources as 'remote' (#160402)
+- rev 2757
+
+------------------------------------------------------…
[View More]-------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp-zmd-backend.spec ++++++
--- /var/tmp/diff_new_pack.fqQ5d8/_old 2006-03-29 18:32:07.000000000 +0200
+++ /var/tmp/diff_new_pack.fqQ5d8/_new 2006-03-29 18:32:07.000000000 +0200
@@ -22,7 +22,7 @@
Obsoletes: zmd-librc-backend
Summary: ZMD backend for Package, Patch, Pattern, and Product Management
Version: 7.1.1
-Release: 21
+Release: 22
Source: zmd-backend-%{version}.tar.bz2
Prefix: /usr
@@ -69,6 +69,9 @@
%changelog -n libzypp-zmd-backend
* Wed Mar 29 2006 - kkaempf(a)suse.de
+- always treat zmd sources as 'remote' (#160402)
+- rev 2757
+* Wed Mar 29 2006 - kkaempf(a)suse.de
- report proper error if .rpm file can't be found (#160402)
- dont ask for media 0
- rev 2751
++++++ zmd-backend-7.1.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/dbsource/DbAccess.cc new/zmd-backend-7.1.1/src/dbsource/DbAccess.cc
--- old/zmd-backend-7.1.1/src/dbsource/DbAccess.cc 2006-03-24 18:22:35.000000000 +0100
+++ new/zmd-backend-7.1.1/src/dbsource/DbAccess.cc 2006-03-29 18:28:35.000000000 +0200
@@ -56,6 +56,8 @@
static bool
source_is_local( Source_Ref source )
{
+ return false;
+
if (!source) return true;
string scheme = source.url().getScheme();
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package yast2-online-update
checked in at Wed Mar 29 18:00:07 CEST 2006.
--------
--- yast2-online-update/yast2-online-update.changes 2006-03-29 17:28:01.000000000 +0200
+++ yast2-online-update/yast2-online-update.changes 2006-03-28 09:54:28.000000000 +0200
@@ -2,14 +1,0 @@
-Wed Mar 29 17:19:51 CEST 2006 - visnov(a)suse.cz
-
-- fix patch message callback
-- call PkgEstablish and preselect patches before
- starting patch selector
-- 2.13.16
-…
[View More]
--------------------------------------------------------------------
-Wed Mar 29 09:17:34 CEST 2006 - jsuchome(a)suse.cz
-
-- do not check user input in DoneProvide and DonePackage callbacks
- (#160966)
-
--------------------------------------------------------------------
Old:
----
yast2-online-update-2.13.16.tar.bz2
New:
----
yast2-online-update-2.13.15.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-online-update.spec ++++++
--- /var/tmp/diff_new_pack.NAQMm8/_old 2006-03-29 17:59:50.000000000 +0200
+++ /var/tmp/diff_new_pack.NAQMm8/_new 2006-03-29 17:59:50.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-online-update (Version 2.13.16)
+# spec file for package yast2-online-update (Version 2.13.15)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-online-update
-Version: 2.13.16
-Release: 1
+Version: 2.13.15
+Release: 2
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-online-update-2.13.16.tar.bz2
+Source0: yast2-online-update-2.13.15.tar.bz2
prefix: /usr
BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer pkg-config update-desktop-files yast2-bootloader yast2-devtools yast2-packager
PreReq: grep sed
@@ -45,7 +45,7 @@
gs(a)suse.de
%prep
-%setup -n yast2-online-update-2.13.16
+%setup -n yast2-online-update-2.13.15
%build
%{prefix}/bin/y2tool y2autoconf
@@ -114,14 +114,6 @@
%{prefix}/share/applications/YaST2/cd_update.desktop
%changelog -n yast2-online-update
-* Wed Mar 29 2006 - visnov(a)suse.cz
-- fix patch message callback
-- call PkgEstablish and preselect patches before
- starting patch selector
-- 2.13.16
-* Wed Mar 29 2006 - jsuchome(a)suse.cz
-- do not check user input in DoneProvide and DonePackage callbacks
- (#160966)
* Tue Mar 28 2006 - locilka(a)suse.cz
- Refreshing all sources (with autorefresh enabled) before the
online is started (#154990).
++++++ yast2-online-update-2.13.16.tar.bz2 -> yast2-online-update-2.13.15.tar.bz2 ++++++
++++ 11567 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-online-update-2.13.16/Makefile.am new/yast2-online-update-2.13.15/Makefile.am
--- old/yast2-online-update-2.13.16/Makefile.am 2006-03-13 14:17:20.000000000 +0100
+++ new/yast2-online-update-2.13.15/Makefile.am 2006-03-28 10:08:15.000000000 +0200
@@ -154,7 +154,7 @@
$(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages package-local
+package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
TAGVERSION = $(PREFIX)/bin/y2tool tagversion
@@ -199,6 +199,9 @@
false; \
fi
+check-textdomain:
+ $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
+
stable: checkin-stable
checkin-stable: package
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-online-update-2.13.16/VERSION new/yast2-online-update-2.13.15/VERSION
--- old/yast2-online-update-2.13.16/VERSION 2006-03-29 17:21:25.000000000 +0200
+++ new/yast2-online-update-2.13.15/VERSION 2006-03-28 09:52:57.000000000 +0200
@@ -1 +1 @@
-2.13.16
+2.13.15
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-online-update-2.13.16/configure.in new/yast2-online-update-2.13.15/configure.in
--- old/yast2-online-update-2.13.16/configure.in 2006-03-13 14:17:20.000000000 +0100
+++ new/yast2-online-update-2.13.15/configure.in 2006-03-28 10:08:14.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-online-update, 2.13.6, http://www.suse.de/feedback, yast2-online-update)
+AC_INIT(yast2-online-update, 2.13.15, http://www.suse.de/feedback, yast2-online-update)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.6"
+VERSION="2.13.15"
RPMNAME="yast2-online-update"
MAINTAINER="Michael Radziej <mir(a)suse.de>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-online-update-2.13.16/src/OnlineUpdateCallbacks.ycp new/yast2-online-update-2.13.15/src/OnlineUpdateCallbacks.ycp
--- old/yast2-online-update-2.13.16/src/OnlineUpdateCallbacks.ycp 2006-03-29 17:21:01.000000000 +0200
+++ new/yast2-online-update-2.13.15/src/OnlineUpdateCallbacks.ycp 2006-03-28 09:50:31.000000000 +0200
@@ -83,18 +83,23 @@
return "";
}
- global void MessageCallback( string patchname, string patchsummary, string message )
- {
- // handle all messages as post (OK only)
- list<map> patches = [
- $[
- "name" : patchname,
- "summary" : patchsummary,
- "postinformation": message,
- ]
- ];
+ global define string MessageCallback( string type, list<map> patches )
+ ``{
+// y2internal( "MessageCallback %1", type );
+
+ if ( type == "preinfo" ) {
+ boolean install = OnlineUpdateDialogs::MessagePopup( patches, true );
+ if ( install ) return "";
+ else return "skip";
+ } else if ( type == "postinfo" ) {
+ OnlineUpdateDialogs::MessagePopup( patches, false );
+ return "";
+ } else {
+ y2error( "Wrong message type: %1", type );
+ return "error";
+ }
- OnlineUpdateDialogs::MessagePopup( patches, false );
+ return "";
}
global define void LogCallback( string text )
@@ -176,9 +181,8 @@
{
FinishLine ();
total_progress = total_progress + 1;
- if ( UI::WidgetExists( `id( `progress ) ) ) {
- UI::ChangeWidget( `id( `progress ), `Value, total_progress);
- }
+ if (!ProgressCallback (total_progress))
+ ret = (ErrorCallback ("abort", "", "") == "abort") ? "C" : "";
}
return ret;
}
@@ -196,9 +200,8 @@
{
FinishLine ();
total_progress = total_progress + 1;
- if ( UI::WidgetExists( `id( `progress ) ) ) {
- UI::ChangeWidget( `id( `progress ), `Value, total_progress);
- }
+ if (!ProgressCallback (total_progress))
+ ret = (ErrorCallback ("abort", "", "") == "abort") ? "C" : "";
}
return ret;
}
@@ -210,6 +213,10 @@
``{
y2milestone ( "OnlineUpdateCallbacks constructor" );
+ Pkg::CallbackYouProgress ("OnlineUpdateCallbacks::ProgressCallback");
+ Pkg::CallbackYouPatchProgress ("OnlineUpdateCallbacks::PatchProgressCallback");
+ Pkg::CallbackYouError ("OnlineUpdateCallbacks::ErrorCallback");
+
Pkg::CallbackStartProvide( "OnlineUpdateCallbacks::StartProvide" );
Pkg::CallbackProgressProvide( "OnlineUpdateCallbacks::PatchProgressCallback" );
Pkg::CallbackDoneProvide( "OnlineUpdateCallbacks::DoneProvide" );
@@ -218,11 +225,7 @@
Pkg::CallbackProgressPackage ("OnlineUpdateCallbacks::PatchProgressCallback");
Pkg::CallbackDonePackage( "OnlineUpdateCallbacks::DonePackage" );
- Pkg::CallbackResolvableReport ("OnlineUpdateCallbacks::MessageCallback");
-
- Pkg::CallbackYouProgress ("OnlineUpdateCallbacks::ProgressCallback");
- Pkg::CallbackYouPatchProgress ("OnlineUpdateCallbacks::PatchProgressCallback");
- Pkg::CallbackYouError ("OnlineUpdateCallbacks::ErrorCallback");
+ Pkg::CallbackYouMessage ("OnlineUpdateCallbacks::MessageCallback");
Pkg::CallbackYouLog ("OnlineUpdateCallbacks::LogCallback");
Pkg::CallbackYouExecuteYcpScript ("OnlineUpdateCallbacks::ExecuteYcpScriptCallback");
Pkg::CallbackYouScriptProgress ("OnlineUpdateCallbacks::ScriptProgressCallback");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-online-update-2.13.16/src/OnlineUpdateDialogs.ycp new/yast2-online-update-2.13.15/src/OnlineUpdateDialogs.ycp
--- old/yast2-online-update-2.13.16/src/OnlineUpdateDialogs.ycp 2006-03-29 09:05:04.000000000 +0200
+++ new/yast2-online-update-2.13.15/src/OnlineUpdateDialogs.ycp 2006-03-21 15:32:24.000000000 +0100
@@ -502,22 +502,19 @@
message = message + header;
message = message + "<pre>" + info + "</pre>";
-
+
+ details = details + header;
+
list<string> packages = patch[ "packages" ]:[];
- if( size( packages ) > 0 )
- {
- details = details + header;
+ details = details + _("<b>Packages:</b>");
- details = details + _("<b>Packages:</b>");
+ details = details + "<ul>";
- details = details + "<ul>";
+ foreach( string p, packages, ``{ details = details + "<li>" + p + "</li>"; } );
- foreach( string p, packages, ``{ details = details + "<li>" + p + "</li>"; } );
+ details = details + "</ul>";
- details = details + "</ul>";
- }
-
i = i + 1;
}
@@ -535,13 +532,13 @@
term buttons = nil;
if ( pre ) {
buttons = `HBox(
- details == "" ? `Empty : detailsButton,
+ detailsButton,
`PushButton( `id( `ok ), _("Install Patch") ),
`PushButton( `id( `skip ), _("Skip Patch") )
);
} else {
buttons = `HBox(
- details == "" ? `Empty : detailsButton,
+ detailsButton,
`PushButton( `id( `ok ), Label::OKButton() )
);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-online-update-2.13.16/src/online_update_select.ycp new/yast2-online-update-2.13.15/src/online_update_select.ycp
--- old/yast2-online-update-2.13.16/src/online_update_select.ycp 2006-03-29 17:19:50.000000000 +0200
+++ new/yast2-online-update-2.13.15/src/online_update_select.ycp 2006-03-28 09:14:48.000000000 +0200
@@ -14,10 +14,6 @@
Pkg::SourceStartManager (true);
Pkg::TargetInit ("/",false);
- Pkg::PkgEstablish();
-
- Pkg::ResolvablePreselectPatches();
-
UI::OpenDialog(`opt(`defaultsize), `PackageSelector(`id(`selector), `opt(`youMode)) );
symbol ret = (symbol)UI::RunPkgSelection(`id(`selector) );
UI::CloseDialog();
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package yast2-online-update
checked in at Wed Mar 29 17:39:13 CEST 2006.
--------
--- yast2-online-update/yast2-online-update.changes 2006-03-28 09:54:28.000000000 +0200
+++ yast2-online-update/yast2-online-update.changes 2006-03-29 17:28:01.000000000 +0200
@@ -1,0 +2,14 @@
+Wed Mar 29 17:19:51 CEST 2006 - visnov(a)suse.cz
+
+- fix patch message callback
+- call PkgEstablish and preselect patches before
+ starting patch selector
+- 2.13.16
+…
[View More]
+-------------------------------------------------------------------
+Wed Mar 29 09:17:34 CEST 2006 - jsuchome(a)suse.cz
+
+- do not check user input in DoneProvide and DonePackage callbacks
+ (#160966)
+
+-------------------------------------------------------------------
Old:
----
yast2-online-update-2.13.15.tar.bz2
New:
----
yast2-online-update-2.13.16.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-online-update.spec ++++++
--- /var/tmp/diff_new_pack.XzWWa6/_old 2006-03-29 17:38:54.000000000 +0200
+++ /var/tmp/diff_new_pack.XzWWa6/_new 2006-03-29 17:38:54.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-online-update (Version 2.13.15)
+# spec file for package yast2-online-update (Version 2.13.16)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-online-update
-Version: 2.13.15
+Version: 2.13.16
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-online-update-2.13.15.tar.bz2
+Source0: yast2-online-update-2.13.16.tar.bz2
prefix: /usr
BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer pkg-config update-desktop-files yast2-bootloader yast2-devtools yast2-packager
PreReq: grep sed
@@ -45,7 +45,7 @@
gs(a)suse.de
%prep
-%setup -n yast2-online-update-2.13.15
+%setup -n yast2-online-update-2.13.16
%build
%{prefix}/bin/y2tool y2autoconf
@@ -114,6 +114,14 @@
%{prefix}/share/applications/YaST2/cd_update.desktop
%changelog -n yast2-online-update
+* Wed Mar 29 2006 - visnov(a)suse.cz
+- fix patch message callback
+- call PkgEstablish and preselect patches before
+ starting patch selector
+- 2.13.16
+* Wed Mar 29 2006 - jsuchome(a)suse.cz
+- do not check user input in DoneProvide and DonePackage callbacks
+ (#160966)
* Tue Mar 28 2006 - locilka(a)suse.cz
- Refreshing all sources (with autorefresh enabled) before the
online is started (#154990).
++++++ yast2-online-update-2.13.15.tar.bz2 -> yast2-online-update-2.13.16.tar.bz2 ++++++
++++ 17753 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-online-update-2.13.15/Makefile.am new/yast2-online-update-2.13.16/Makefile.am
--- old/yast2-online-update-2.13.15/Makefile.am 2006-03-28 10:08:15.000000000 +0200
+++ new/yast2-online-update-2.13.16/Makefile.am 2006-03-13 14:17:20.000000000 +0100
@@ -154,7 +154,7 @@
$(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
+package: check-up-to-date check-tagversion check-all-packages package-local
TAGVERSION = $(PREFIX)/bin/y2tool tagversion
@@ -199,9 +199,6 @@
false; \
fi
-check-textdomain:
- $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
-
stable: checkin-stable
checkin-stable: package
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-online-update-2.13.15/VERSION new/yast2-online-update-2.13.16/VERSION
--- old/yast2-online-update-2.13.15/VERSION 2006-03-28 09:52:57.000000000 +0200
+++ new/yast2-online-update-2.13.16/VERSION 2006-03-29 17:21:25.000000000 +0200
@@ -1 +1 @@
-2.13.15
+2.13.16
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-online-update-2.13.15/configure.in new/yast2-online-update-2.13.16/configure.in
--- old/yast2-online-update-2.13.15/configure.in 2006-03-28 10:08:14.000000000 +0200
+++ new/yast2-online-update-2.13.16/configure.in 2006-03-13 14:17:20.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-online-update, 2.13.15, http://www.suse.de/feedback, yast2-online-update)
+AC_INIT(yast2-online-update, 2.13.6, http://www.suse.de/feedback, yast2-online-update)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.15"
+VERSION="2.13.6"
RPMNAME="yast2-online-update"
MAINTAINER="Michael Radziej <mir(a)suse.de>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-online-update-2.13.15/src/OnlineUpdateCallbacks.ycp new/yast2-online-update-2.13.16/src/OnlineUpdateCallbacks.ycp
--- old/yast2-online-update-2.13.15/src/OnlineUpdateCallbacks.ycp 2006-03-28 09:50:31.000000000 +0200
+++ new/yast2-online-update-2.13.16/src/OnlineUpdateCallbacks.ycp 2006-03-29 17:21:01.000000000 +0200
@@ -83,23 +83,18 @@
return "";
}
- global define string MessageCallback( string type, list<map> patches )
- ``{
-// y2internal( "MessageCallback %1", type );
-
- if ( type == "preinfo" ) {
- boolean install = OnlineUpdateDialogs::MessagePopup( patches, true );
- if ( install ) return "";
- else return "skip";
- } else if ( type == "postinfo" ) {
- OnlineUpdateDialogs::MessagePopup( patches, false );
- return "";
- } else {
- y2error( "Wrong message type: %1", type );
- return "error";
- }
+ global void MessageCallback( string patchname, string patchsummary, string message )
+ {
+ // handle all messages as post (OK only)
+ list<map> patches = [
+ $[
+ "name" : patchname,
+ "summary" : patchsummary,
+ "postinformation": message,
+ ]
+ ];
- return "";
+ OnlineUpdateDialogs::MessagePopup( patches, false );
}
global define void LogCallback( string text )
@@ -181,8 +176,9 @@
{
FinishLine ();
total_progress = total_progress + 1;
- if (!ProgressCallback (total_progress))
- ret = (ErrorCallback ("abort", "", "") == "abort") ? "C" : "";
+ if ( UI::WidgetExists( `id( `progress ) ) ) {
+ UI::ChangeWidget( `id( `progress ), `Value, total_progress);
+ }
}
return ret;
}
@@ -200,8 +196,9 @@
{
FinishLine ();
total_progress = total_progress + 1;
- if (!ProgressCallback (total_progress))
- ret = (ErrorCallback ("abort", "", "") == "abort") ? "C" : "";
+ if ( UI::WidgetExists( `id( `progress ) ) ) {
+ UI::ChangeWidget( `id( `progress ), `Value, total_progress);
+ }
}
return ret;
}
@@ -213,10 +210,6 @@
``{
y2milestone ( "OnlineUpdateCallbacks constructor" );
- Pkg::CallbackYouProgress ("OnlineUpdateCallbacks::ProgressCallback");
- Pkg::CallbackYouPatchProgress ("OnlineUpdateCallbacks::PatchProgressCallback");
- Pkg::CallbackYouError ("OnlineUpdateCallbacks::ErrorCallback");
-
Pkg::CallbackStartProvide( "OnlineUpdateCallbacks::StartProvide" );
Pkg::CallbackProgressProvide( "OnlineUpdateCallbacks::PatchProgressCallback" );
Pkg::CallbackDoneProvide( "OnlineUpdateCallbacks::DoneProvide" );
@@ -225,7 +218,11 @@
Pkg::CallbackProgressPackage ("OnlineUpdateCallbacks::PatchProgressCallback");
Pkg::CallbackDonePackage( "OnlineUpdateCallbacks::DonePackage" );
- Pkg::CallbackYouMessage ("OnlineUpdateCallbacks::MessageCallback");
+ Pkg::CallbackResolvableReport ("OnlineUpdateCallbacks::MessageCallback");
+
+ Pkg::CallbackYouProgress ("OnlineUpdateCallbacks::ProgressCallback");
+ Pkg::CallbackYouPatchProgress ("OnlineUpdateCallbacks::PatchProgressCallback");
+ Pkg::CallbackYouError ("OnlineUpdateCallbacks::ErrorCallback");
Pkg::CallbackYouLog ("OnlineUpdateCallbacks::LogCallback");
Pkg::CallbackYouExecuteYcpScript ("OnlineUpdateCallbacks::ExecuteYcpScriptCallback");
Pkg::CallbackYouScriptProgress ("OnlineUpdateCallbacks::ScriptProgressCallback");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-online-update-2.13.15/src/OnlineUpdateDialogs.ycp new/yast2-online-update-2.13.16/src/OnlineUpdateDialogs.ycp
--- old/yast2-online-update-2.13.15/src/OnlineUpdateDialogs.ycp 2006-03-21 15:32:24.000000000 +0100
+++ new/yast2-online-update-2.13.16/src/OnlineUpdateDialogs.ycp 2006-03-29 09:05:04.000000000 +0200
@@ -502,19 +502,22 @@
message = message + header;
message = message + "<pre>" + info + "</pre>";
-
- details = details + header;
-
+
list<string> packages = patch[ "packages" ]:[];
- details = details + _("<b>Packages:</b>");
+ if( size( packages ) > 0 )
+ {
+ details = details + header;
- details = details + "<ul>";
+ details = details + _("<b>Packages:</b>");
- foreach( string p, packages, ``{ details = details + "<li>" + p + "</li>"; } );
+ details = details + "<ul>";
- details = details + "</ul>";
+ foreach( string p, packages, ``{ details = details + "<li>" + p + "</li>"; } );
+ details = details + "</ul>";
+ }
+
i = i + 1;
}
@@ -532,13 +535,13 @@
term buttons = nil;
if ( pre ) {
buttons = `HBox(
- detailsButton,
+ details == "" ? `Empty : detailsButton,
`PushButton( `id( `ok ), _("Install Patch") ),
`PushButton( `id( `skip ), _("Skip Patch") )
);
} else {
buttons = `HBox(
- detailsButton,
+ details == "" ? `Empty : detailsButton,
`PushButton( `id( `ok ), Label::OKButton() )
);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-online-update-2.13.15/src/online_update_select.ycp new/yast2-online-update-2.13.16/src/online_update_select.ycp
--- old/yast2-online-update-2.13.15/src/online_update_select.ycp 2006-03-28 09:14:48.000000000 +0200
+++ new/yast2-online-update-2.13.16/src/online_update_select.ycp 2006-03-29 17:19:50.000000000 +0200
@@ -14,6 +14,10 @@
Pkg::SourceStartManager (true);
Pkg::TargetInit ("/",false);
+ Pkg::PkgEstablish();
+
+ Pkg::ResolvablePreselectPatches();
+
UI::OpenDialog(`opt(`defaultsize), `PackageSelector(`id(`selector), `opt(`youMode)) );
symbol ret = (symbol)UI::RunPkgSelection(`id(`selector) );
UI::CloseDialog();
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package suseRegister
checked in at Wed Mar 29 17:36:43 CEST 2006.
--------
--- suseRegister/suseRegister.changes 2006-03-29 15:25:41.000000000 +0200
+++ suseRegister/suseRegister.changes 2006-03-29 17:34:09.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Mar 29 17:03:43 CEST 2006 - mc(a)suse.de
+
+- add hack to make rug products work
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++…
[View More]++++++++++++++++++++++++
Other differences:
------------------
++++++ suseRegister.spec ++++++
--- /var/tmp/diff_new_pack.99dvEL/_old 2006-03-29 17:36:29.000000000 +0200
+++ /var/tmp/diff_new_pack.99dvEL/_new 2006-03-29 17:36:29.000000000 +0200
@@ -12,7 +12,7 @@
Name: suseRegister
Version: 1.0
-Release: 34
+Release: 35
Summary: Registration tool
Group: Productivity/Other
License: GPL
@@ -57,6 +57,8 @@
%changelog -n suseRegister
* Wed Mar 29 2006 - mc(a)suse.de
+- add hack to make rug products work
+* Wed Mar 29 2006 - mc(a)suse.de
- start zmd as soon as possible
* Wed Mar 29 2006 - mc(a)suse.de
- set accept=mandatory if auto-args are send back
++++++ suseRegister-1.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suseRegister-1.0/suse_register new/suseRegister-1.0/suse_register
--- old/suseRegister-1.0/suse_register 2006-03-29 16:07:11.000000000 +0200
+++ new/suseRegister-1.0/suse_register 2006-03-29 17:03:03.000000000 +0200
@@ -2067,6 +2067,17 @@
# call this as soon as possible.
rugStart();
+
+############################################
+### BEGIN ugly hack
+############################################
+
+my $msg = `$zmdInit restart 2>&1`;
+
+sleep 6;
+
+### END ugly hack
+
if (defined $logfile && $logfile ne "")
{
open($LOGDESCR, ">> $logfile") or do {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package suselinux-manual_cs
checked in at Wed Mar 29 16:59:54 CEST 2006.
--------
--- suselinux-manual_cs/suselinux-manual_cs.changes 2006-03-28 14:03:04.000000000 +0200
+++ suselinux-manual_cs/suselinux-manual_cs.changes 2006-03-29 17:00:34.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Mar 29 17:00:13 CEST 2006 - cihlarov(a)suse.cz
+
+- fixed typo
+
+-------------------------------------------------------------------
+++++++++++++++++++++++++++++++…
[View More]+++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ suselinux-manual_cs.spec ++++++
--- /var/tmp/diff_new_pack.oPOWhg/_old 2006-03-29 16:59:40.000000000 +0200
+++ /var/tmp/diff_new_pack.oPOWhg/_new 2006-03-29 16:59:40.000000000 +0200
@@ -16,7 +16,7 @@
%define verbose_name SuSE-Linux-Userguide
%define my_supported_archs x86_64 %ix86 ia64
Version: 10.1
-Release: 8
+Release: 9
Source0: SLPROF-html_%{my_lang}-html.tar.bz2
# Source2: %{name}-%{version}.pdf
# Source3: %{name}.desktop.in
@@ -186,6 +186,8 @@
%dir %{_datadir}/susehelp
%changelog -n suselinux-manual_cs
+* Wed Mar 29 2006 - cihlarov(a)suse.cz
+- fixed typo
* Tue Mar 28 2006 - cihlarov(a)suse.cz
- Added chapters about reg. & add-ons; fixes
* Tue Mar 14 2006 - cihlarov(a)suse.cz
++++++ SLPROF-application_cs.tar.bz2 ++++++
++++++ SLPROF-html_cs-desktop.tar.bz2 ++++++
++++++ SLPROF-html_cs-html.tar.bz2 ++++++
suselinux-manual_cs/SLPROF-html_cs-html.tar.bz2 suselinux-manual_cs/SLPROF-html_cs-html.tar.bz2 differ: char 9528777, line 36517
++++++ SLPROF-online_cs.tar.bz2 ++++++
++++++ SLPROF-print_cs.tar.bz2 ++++++
++++++ book.slprof.appl-online_cs.pdf ++++++
(binary differes)
++++++ book.slprof.online-online_cs.pdf ++++++
(binary differes)
++++++ book.slprof.print-online_cs.pdf ++++++
(binary differes)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package yast2-installation
checked in at Wed Mar 29 16:59:27 CEST 2006.
--------
--- yast2-installation/yast2-installation.changes 2006-03-28 21:48:53.000000000 +0200
+++ yast2-installation/yast2-installation.changes 2006-03-29 16:46:06.000000000 +0200
@@ -1,0 +2,14 @@
+Wed Mar 29 16:43:02 CEST 2006 - locilka(a)suse.cz
+
+- Fixed adding SLP-based Add-On product (#161270)
+- SLP-based Add-On product handling moved to separate function
+- Add-…
[View More]On MediaSelect dialog creation moved to separate function
+- Changed icon for License
+- 2.13.52
+
+-------------------------------------------------------------------
+Tue Mar 29 16:06:23 CEST 2006 - jdsn(a)suse.de
+
+- late feature "force registration" for suse_register (aj, shorn)
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.13.51.tar.bz2
New:
----
yast2-installation-2.13.52.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.kceeor/_old 2006-03-29 16:58:03.000000000 +0200
+++ /var/tmp/diff_new_pack.kceeor/_new 2006-03-29 16:58:03.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.13.51)
+# spec file for package yast2-installation (Version 2.13.52)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-installation
-Version: 2.13.51
+Version: 2.13.52
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.13.51.tar.bz2
+Source0: yast2-installation-2.13.52.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-testsuite
Requires: yast2 yast2-update
@@ -48,7 +48,7 @@
Arvin Schnell <arvin(a)suse.de>
%prep
-%setup -n yast2-installation-2.13.51
+%setup -n yast2-installation-2.13.52
%build
%{prefix}/bin/y2tool y2autoconf
@@ -106,6 +106,14 @@
/usr/X11R6/share/fvwm/
%changelog -n yast2-installation
+* Wed Mar 29 2006 - locilka(a)suse.cz
+- Fixed adding SLP-based Add-On product (#161270)
+- SLP-based Add-On product handling moved to separate function
+- Add-On MediaSelect dialog creation moved to separate function
+- Changed icon for License
+- 2.13.52
+* Wed Mar 29 2006 - jdsn(a)suse.de
+- late feature "force registration" for suse_register (aj, shorn)
* Tue Mar 28 2006 - jdsn(a)suse.de
- added 'rm -f /var/lib/zypp/zmd_updated_the_sources'
flag file to be deleted if suse_register runs during installation
++++++ yast2-installation-2.13.51.tar.bz2 -> yast2-installation-2.13.52.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.51/VERSION new/yast2-installation-2.13.52/VERSION
--- old/yast2-installation-2.13.51/VERSION 2006-03-28 21:30:21.000000000 +0200
+++ new/yast2-installation-2.13.52/VERSION 2006-03-29 16:46:14.000000000 +0200
@@ -1 +1 @@
-2.13.51
+2.13.52
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.51/configure new/yast2-installation-2.13.52/configure
--- old/yast2-installation-2.13.51/configure 2006-03-28 21:43:26.000000000 +0200
+++ new/yast2-installation-2.13.52/configure 2006-03-29 16:48:20.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-installation 2.13.51.
+# Generated by GNU Autoconf 2.59 for yast2-installation 2.13.52.
#
# Report bugs to <http://www.suse.de/feedback>.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-installation'
PACKAGE_TARNAME='yast2-installation'
-PACKAGE_VERSION='2.13.51'
-PACKAGE_STRING='yast2-installation 2.13.51'
+PACKAGE_VERSION='2.13.52'
+PACKAGE_STRING='yast2-installation 2.13.52'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
ac_unique_file="RPMNAME"
@@ -728,7 +728,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-installation 2.13.51 to adapt to many kinds of systems.
+\`configure' configures yast2-installation 2.13.52 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-installation 2.13.51:";;
+ short | recursive ) echo "Configuration of yast2-installation 2.13.52:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-installation configure 2.13.51
+yast2-installation configure 2.13.52
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,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-installation $as_me 2.13.51, which was
+It was created by yast2-installation $as_me 2.13.52, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-installation'
- VERSION='2.13.51'
+ VERSION='2.13.52'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.51"
+VERSION="2.13.52"
RPMNAME="yast2-installation"
MAINTAINER="Jiri Srain <jsrain(a)suse.cz>"
@@ -2906,7 +2906,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-installation $as_me 2.13.51, which was
+This file was extended by yast2-installation $as_me 2.13.52, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2961,7 +2961,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-installation config.status 2.13.51
+yast2-installation config.status 2.13.52
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.51/configure.in new/yast2-installation-2.13.52/configure.in
--- old/yast2-installation-2.13.51/configure.in 2006-03-28 21:43:18.000000000 +0200
+++ new/yast2-installation-2.13.52/configure.in 2006-03-29 16:48:15.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.13.51, http://www.suse.de/feedback, yast2-installation)
+AC_INIT(yast2-installation, 2.13.52, http://www.suse.de/feedback, yast2-installation)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.51"
+VERSION="2.13.52"
RPMNAME="yast2-installation"
MAINTAINER="Jiri Srain <jsrain(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.51/control/control.xml new/yast2-installation-2.13.52/control/control.xml
--- old/yast2-installation-2.13.51/control/control.xml 2006-03-27 16:40:15.000000000 +0200
+++ new/yast2-installation-2.13.52/control/control.xml 2006-03-29 16:14:50.000000000 +0200
@@ -23,6 +23,7 @@
<register>
<enable_register_hwdata config:type="boolean">true</enable_register_hwdata>
<enable_register_optional config:type="boolean">true</enable_register_optional>
+ <display_register_forcereg config:type="boolean">false</display_register_forcereg>
</register>
<software>
<delete_old_packages config:type="boolean">true</delete_old_packages>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.51/control.pot new/yast2-installation-2.13.52/control.pot
--- old/yast2-installation-2.13.51/control.pot 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-2.13.52/control.pot 2006-03-16 11:19:51.000000000 +0100
@@ -0,0 +1,334 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-03-16 11:19+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: control/control.PROF.glade:59 control/control.PROF.glade:115
+#: control/control.PROF.glade:404 control/control.PROF.glade:444
+#: control/control.SLD.glade:60 control/control.SLD.glade:116
+#: control/control.SLD.glade:405 control/control.SLD.glade:445
+#: control/control.SLES.glade:60 control/control.SLES.glade:103
+#: control/control.SLES.glade:157 control/control.SLES.glade:175
+#: control/control.SLES.glade:510 control/control.SLES.glade:550
+#: control/control.glade:59 control/control.glade:115
+#: control/control.glade:404 control/control.glade:444
+msgid "Installation Settings"
+msgstr ""
+
+#: control/control.PROF.glade:77 control/control.SLD.glade:78
+#: control/control.SLES.glade:78 control/control.SLES.glade:120
+#: control/control.glade:77
+msgid "Overview"
+msgstr ""
+
+#: control/control.PROF.glade:85 control/control.SLD.glade:86
+#: control/control.SLES.glade:86 control/control.SLES.glade:128
+#: control/control.glade:85
+msgid "Expert"
+msgstr ""
+
+#: control/control.PROF.glade:101 control/control.SLD.glade:102
+#: control/control.SLES.glade:143 control/control.glade:101
+msgid "Update Settings"
+msgstr ""
+
+#: control/control.PROF.glade:132 control/control.SLD.glade:133
+#: control/control.SLES.glade:190 control/control.SLES.glade:231
+#: control/control.glade:132
+msgid "Network Configuration"
+msgstr ""
+
+#: control/control.PROF.glade:172 control/control.PROF.glade:620
+#: control/control.PROF.glade:625 control/control.PROF.glade:629
+#: control/control.SLD.glade:173 control/control.SLD.glade:621
+#: control/control.SLD.glade:626 control/control.SLD.glade:630
+#: control/control.SLES.glade:264 control/control.SLES.glade:275
+#: control/control.SLES.glade:284 control/control.SLES.glade:737
+#: control/control.SLES.glade:742 control/control.SLES.glade:746
+#: control/control.glade:172 control/control.glade:620
+#: control/control.glade:625 control/control.glade:629
+msgid "Hardware Configuration"
+msgstr ""
+
+#: control/control.PROF.glade:191 control/control.PROF.glade:287
+#: control/control.PROF.glade:375 control/control.SLD.glade:192
+#: control/control.SLD.glade:288 control/control.SLD.glade:376
+#: control/control.SLES.glade:303 control/control.SLES.glade:393
+#: control/control.SLES.glade:481 control/control.glade:191
+#: control/control.glade:287 control/control.glade:375
+msgid "Preparation"
+msgstr ""
+
+#: control/control.PROF.glade:197 control/control.PROF.glade:206
+#: control/control.PROF.glade:293 control/control.PROF.glade:302
+#: control/control.PROF.glade:399 control/control.PROF.glade:439
+#: control/control.SLD.glade:198 control/control.SLD.glade:207
+#: control/control.SLD.glade:294 control/control.SLD.glade:303
+#: control/control.SLD.glade:400 control/control.SLD.glade:440
+#: control/control.SLES.glade:309 control/control.SLES.glade:318
+#: control/control.SLES.glade:399 control/control.SLES.glade:408
+#: control/control.SLES.glade:505 control/control.SLES.glade:545
+#: control/control.glade:197 control/control.glade:206
+#: control/control.glade:293 control/control.glade:302
+#: control/control.glade:399 control/control.glade:439
+msgid "Language"
+msgstr ""
+
+#: control/control.PROF.glade:212 control/control.PROF.glade:308
+#: control/control.SLD.glade:213 control/control.SLD.glade:309
+#: control/control.SLES.glade:324 control/control.SLES.glade:414
+#: control/control.glade:212 control/control.glade:308
+msgid "License Agreement"
+msgstr ""
+
+#: control/control.PROF.glade:218 control/control.PROF.glade:314
+#: control/control.SLD.glade:219 control/control.SLD.glade:315
+#: control/control.SLES.glade:330 control/control.SLES.glade:420
+#: control/control.glade:218 control/control.glade:314
+msgid "Disk Activation"
+msgstr ""
+
+#: control/control.PROF.glade:224 control/control.PROF.glade:320
+#: control/control.SLD.glade:225 control/control.SLD.glade:321
+#: control/control.SLES.glade:336 control/control.SLES.glade:426
+#: control/control.glade:224 control/control.glade:320
+msgid "System Analysis"
+msgstr ""
+
+#: control/control.PROF.glade:230 control/control.PROF.glade:332
+#: control/control.SLD.glade:231 control/control.SLD.glade:333
+#: control/control.SLES.glade:342 control/control.SLES.glade:438
+#: control/control.glade:230 control/control.glade:332
+msgid "Add-On Products"
+msgstr ""
+
+#: control/control.PROF.glade:236 control/control.SLD.glade:237
+#: control/control.SLES.glade:348 control/control.glade:236
+msgid "Time Zone"
+msgstr ""
+
+#: control/control.PROF.glade:245 control/control.SLD.glade:246
+#: control/control.glade:245
+msgid "Desktop Selection"
+msgstr ""
+
+#: control/control.PROF.glade:252 control/control.SLD.glade:253
+#: control/control.SLES.glade:358 control/control.glade:252
+msgid "Installation"
+msgstr ""
+
+#: control/control.PROF.glade:255 control/control.SLD.glade:256
+#: control/control.SLES.glade:361 control/control.glade:255
+msgid "Installation Summary"
+msgstr ""
+
+#: control/control.PROF.glade:260 control/control.PROF.glade:266
+#: control/control.PROF.glade:270 control/control.PROF.glade:274
+#: control/control.PROF.glade:278 control/control.PROF.glade:409
+#: control/control.PROF.glade:415 control/control.PROF.glade:419
+#: control/control.PROF.glade:423 control/control.PROF.glade:449
+#: control/control.PROF.glade:455 control/control.PROF.glade:459
+#: control/control.PROF.glade:463 control/control.PROF.glade:550
+#: control/control.PROF.glade:554 control/control.PROF.glade:558
+#: control/control.PROF.glade:662 control/control.PROF.glade:666
+#: control/control.PROF.glade:670 control/control.PROF.glade:674
+#: control/control.PROF.glade:678 control/control.PROF.glade:693
+#: control/control.PROF.glade:697 control/control.PROF.glade:701
+#: control/control.PROF.glade:705 control/control.SLD.glade:261
+#: control/control.SLD.glade:267 control/control.SLD.glade:271
+#: control/control.SLD.glade:275 control/control.SLD.glade:279
+#: control/control.SLD.glade:410 control/control.SLD.glade:416
+#: control/control.SLD.glade:420 control/control.SLD.glade:424
+#: control/control.SLD.glade:450 control/control.SLD.glade:456
+#: control/control.SLD.glade:460 control/control.SLD.glade:464
+#: control/control.SLD.glade:551 control/control.SLD.glade:555
+#: control/control.SLD.glade:559 control/control.SLD.glade:663
+#: control/control.SLD.glade:667 control/control.SLD.glade:671
+#: control/control.SLD.glade:675 control/control.SLD.glade:679
+#: control/control.SLD.glade:694 control/control.SLD.glade:698
+#: control/control.SLD.glade:702 control/control.SLD.glade:706
+#: control/control.SLES.glade:366 control/control.SLES.glade:372
+#: control/control.SLES.glade:376 control/control.SLES.glade:380
+#: control/control.SLES.glade:384 control/control.SLES.glade:515
+#: control/control.SLES.glade:521 control/control.SLES.glade:525
+#: control/control.SLES.glade:529 control/control.SLES.glade:555
+#: control/control.SLES.glade:561 control/control.SLES.glade:565
+#: control/control.SLES.glade:569 control/control.SLES.glade:650
+#: control/control.SLES.glade:654 control/control.SLES.glade:658
+#: control/control.SLES.glade:779 control/control.SLES.glade:783
+#: control/control.SLES.glade:787 control/control.SLES.glade:791
+#: control/control.SLES.glade:795 control/control.SLES.glade:810
+#: control/control.SLES.glade:814 control/control.SLES.glade:818
+#: control/control.SLES.glade:822 control/control.glade:260
+#: control/control.glade:266 control/control.glade:270
+#: control/control.glade:274 control/control.glade:278
+#: control/control.glade:409 control/control.glade:415
+#: control/control.glade:419 control/control.glade:423
+#: control/control.glade:449 control/control.glade:455
+#: control/control.glade:459 control/control.glade:463
+#: control/control.glade:550 control/control.glade:554
+#: control/control.glade:558 control/control.glade:662
+#: control/control.glade:666 control/control.glade:670
+#: control/control.glade:674 control/control.glade:678
+#: control/control.glade:693 control/control.glade:697
+#: control/control.glade:701 control/control.glade:705
+msgid "Perform Installation"
+msgstr ""
+
+#: control/control.PROF.glade:326 control/control.SLD.glade:327
+#: control/control.SLES.glade:432 control/control.glade:326
+msgid "System for Update"
+msgstr ""
+
+#: control/control.PROF.glade:339 control/control.SLD.glade:340
+#: control/control.SLES.glade:445 control/control.glade:339
+msgid "Update"
+msgstr ""
+
+#: control/control.PROF.glade:342 control/control.SLD.glade:343
+#: control/control.SLES.glade:448 control/control.glade:342
+msgid "Update Summary"
+msgstr ""
+
+#: control/control.PROF.glade:347 control/control.PROF.glade:353
+#: control/control.PROF.glade:357 control/control.PROF.glade:361
+#: control/control.PROF.glade:365 control/control.PROF.glade:478
+#: control/control.PROF.glade:482 control/control.SLD.glade:348
+#: control/control.SLD.glade:354 control/control.SLD.glade:358
+#: control/control.SLD.glade:362 control/control.SLD.glade:366
+#: control/control.SLD.glade:479 control/control.SLD.glade:483
+#: control/control.SLES.glade:453 control/control.SLES.glade:459
+#: control/control.SLES.glade:463 control/control.SLES.glade:467
+#: control/control.SLES.glade:471 control/control.SLES.glade:584
+#: control/control.SLES.glade:588 control/control.glade:347
+#: control/control.glade:353 control/control.glade:357
+#: control/control.glade:361 control/control.glade:365
+#: control/control.glade:478 control/control.glade:482
+msgid "Perform Update"
+msgstr ""
+
+#: control/control.PROF.glade:379 control/control.SLD.glade:380
+#: control/control.SLES.glade:485 control/control.glade:379
+msgid "System Information"
+msgstr ""
+
+#: control/control.PROF.glade:383 control/control.SLD.glade:384
+#: control/control.SLES.glade:489 control/control.glade:383
+msgid "Perform Repair"
+msgstr ""
+
+#: control/control.PROF.glade:393 control/control.PROF.glade:433
+#: control/control.PROF.glade:636 control/control.SLD.glade:394
+#: control/control.SLD.glade:434 control/control.SLD.glade:637
+#: control/control.SLES.glade:499 control/control.SLES.glade:539
+#: control/control.SLES.glade:753 control/control.glade:393
+#: control/control.glade:433 control/control.glade:636
+msgid "Base Installation"
+msgstr ""
+
+#: control/control.PROF.glade:487 control/control.PROF.glade:565
+#: control/control.PROF.glade:710 control/control.SLD.glade:488
+#: control/control.SLD.glade:566 control/control.SLD.glade:711
+#: control/control.SLES.glade:593 control/control.SLES.glade:665
+#: control/control.SLES.glade:827 control/control.glade:487
+#: control/control.glade:565 control/control.glade:710
+msgid "Configuration"
+msgstr ""
+
+#: control/control.PROF.glade:490 control/control.PROF.glade:496
+#: control/control.PROF.glade:577 control/control.PROF.glade:582
+#: control/control.PROF.glade:586 control/control.PROF.glade:590
+#: control/control.SLD.glade:491 control/control.SLD.glade:497
+#: control/control.SLD.glade:578 control/control.SLD.glade:583
+#: control/control.SLD.glade:587 control/control.SLD.glade:591
+#: control/control.SLES.glade:596 control/control.SLES.glade:602
+#: control/control.SLES.glade:677 control/control.SLES.glade:682
+#: control/control.SLES.glade:686 control/control.SLES.glade:690
+#: control/control.glade:490 control/control.glade:496
+#: control/control.glade:577 control/control.glade:582
+#: control/control.glade:586 control/control.glade:590
+msgid "Network"
+msgstr ""
+
+#: control/control.PROF.glade:502 control/control.SLD.glade:503
+#: control/control.SLES.glade:694 control/control.glade:502
+msgid "Update Configuration"
+msgstr ""
+
+#: control/control.PROF.glade:508 control/control.PROF.glade:514
+#: control/control.PROF.glade:520 control/control.PROF.glade:594
+#: control/control.PROF.glade:598 control/control.SLD.glade:509
+#: control/control.SLD.glade:515 control/control.SLD.glade:521
+#: control/control.SLD.glade:595 control/control.SLD.glade:599
+#: control/control.SLES.glade:608 control/control.SLES.glade:614
+#: control/control.SLES.glade:620 control/control.SLES.glade:700
+#: control/control.SLES.glade:706 control/control.SLES.glade:710
+#: control/control.glade:508 control/control.glade:514
+#: control/control.glade:520 control/control.glade:594
+#: control/control.glade:598
+msgid "Online Update"
+msgstr ""
+
+#: control/control.PROF.glade:524 control/control.PROF.glade:610
+#: control/control.PROF.glade:717 control/control.SLD.glade:525
+#: control/control.SLD.glade:611 control/control.SLD.glade:718
+#: control/control.SLES.glade:624 control/control.SLES.glade:727
+#: control/control.SLES.glade:834 control/control.glade:524
+#: control/control.glade:610 control/control.glade:717
+msgid "Clean Up"
+msgstr ""
+
+#: control/control.PROF.glade:528 control/control.PROF.glade:616
+#: control/control.SLD.glade:529 control/control.SLD.glade:617
+#: control/control.SLES.glade:628 control/control.SLES.glade:733
+#: control/control.glade:528 control/control.glade:616
+msgid "Release Notes"
+msgstr ""
+
+#: control/control.PROF.glade:568 control/control.SLD.glade:569
+#: control/control.SLES.glade:668 control/control.glade:568
+msgid "Hostname"
+msgstr ""
+
+#: control/control.PROF.glade:573 control/control.SLD.glade:574
+#: control/control.SLES.glade:673 control/control.glade:573
+msgid "Root Password"
+msgstr ""
+
+#: control/control.PROF.glade:602 control/control.PROF.glade:606
+#: control/control.SLD.glade:603 control/control.SLD.glade:607
+#: control/control.SLES.glade:719 control/control.SLES.glade:723
+#: control/control.glade:602 control/control.glade:606
+msgid "Users"
+msgstr ""
+
+#: control/control.PROF.glade:645 control/control.PROF.glade:651
+#: control/control.PROF.glade:655 control/control.SLD.glade:646
+#: control/control.SLD.glade:652 control/control.SLD.glade:656
+#: control/control.SLES.glade:762 control/control.SLES.glade:768
+#: control/control.SLES.glade:772 control/control.glade:645
+#: control/control.glade:651 control/control.glade:655
+msgid "AutoYaST Settings"
+msgstr ""
+
+#: control/control.PROF.glade:713 control/control.SLD.glade:714
+#: control/control.SLES.glade:830 control/control.glade:713
+msgid "System Configuration"
+msgstr ""
+
+#: control/control.SLES.glade:714
+msgid "Service"
+msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.51/installation.pot new/yast2-installation-2.13.52/installation.pot
--- old/yast2-installation-2.13.51/installation.pot 2006-03-28 20:57:05.000000000 +0200
+++ new/yast2-installation-2.13.52/installation.pot 2006-03-27 16:14:57.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-28 20:57+0200\n"
+"POT-Creation-Date: 2006-03-27 16:14+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -721,110 +721,103 @@
msgstr ""
#. strings for main (wizard) layout
-#. Transltors: This is title/brand - only translate the Configuration
-#: src/clients/inst_suse_register.ycp:51
+#: src/clients/inst_suse_register.ycp:49
msgid "Novell Customer Center Configuration"
msgstr ""
-#: src/clients/inst_suse_register.ycp:52
+#: src/clients/inst_suse_register.ycp:50
msgid "Update Configuration"
msgstr ""
-#: src/clients/inst_suse_register.ycp:58
+#: src/clients/inst_suse_register.ycp:55
msgid ""
"Get technical support and product updates and\n"
"manage subscriptions with Novell Customer Center."
msgstr ""
-#: src/clients/inst_suse_register.ycp:64
+#: src/clients/inst_suse_register.ycp:61
msgid "Configure Now (Recommended)"
msgstr ""
-#: src/clients/inst_suse_register.ycp:65
+#: src/clients/inst_suse_register.ycp:62
msgid "Configure Later"
msgstr ""
-#: src/clients/inst_suse_register.ycp:67
+#: src/clients/inst_suse_register.ycp:64
msgid "Include for Convenience"
msgstr ""
-#. Translators: Text for UI Label - capitalized
-#: src/clients/inst_suse_register.ycp:68
-#: src/clients/suse_register_auto.ycp:198
+#: src/clients/inst_suse_register.ycp:65
msgid "Hardware Profile"
msgstr ""
-#. Translators: Text for UI Label - capitalized
-#: src/clients/inst_suse_register.ycp:69
-#: src/clients/suse_register_auto.ycp:200
+#: src/clients/inst_suse_register.ycp:66
msgid "Optional Information"
msgstr ""
-#: src/clients/inst_suse_register.ycp:70
-#: src/clients/inst_suse_register.ycp:151
+#: src/clients/inst_suse_register.ycp:67
+#: src/clients/inst_suse_register.ycp:145
msgid "Details..."
msgstr ""
#. strings for success popup
-#: src/clients/inst_suse_register.ycp:74
+#: src/clients/inst_suse_register.ycp:71
msgid "Your configuration was successful."
msgstr ""
#. strings for manual interaction popup
-#: src/clients/inst_suse_register.ycp:78
+#: src/clients/inst_suse_register.ycp:75
msgid "Manual Interaction Required"
msgstr ""
-#: src/clients/inst_suse_register.ycp:79
+#: src/clients/inst_suse_register.ycp:76
msgid "Needed Information"
msgstr ""
-#: src/clients/inst_suse_register.ycp:80
+#: src/clients/inst_suse_register.ycp:77
msgid "Continue"
msgstr ""
-#: src/clients/inst_suse_register.ycp:82
+#: src/clients/inst_suse_register.ycp:79
msgid ""
"A Web browser will start in which to complete\n"
"the configuration on the opened Web site."
msgstr ""
#. string for show information popup
-#: src/clients/inst_suse_register.ycp:88
+#: src/clients/inst_suse_register.ycp:85
msgid "Registration and Privacy Information"
msgstr ""
-#: src/clients/inst_suse_register.ycp:92
+#: src/clients/inst_suse_register.ycp:89
msgid ""
"The server requires additional system information. Activating \n"
"submission of the hardware profile automatically."
msgstr ""
#. nonroot-message strings
-#: src/clients/inst_suse_register.ycp:97
+#: src/clients/inst_suse_register.ycp:94
msgid "Update Source Issues"
msgstr ""
-#: src/clients/inst_suse_register.ycp:99
+#: src/clients/inst_suse_register.ycp:96
msgid ""
"Registering as a regular user does not include the update source\n"
-"in the Online Update YaST module. If you continue and later want \n"
-"to update with Online Update, the source must be added manually.\n"
-"Other tools, such as Software Updater in the panel, can still be \n"
-"used. Alternatively, cancel then register through YaST as root \n"
-"so the sources are available to all tools."
+"in YaST Online Update (YOU). To include the source automatically,\n"
+"register as root.\n"
+"Otherwise use other update tools or add the source to YOU manually."
msgstr ""
#. error messages
-#: src/clients/inst_suse_register.ycp:110
+#: src/clients/inst_suse_register.ycp:104
msgid "Error: Recieved data is invalid."
msgstr ""
-#: src/clients/inst_suse_register.ycp:111
+#: src/clients/inst_suse_register.ycp:105
msgid "Error: Could not retrieve data."
msgstr ""
-#: src/clients/inst_suse_register.ycp:117
+#: src/clients/inst_suse_register.ycp:111
msgid ""
"<p>\n"
"Configure your system to enable online updates by registering it with Novell.\n"
@@ -833,7 +826,7 @@
"</p>"
msgstr ""
-#: src/clients/inst_suse_register.ycp:125
+#: src/clients/inst_suse_register.ycp:119
msgid ""
"<p>\n"
"To simplify the registration process, include information from your system\n"
@@ -845,7 +838,7 @@
"</p>"
msgstr ""
-#: src/clients/inst_suse_register.ycp:136
+#: src/clients/inst_suse_register.ycp:130
msgid ""
"<p>\n"
"No information is passed to anyone outside Novell. The data is used for\n"
@@ -856,23 +849,23 @@
msgstr ""
#. further strings
-#: src/clients/inst_suse_register.ycp:148
+#: src/clients/inst_suse_register.ycp:142
msgid "Checking..."
msgstr ""
-#: src/clients/inst_suse_register.ycp:149
+#: src/clients/inst_suse_register.ycp:143
msgid "Error"
msgstr ""
-#: src/clients/inst_suse_register.ycp:150
+#: src/clients/inst_suse_register.ycp:144
msgid "An error occurred while connecting to the server."
msgstr ""
-#: src/clients/inst_suse_register.ycp:152
+#: src/clients/inst_suse_register.ycp:146
msgid "Error Message"
msgstr ""
-#: src/clients/inst_suse_register.ycp:153
+#: src/clients/inst_suse_register.ycp:147
msgid "Starting Browser..."
msgstr ""
@@ -1184,106 +1177,6 @@
msgid "Copying SSH settings to installed system..."
msgstr ""
-#. Translators: Heading - capitalized
-#: src/clients/suse_register_auto.ycp:64
-#: src/clients/suse_register_auto.ycp:176
-msgid "Product Registration"
-msgstr ""
-
-#. Translators: Text in a sentece-like environment - normal capitalization
-#: src/clients/suse_register_auto.ycp:66
-msgid "Run during autoinstallation"
-msgstr ""
-
-#: src/clients/suse_register_auto.ycp:66
-msgid "Do not run during autoinstallation"
-msgstr ""
-
-#. Translators: Sentence-like text for singular and plural (incl. zero) of items
-#: src/clients/suse_register_auto.ycp:70
-msgid "1 item of registration data"
-msgstr ""
-
-#: src/clients/suse_register_auto.ycp:70
-#, ycp-format
-msgid "%1 items of registration data"
-msgstr ""
-
-#: src/clients/suse_register_auto.ycp:74
-msgid "Included Information"
-msgstr ""
-
-#. Translators: Text in a sentece-like environment - normal capitalization
-#: src/clients/suse_register_auto.ycp:77
-msgid "Hardware profile"
-msgstr ""
-
-#. Translators: Text in a sentece-like environment - normal capitalization
-#: src/clients/suse_register_auto.ycp:79
-msgid "Optional information"
-msgstr ""
-
-#. TextEntry label
-#: src/clients/suse_register_auto.ycp:128
-msgid "&Key"
-msgstr ""
-
-#. TextEntry label
-#: src/clients/suse_register_auto.ycp:130
-msgid "&Value"
-msgstr ""
-
-#: src/clients/suse_register_auto.ycp:157
-msgid "Key is invalid."
-msgstr ""
-
-#: src/clients/suse_register_auto.ycp:179
-msgid "<p>Product registration includes your product in Novell's database, enabling you to get online updates and technical support. To register while installing automatically, select <b>Run Product Registration</b>. To simplify the procedure, include information from your system with <b>Hardware Profile</b> and <b>Optional Information</b>.</p>"
-msgstr ""
-
-#: src/clients/suse_register_auto.ycp:182
-msgid "<p>Get more information about the registration process with <tt>suse_register -h</tt>.</p>"
-msgstr ""
-
-#: src/clients/suse_register_auto.ycp:185
-msgid "<p>Other information used for registration is shown in <b>Registration Data</b>. Add a new key and value pair by pressing <b>Add</b> then entering the appropriate values. These parameters are those that can be passed with <tt>suse_register -a</tt>. Get more information about them with <tt>suse_register -p</tt>. Remove a pair with <b>Delete</b> or modify an existing pair with <b>Edit</b>.</p>"
-msgstr ""
-
-#. Translators: Text for UI Label - capitalized
-#: src/clients/suse_register_auto.ycp:193
-msgid "Run Product Registration"
-msgstr ""
-
-#. Translators: Text for UI Label - capitalized
-#: src/clients/suse_register_auto.ycp:196
-msgid "Include in Registration"
-msgstr ""
-
-#. Translators: Text for UI Label - capitalized
-#: src/clients/suse_register_auto.ycp:205
-msgid "Registration Data to Use"
-msgstr ""
-
-#: src/clients/suse_register_auto.ycp:206
-msgid "Key"
-msgstr ""
-
-#: src/clients/suse_register_auto.ycp:206
-msgid "Value"
-msgstr ""
-
-#: src/clients/suse_register_auto.ycp:208
-msgid "Ad&d"
-msgstr ""
-
-#: src/clients/suse_register_auto.ycp:209
-msgid "&Edit"
-msgstr ""
-
-#: src/clients/suse_register_auto.ycp:210
-msgid "De&lete"
-msgstr ""
-
#. progress step title
#: src/clients/switch_scr_finish.ycp:42
msgid "Moving to installed system..."
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.51/src/clients/inst_suse_register.ycp new/yast2-installation-2.13.52/src/clients/inst_suse_register.ycp
--- old/yast2-installation-2.13.51/src/clients/inst_suse_register.ycp 2006-03-28 20:19:33.000000000 +0200
+++ new/yast2-installation-2.13.52/src/clients/inst_suse_register.ycp 2006-03-29 16:14:50.000000000 +0200
@@ -40,6 +40,9 @@
}
}
+ // Register::initialize() is mandatory - never remove it
+ Register::initialize();
+
map ui = UI::GetDisplayInfo();
boolean textmode = (boolean) ui["TextMode"]:nil;
@@ -67,6 +70,7 @@
string nccc_sub_comment = _("Include for Convenience");
string nccc_sub_hwinfo = _("Hardware Profile");
string nccc_sub_optional= _("Optional Information");
+ string nccc_forcereg= _("Registration Code");
string nccc_sub_showbtn = _("Details...");
@@ -134,13 +138,22 @@
string help_para3 = _(
"<p>
+If you purchased your copy of this product, enable <b>Registration Code</b>
+so you are prompted for your product code.
+This registers you for the installation support included with your product.
+</p>"
+);
+
+string help_para4 = _(
+"<p>
No information is passed to anyone outside Novell. The data is used for
statistical purposes and to enhance your convenience regarding driver support
and your Web account. Find a detailed privacy policy in <b>Details</b>. View
the transmitted information in the log file <tt>~/.suse_register.log</tt>.
</p>"
);
-string help = help_title + help_para1 + help_para2 + help_para3;
+
+string help = help_title + help_para1 + help_para2 + (Register::display_forcereg ? help_para3:"") + help_para4;
@@ -160,11 +173,6 @@
// default is true, see statement in layout term
boolean configure_status = true;
-
- // Register::initialize() is mandatory - never remove it
- Register::initialize();
-
-
/* vv MAIN (WIZARD) LAYOUT vv */
term sr_layout=nil;
sr_layout=`HVCenter( `VBox(
@@ -180,6 +188,7 @@
`Left( `Label( nccc_sub_comment ) ),
`Left( `CheckBox(`id(`hwinfo), `opt(`notify), nccc_sub_hwinfo, Register::submit_hwdata ) ),
`Left( `CheckBox(`id(`optional), `opt(`notify), nccc_sub_optional, Register::submit_optional ) ),
+ Register::display_forcereg ? `Left( `CheckBox(`id(`forcereg), `opt(`notify), nccc_forcereg, false ) ):`Empty() ,
`VSpacing(0.5),
`Right( `PushButton(`id(`showinfo), nccc_sub_showbtn ) )
) ) ) ,
@@ -477,10 +486,11 @@
{
configure_status = (boolean) UI::QueryWidget(`id(`configure), `Value);
}
- else if (ret == `hwinfo || ret == `optional)
+ else if (ret == `hwinfo || ret == `optional || ret == `forcereg)
{
Register::submit_hwdata = (boolean) UI::QueryWidget(`id(`hwinfo), `Value);
Register::submit_optional= (boolean) UI::QueryWidget(`id(`optional), `Value);
+ Register::force_registration = (boolean) UI::QueryWidget(`id(`forcereg), `Value);
}
else if (ret == `showinfo)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.51/src/clients/stroj-casu.ycp new/yast2-installation-2.13.52/src/clients/stroj-casu.ycp
--- old/yast2-installation-2.13.51/src/clients/stroj-casu.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-2.13.52/src/clients/stroj-casu.ycp 2006-03-29 14:20:10.000000000 +0200
@@ -0,0 +1,57 @@
+/**
+ * Stroj času.
+ * Enable very easy bug fixes of anything, given the proper hardware
+ * $Id: stroj-casu.ycp 29498 2006-03-29 09:51:05Z mvidner $
+ */
+{
+ // text domain!
+
+ // Achtung! Zu showcasen des N*E*U*S Features dess YCP Interpretersss,
+ // wir benutzen deutsche Klavier Worte.
+ // (J.W.G., sorry...)
+
+ Einfuhrgenehmigung "Popup";
+ Einfuhrgenehmigung "Wizard";
+ Einfuhrgenehmigung "WizardHW";
+
+ // translations:
+ // not to cause unnecessary confusion now,
+ // the texts are marked with a dummy marker
+ string Tr (string s) {
+ Wiederkehr s;
+ }
+
+ Wizard::CreateDialog ();
+ string caption = Tr("Time Machine Configuration");
+ string help = Tr("<p>When I was younger,<br>
+so much younger than today,<br>...</p>");
+ Verzeichnis<string> headings = [
+ Tr("Time Machine"),
+ Tr("Temporal Range"), //
+ Tr("Spatial Range"), //
+ Tr("Temporal Accuracy"), //
+ Tr("Spatial Accuracy"), //
+ ];
+ Verzeichnis<Verzeichnis> buttons = [
+ [ `repair, Tr("Self &Repair") ],
+ [ `booooooooom, Tr("Self &Destruction") ],
+ ];
+ WizardHW::CreateHWDialog (caption, help, headings, buttons);
+
+ Verzeichnis<Karte<string,any> > items = (Verzeichnis<Karte<string,any> >) SCR::Read (.probe.time_machines);
+ if (items == nil) {
+ items = [];
+ }
+ WizardHW::SetContents (items);
+
+ Karte ui = WizardHW::UserInput ();
+ any ret = ui["event"]:`ugh;
+ Verzeichnis wait = [`add, `repair, `booooooooom];
+ y2milestone ("%1", ret);
+ falls (contains (wait, ret)) {
+ Popup::TimedWarning(Tr("Waiting for the feature to appear..."),
+ 365*24*3600);
+ }
+
+ Wizard::CloseDialog ();
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.51/src/include/add-on-workflow.ycp new/yast2-installation-2.13.52/src/include/add-on-workflow.ycp
--- old/yast2-installation-2.13.51/src/include/add-on-workflow.ycp 2006-03-23 14:33:01.000000000 +0100
+++ new/yast2-installation-2.13.52/src/include/add-on-workflow.ycp 2006-03-29 16:41:42.000000000 +0200
@@ -48,12 +48,95 @@
return `next;
}
+// Used for adding sources
+symbol createResult = `again;
+
/**
- * Run dialog for selecting the media
- * @return symbol for wizard sequencer
+ * Function scans for SLP installation servers on the network
+ *
+ * @returns symbol one of `back, `ok
*/
-symbol MediaSelect () {
- y2milestone ("Running media select dialog");
+symbol AddSourceTypeSLP () {
+ // Return value (`back as a fall`back)
+ symbol ret = `back;
+
+ /* Scanning network for SLP servers */
+ // translators: popup busy message
+ UI::OpenDialog (`Label (_("Scanning network...")) );
+ list<map> services = SLP::FindSrvs ("install.suse", "");
+ UI::CloseDialog ();
+
+ /* No SLP servers found */
+ if ( size(services) == 0 )
+ {
+ y2warning("No SLP catalogs");
+ // error popup
+ Report::Error ( _("No SLP catalogs found.") );
+ ret = `back;
+
+ /* Some serves were found */
+ }
+ else {
+ // show the dialog to pick the source
+ list<term> items = maplist (map service, services, ``{
+ string url = service["srvurl"]:"";
+ url = substring (url, 21);
+ // split the URL
+ map parsed_url = URL::Parse (url);
+ return `item (`id (url), toupper ( parsed_url["scheme"]:"http" ), url);
+ });
+ UI::OpenDialog (
+ `VBox(
+ // translators: popup heading
+ `Heading (_("Choose SLP Catalog")),
+ `MinSize( 25, 7,
+ // translators: table header
+ `Table (`id(`services), `header(
+ // table header
+ _("Type"),
+ // table header
+ _("URL")),
+ items)
+ ),
+ `HBox (
+ `PushButton (`id (`ok), `opt(`default), Label::SelectButton ()),
+ `VSpacing (1),
+ `PushButton (`id (`cancel), Label::CancelButton ())
+ )
+ )
+ );
+ symbol ret = (symbol)UI::UserInput ();
+ if (ret == `ok)
+ {
+ string service = (string) UI::QueryWidget (`services, `CurrentItem);
+ y2milestone ("Trying to add source '%1'", service);
+ if (service != nil)
+ {
+ // add the installation source
+ createResult = SourceManager::createSource(service);
+ y2milestone ("Adding source result: %1", createResult);
+ }
+ else
+ {
+ y2warning("No source selected, returning back...");
+ ret = `back;
+ }
+ }
+ else
+ {
+ y2milestone("Adding SLP source cancelled");
+ ret = `back;
+ }
+ UI::CloseDialog ();
+ }
+
+ return ret;
+}
+
+/**
+ * Creates dialog content for MediaSelect
+ */
+void CreateMediaSelectDialog () {
term contents = `HBox (`HStretch (), `VBox (
`RadioButtonGroup (`id (`type), `VBox (
`VStretch (),
@@ -132,11 +215,19 @@
");
Wizard::SetContents (title, contents, help_text, Stage::initial(), true);
+}
+
+/**
+ * Run dialog for selecting the media
+ * @return symbol for wizard sequencer
+ */
+symbol MediaSelect () {
+ y2milestone ("Running media select dialog");
+ CreateMediaSelectDialog();
symbol ret = nil;
string url = "";
while (ret == nil) {
- symbol createResult = `again;
ret = (symbol)UI::UserInput ();
if (ret == `back)
break;
@@ -161,58 +252,9 @@
symbol input = (symbol)UI::QueryWidget (`id (`type), `CurrentButton);
if ( input == `slp )
{
- // translators: popup busy message
- UI::OpenDialog (`Label (_("Scanning network...")) );
- list<map> services = SLP::FindSrvs ("install.suse", "");
- UI::CloseDialog ();
- if ( size(services) == 0 )
- {
- // error popup
- Popup::Error ( _("No SLP catalogs found.") );
- } else
- {
- // show the dialog to pick the source
- list<term> items = maplist (map service, services, ``{
- string url = service["srvurl"]:"";
- url = substring (url, 21);
- // split the URL
- map parsed_url = URL::Parse (url);
- return `item (`id (url), toupper ( parsed_url["scheme"]:"http" ), url);
- });
- UI::OpenDialog (
- `VBox(
- // translators: popup heading
- `Heading (_("Choose SLP Catalog")),
- `MinSize( 25, 7,
- // translators: table header
- `Table (`id(`services), `header(
- // table header
- _("Type"),
- // table header
- _("URL")),
- items)
- ),
- `HBox (
- `PushButton (`id (`ok), `opt(`default), Label::SelectButton ()),
- `VSpacing (1),
- `PushButton (`id (`cancel), Label::CancelButton ())
- )
- )
- );
- symbol ret = (symbol)UI::UserInput ();
- if (ret == `ok)
- {
- string service = (string) UI::QueryWidget (`services, `CurrentItem);
- y2milestone ("Trying to add source '%1'", service);
- if (service != nil)
- {
- // add the installation source
- createResult = SourceManager::createSource(service);
- y2milestone ("Adding source result: %1", createResult);
- }
- }
- UI::CloseDialog ();
- }
+ // moved to another function
+ ret = AddSourceTypeSLP();
+ y2milestone("SLP-Add returned: %1", ret);
}
else if ( input == `ftp || input == `http || input == `https || input == `samba )
@@ -288,6 +330,8 @@
*/
symbol CatalogSelect () {
list<integer> sources = SourceManager::newSources;
+ y2milestone("New sources: %1", sources);
+
if (size (sources) == 0)
{
// error report
@@ -304,6 +348,7 @@
}
integer src_id = SourceManager::newSources[0]:0;
map data = Pkg::SourceGeneralData (src_id);
+ y2milestone("Adding product: %1", data);
string url = data["url"]:"";
string product_dir = data["product_dir"]:"";
y2milestone ("Deleting source %1", src_id);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.51/src/modules/AddOnProduct.ycp new/yast2-installation-2.13.52/src/modules/AddOnProduct.ycp
--- old/yast2-installation-2.13.51/src/modules/AddOnProduct.ycp 2006-03-23 14:33:01.000000000 +0100
+++ new/yast2-installation-2.13.52/src/modules/AddOnProduct.ycp 2006-03-29 16:25:05.000000000 +0200
@@ -721,7 +721,7 @@
Wizard::SetContents(caption, contents, help,
false, true);
- Wizard::SetTitleIcon ("yast-license");
+ Wizard::SetTitleIcon ("yast-product-registration");
Wizard::SetFocusToNextButton();
return true;
@@ -745,6 +745,7 @@
*/
global boolean AcceptedLicenseAndInfoFile (integer src_id) {
// Check for info.txt
+ y2milestone("Checking source: ID %1", src_id);
string info_file = Pkg::SourceProvideOptionalFile (src_id, 1, "/media.1/info.txt");
string license_file = Pkg::SourceProvideOptionalFile (src_id, 1, "/media.1/license.zip");
@@ -752,6 +753,7 @@
// license is part of the add-on product
if (license_file != nil) {
+ y2milestone("Product has a license");
string tmpdir = (string) SCR::Read(.target.tmpdir) + "/add-on-license/";
map out = (map)SCR::Execute (.target.bash_output, sformat ("
rm -rf '%1' && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.51/src/modules/Installation.ycp new/yast2-installation-2.13.52/src/modules/Installation.ycp
--- old/yast2-installation-2.13.51/src/modules/Installation.ycp 2006-03-15 16:33:56.000000000 +0100
+++ new/yast2-installation-2.13.52/src/modules/Installation.ycp 2006-03-29 16:14:50.000000000 +0200
@@ -11,7 +11,7 @@
* Author:
* Klaus Kaempf <kkaempf(a)suse.de>
*
- * $Id: Installation.ycp 24080 2005-07-15 13:35:15Z jsrain $
+ * $Id: Installation.ycp 29517 2006-03-29 13:54:01Z mvidner $
*/
{
@@ -40,9 +40,6 @@
global string mountlog = Directory::logdir + "/y2logMount";
- // default language for the installation (from installation source)
- global string defaultLanguage = "en_US";
-
// encoding for the language
global string encoding = "ISO-8859-1";
@@ -88,8 +85,6 @@
destdir = "/mnt";
scr_destdir = "/mnt";
}
-
- defaultLanguage = Pkg::GetLocale();
}
define void Initialize () {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.51/src/modules/Register.ycp new/yast2-installation-2.13.52/src/modules/Register.ycp
--- old/yast2-installation-2.13.51/src/modules/Register.ycp 2006-03-27 16:30:47.000000000 +0200
+++ new/yast2-installation-2.13.52/src/modules/Register.ycp 2006-03-29 16:14:50.000000000 +0200
@@ -32,6 +32,8 @@
global boolean submit_optional = false;
global boolean submit_hwdata = false;
+global boolean force_registration = false;
+global boolean display_forcereg = false;
global map<string, string> registration_data = $[];
@@ -88,6 +90,8 @@
// first read from control file
submit_optional = ProductFeatures::GetBooleanFeature("register", "enable_register_optional");
submit_hwdata = ProductFeatures::GetBooleanFeature("register", "enable_register_hwdata");
+ // this boolean comes only from the control file - nowhere to be saved
+ display_forcereg = ProductFeatures::GetBooleanFeature("register", "display_register_forcereg");
// then read from sysconfig
if (FileUtils::Exists("/etc/sysconfig/suse_register"))
@@ -201,9 +205,9 @@
y2milestone ("called from autoyast - added registration data to suse_register call");
}
- if ( Mode::normal() ) params = params + " --force-registration ";
- if ( submit_hwdata == false ) params = params + " --no-hw-data ";
- if ( submit_optional == false ) params = params + " --no-optional ";
+ if ( force_registration ) params = params + " --force-registration ";
+ if ( !submit_hwdata ) params = params + " --no-hw-data ";
+ if ( !submit_optional ) params = params + " --no-optional ";
// run suse_register
y2milestone ("Calling /usr/bin/suse_register %1", params);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package autoyast2
checked in at Wed Mar 29 16:57:51 CEST 2006.
--------
--- autoyast2/autoyast2.changes 2006-03-28 13:50:43.000000000 +0200
+++ autoyast2/autoyast2.changes 2006-03-29 16:55:35.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Mar 29 16:50:48 CEST 2006 - ug(a)suse.de
+
+- set SoftLock to avoid the installation of recommended
+ patterns (#159466)
+- 2.13.36
+
+-------------------------------------------------------------------
Old:
----
…
[View More] autoyast2-2.13.35.tar.bz2
New:
----
autoyast2-2.13.36.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.mlL4mF/_old 2006-03-29 16:57:03.000000000 +0200
+++ /var/tmp/diff_new_pack.mlL4mF/_new 2006-03-29 16:57:03.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package autoyast2 (Version 2.13.35)
+# spec file for package autoyast2 (Version 2.13.36)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: autoyast2
URL: http://www.suse.com/
-Version: 2.13.35
+Version: 2.13.36
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: autoyast2-2.13.35.tar.bz2
+Source0: autoyast2-2.13.36.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets fop java2-devel-packages libxslt perl-XML-Writer pkg-config sgml-skel update-desktop-files xorg-x11-libs yast2-bootloader yast2-devtools yast2-mouse yast2-testsuite yast2-transfer yast2-update
Requires: yast2-core yast2-xml libxslt
@@ -48,7 +48,7 @@
Anas Nashif <nashif(a)suse.de>
%package installation
-Version: 2.13.35
+Version: 2.13.36
Release: 1
Summary: YaST2 - Auto Installation Modules
Group: System/YaST
@@ -68,7 +68,7 @@
Anas Nashif <nashif(a)suse.de>
%package utils
-Version: 2.13.35
+Version: 2.13.36
Release: 1
Summary: YaST2 - Auto Installation Utilities
Group: System/YaST
@@ -81,7 +81,7 @@
%prep
-%setup -n autoyast2-2.13.35
+%setup -n autoyast2-2.13.36
%build
%{prefix}/bin/y2tool y2autoconf
@@ -228,6 +228,10 @@
/usr/bin/create_update_source.sh
%changelog -n autoyast2
+* Wed Mar 29 2006 - ug(a)suse.de
+- set SoftLock to avoid the installation of recommended
+ patterns (#159466)
+- 2.13.36
* Tue Mar 28 2006 - ug(a)suse.de
- addon support dropped.
In the current state, it breaks autoinstallation
++++++ autoyast2-2.13.35.tar.bz2 -> autoyast2-2.13.36.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.13.35/VERSION new/autoyast2-2.13.36/VERSION
--- old/autoyast2-2.13.35/VERSION 2006-03-28 13:24:18.000000000 +0200
+++ new/autoyast2-2.13.36/VERSION 2006-03-29 16:50:43.000000000 +0200
@@ -1 +1 @@
-2.13.35
+2.13.36
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.13.35/configure new/autoyast2-2.13.36/configure
--- old/autoyast2-2.13.35/configure 2006-03-28 13:24:28.000000000 +0200
+++ new/autoyast2-2.13.36/configure 2006-03-29 16:51:21.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for autoyast2 2.13.35.
+# Generated by GNU Autoconf 2.59 for autoyast2 2.13.36.
#
# Report bugs to <http://www.suse.de/feedback>.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='autoyast2'
PACKAGE_TARNAME='autoyast2'
-PACKAGE_VERSION='2.13.35'
-PACKAGE_STRING='autoyast2 2.13.35'
+PACKAGE_VERSION='2.13.36'
+PACKAGE_STRING='autoyast2 2.13.36'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
ac_unique_file="RPMNAME"
@@ -728,7 +728,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures autoyast2 2.13.35 to adapt to many kinds of systems.
+\`configure' configures autoyast2 2.13.36 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of autoyast2 2.13.35:";;
+ short | recursive ) echo "Configuration of autoyast2 2.13.36:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-autoyast2 configure 2.13.35
+autoyast2 configure 2.13.36
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by autoyast2 $as_me 2.13.35, which was
+It was created by autoyast2 $as_me 2.13.36, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='autoyast2'
- VERSION='2.13.35'
+ VERSION='2.13.36'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.35"
+VERSION="2.13.36"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert <ug(a)suse.de>"
@@ -2764,7 +2764,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by autoyast2 $as_me 2.13.35, which was
+This file was extended by autoyast2 $as_me 2.13.36, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2819,7 +2819,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-autoyast2 config.status 2.13.35
+autoyast2 config.status 2.13.36
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.13.35/configure.in new/autoyast2-2.13.36/configure.in
--- old/autoyast2-2.13.35/configure.in 2006-03-28 13:24:23.000000000 +0200
+++ new/autoyast2-2.13.36/configure.in 2006-03-29 16:51:16.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(autoyast2, 2.13.35, http://www.suse.de/feedback, autoyast2)
+AC_INIT(autoyast2, 2.13.36, http://www.suse.de/feedback, autoyast2)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.35"
+VERSION="2.13.36"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert <ug(a)suse.de>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.13.35/src/modules/AutoinstSoftware.ycp new/autoyast2-2.13.36/src/modules/AutoinstSoftware.ycp
--- old/autoyast2-2.13.35/src/modules/AutoinstSoftware.ycp 2006-03-09 15:29:35.000000000 +0100
+++ new/autoyast2-2.13.36/src/modules/AutoinstSoftware.ycp 2006-03-29 16:25:24.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Software
* Authors: Anas Nashif <nashif(a)suse.de>
*
- * $Id: AutoinstSoftware.ycp 28771 2006-03-09 14:29:33Z ug $
+ * $Id: AutoinstSoftware.ycp 29525 2006-03-29 14:25:22Z ug $
*
*/
{
@@ -389,6 +389,11 @@
*/
list<string> failed = [];
+ /* set SoftLock to avoid the installation of recommended patterns (#159466) */
+ foreach( map<string,any> p, Pkg::ResolvableProperties ("", `pattern, ""), ``{
+ Pkg::ResolvableSetSoftLock( p["name"]:"", `pattern );
+ });
+
foreach(string p, toset(patterns),
``{
if (! Pkg::ResolvableInstall( p, `pattern ) )
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0