Hello community,
here is the log from the commit of package yast2-instserver
checked in at Thu Oct 16 02:06:02 CEST 2008.
--------
--- yast2-instserver/yast2-instserver.changes 2008-10-14 16:23:29.000000000 +0200
+++ /d/STABLE/yast2-instserver/yast2-instserver.changes 2008-10-15 16:08:38.240814000 +0200
@@ -1,0 +2,8 @@
+Wed Oct 15 15:38:13 CEST 2008 - lslezak@suse.cz
+
+- fixed UI syntax error when asking for a CD (bnc#435658)
+- minor code11 fixes - remove cut blanks from content file values,
+ use NAME key (instead of PRODUCT) (bnc#428463)
+- 2.17.3
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-instserver-2.17.2.tar.bz2
New:
----
yast2-instserver-2.17.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-instserver.spec ++++++
--- /var/tmp/diff_new_pack.K21700/_old 2008-10-16 02:05:48.000000000 +0200
+++ /var/tmp/diff_new_pack.K21700/_new 2008-10-16 02:05:48.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-instserver (Version 2.17.2)
+# spec file for package yast2-instserver (Version 2.17.3)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,12 +20,12 @@
Url: http://www.suse.com/
Name: yast2-instserver
-Version: 2.17.2
+Version: 2.17.3
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-instserver-2.17.2.tar.bz2
+Source0: yast2-instserver-2.17.3.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-slp yast2-testsuite
# ag_content agent
@@ -47,7 +47,7 @@
Anas Nashif
%prep
-%setup -n yast2-instserver-2.17.2
+%setup -n yast2-instserver-2.17.3
%build
%{prefix}/bin/y2tool y2autoconf
@@ -83,6 +83,11 @@
%dir /etc/apache2
%dir /etc/apache2/conf.d
%changelog
+* Wed Oct 15 2008 lslezak@suse.cz
+- fixed UI syntax error when asking for a CD (bnc#435658)
+- minor code11 fixes - remove cut blanks from content file values,
+ use NAME key (instead of PRODUCT) (bnc#428463)
+- 2.17.3
* Tue Oct 14 2008 lslezak@suse.cz
- fixed adding of a removed repository - do not remove the new
repository at the and, remove it immediately (bnc#187280)
++++++ yast2-instserver-2.17.2.tar.bz2 -> yast2-instserver-2.17.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.17.2/configure new/yast2-instserver-2.17.3/configure
--- old/yast2-instserver-2.17.2/configure 2008-10-14 16:22:15.000000000 +0200
+++ new/yast2-instserver-2.17.3/configure 2008-10-15 16:03:03.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-instserver 2.17.2.
+# Generated by GNU Autoconf 2.61 for yast2-instserver 2.17.3.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-instserver'
PACKAGE_TARNAME='yast2-instserver'
-PACKAGE_VERSION='2.17.2'
-PACKAGE_STRING='yast2-instserver 2.17.2'
+PACKAGE_VERSION='2.17.3'
+PACKAGE_STRING='yast2-instserver 2.17.3'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,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-instserver 2.17.2 to adapt to many kinds of systems.
+\`configure' configures yast2-instserver 2.17.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-instserver 2.17.2:";;
+ short | recursive ) echo "Configuration of yast2-instserver 2.17.3:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-instserver configure 2.17.2
+yast2-instserver configure 2.17.3
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,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-instserver $as_me 2.17.2, which was
+It was created by yast2-instserver $as_me 2.17.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-instserver'
- VERSION='2.17.2'
+ VERSION='2.17.3'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.17.2"
+VERSION="2.17.3"
RPMNAME="yast2-instserver"
MAINTAINER="Ladislav Slezak "
@@ -3304,7 +3304,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-instserver $as_me 2.17.2, which was
+This file was extended by yast2-instserver $as_me 2.17.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3347,7 +3347,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-instserver config.status 2.17.2
+yast2-instserver config.status 2.17.3
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.17.2/configure.in new/yast2-instserver-2.17.3/configure.in
--- old/yast2-instserver-2.17.2/configure.in 2008-10-14 16:22:10.000000000 +0200
+++ new/yast2-instserver-2.17.3/configure.in 2008-10-15 16:02:57.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.3 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-instserver, 2.17.2, http://bugs.opensuse.org/, yast2-instserver)
+AC_INIT(yast2-instserver, 2.17.3, http://bugs.opensuse.org/, yast2-instserver)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.2"
+VERSION="2.17.3"
RPMNAME="yast2-instserver"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.17.2/src/complex.ycp new/yast2-instserver-2.17.3/src/complex.ycp
--- old/yast2-instserver-2.17.2/src/complex.ycp 2007-07-19 14:34:37.000000000 +0200
+++ new/yast2-instserver-2.17.3/src/complex.ycp 2008-10-15 16:02:47.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Anas Nashif
*
- * $Id: complex.ycp 39531 2007-07-19 12:34:37Z lslezak $
+ * $Id: complex.ycp 52262 2008-10-15 14:02:47Z lslezak $
*/
{
@@ -88,9 +88,16 @@
descr = add(descr, sformat(_("Announce Using SLP: %1"), (cfg["slp"]:false) ? _("Yes") : _("No")));
}
+ string product_name = cfg["PRODUCT"]:"";
+ if (product_name == "")
+ {
+ // code11
+ product_name = cfg["NAME"]:"";
+ }
+
map r = $[
"id" : name,
- "table_descr" : [ name, cfg["PRODUCT"]:"" + " " + cfg["VERSION"]:"" ],
+ "table_descr" : [ name, product_name + " " + cfg["VERSION"]:"" ],
"rich_descr" : WizardHW::CreateRichTextDescription(name, descr)
];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.17.2/src/dialogs.ycp new/yast2-instserver-2.17.3/src/dialogs.ycp
--- old/yast2-instserver-2.17.2/src/dialogs.ycp 2008-10-14 16:19:04.000000000 +0200
+++ new/yast2-instserver-2.17.3/src/dialogs.ycp 2008-10-15 16:07:10.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Anas Nashif
*
- * $Id: dialogs.ycp 52185 2008-10-14 14:19:03Z lslezak $
+ * $Id: dialogs.ycp 52264 2008-10-15 14:07:11Z lslezak $
*/
{
@@ -49,15 +49,15 @@
{
symbol pop = Popup::AnyQuestion3(_("Change Media"),
msg,
- Label::ContinueButton(),
- _("Ski&p"),
- Label::CancelButton(),
+ Label::ContinueButton(), // `yes
+ Label::CancelButton(), // `no
+ Label::SkipButton(), // `retry
`focus_yes );
- if (pop == `retry)
+ if (pop == `no)
{
return `abort;
}
- else if (pop == `no)
+ else if (pop == `retry)
{
y2debug("skipping media");
return `skip;
@@ -115,12 +115,19 @@
}
+ // see http://en.opensuse.org/Standards/YaST2_Repository_Metadata/content
boolean code10(map content_file)
{
// ask for an addon only when the product is pre-CODE10
boolean ret = true;
string product_lower = tolower(content_file["PRODUCT"]:"");
+ if (product_lower == "")
+ {
+ // code11
+ product_lower = tolower(content_file["NAME"]:"");
+ }
+
string version_str = content_file["VERSION"]:"";
y2milestone("product: %1", product_lower);
@@ -288,7 +295,8 @@
size(medianames[0]:""));
m = sformat(prompt_string, prompt_for_cd);
}
- msg =sformat("Insert\n%1", m);
+ // popup request, %1 is CD medium name
+ msg =sformat(_("Insert\n%1"), m);
}
}
else
@@ -316,7 +324,8 @@
y2debug("prompt string: %1)", prompt_string);
m = sformat(prompt_string, prompt_for_cd);
}
- msg = sformat("Select %1", m);
+ // popup request, %1 is ISO name
+ msg = sformat(_("Select %1"), m);
}
}
}
@@ -1011,7 +1020,7 @@
if (SCR::Read(.target.size, contentpath) > 0 )
{
- content = (map)SCR::Read(.content_file, contentpath);
+ content = ReadContentFile(contentpath);
}
else
{
@@ -1021,7 +1030,7 @@
if (SCR::Read(.target.size, contentpath) > 0 )
{
- content = (map)SCR::Read(.content_file, contentpath);
+ content = ReadContentFile(contentpath);
}
else
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.17.2/src/routines.ycp new/yast2-instserver-2.17.3/src/routines.ycp
--- old/yast2-instserver-2.17.2/src/routines.ycp 2007-07-19 14:01:58.000000000 +0200
+++ new/yast2-instserver-2.17.3/src/routines.ycp 2008-10-15 16:02:47.000000000 +0200
@@ -4,14 +4,14 @@
* Summary: Dialogs definitions
* Authors: Anas Nashif
*
- * $Id: routines.ycp 26048 2005-11-01 13:39:13Z lslezak $
+ * $Id: routines.ycp 52262 2008-10-15 14:02:47Z lslezak $
*/
{
textdomain "instserver";
-
+import "String";
list<string> ReadMediaFile(string media) {
if (SCR::Read(.target.size, media) != -1 )
@@ -24,10 +24,18 @@
}
}
-map ReadContentFile(string content) {
+map ReadContentFile(string content) {
y2debug("Reading content %1", content);
- map contentmap = (map)SCR::Read(.content_file, content);
+ map contentmap = (map)SCR::Read(.content_file, content);
+
+ contentmap = mapmap(string key, string value, contentmap,
+ {
+ return $[key : String::CutBlanks(value)];
+ }
+ );
+ y2milestone("Read content file %1: %2", content, contentmap);
+
return contentmap;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.17.2/VERSION new/yast2-instserver-2.17.3/VERSION
--- old/yast2-instserver-2.17.2/VERSION 2008-10-14 16:18:22.000000000 +0200
+++ new/yast2-instserver-2.17.3/VERSION 2008-10-15 16:02:00.000000000 +0200
@@ -1 +1 @@
-2.17.2
+2.17.3
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org