Hello community,
here is the log from the commit of package yast2-installation
checked in at Fri Aug 24 00:07:21 CEST 2007.
--------
--- yast2-installation/yast2-installation.changes 2007-08-15 17:29:27.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2007-08-22 11:00:52.000000000 +0200
@@ -1,0 +2,11 @@
+Tue Aug 21 16:10:16 CEST 2007 - locilka@suse.cz
+
+- Fixed evaluating of "enabled" tag in map of repositories in
+ inst_upgrade_urls (#300901).
+- Added ssh_host_dsa_key ssh_host_dsa_key.pub ssh_host_rsa_key
+ ssh_host_rsa_key.pub to be optionally copied as well as the SSH1
+ keys (#298798).
+- Allowing to abort the "System Probing" dialog (#298049).
+- 2.15.43
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.15.42.tar.bz2
New:
----
yast2-installation-2.15.43.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.S31947/_old 2007-08-24 00:05:36.000000000 +0200
+++ /var/tmp/diff_new_pack.S31947/_new 2007-08-24 00:05:36.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.15.42)
+# spec file for package yast2-installation (Version 2.15.43)
#
# Copyright (c) 2007 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.15.42
-Release: 6
+Version: 2.15.43
+Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.15.42.tar.bz2
+Source0: yast2-installation-2.15.43.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-country yast2-devtools yast2-testsuite
# Mode::live_installation
@@ -63,12 +63,12 @@
BuildArchitectures: noarch
Summary: YaST2 - Installation Parts
%package devel-doc
-Version: 2.15.42
-Release: 6
+Version: 2.15.43
+Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.15.42.tar.bz2
+Source0: yast2-installation-2.15.43.tar.bz2
prefix: /usr
Requires: yast2-installation >= 2.15.34
PreReq: %fillup_prereq
@@ -102,7 +102,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-installation-2.15.42
+%setup -n yast2-installation-2.15.43
%build
%{prefix}/bin/y2tool y2autoconf
@@ -176,6 +176,14 @@
%exclude %{prefix}/share/doc/packages/yast2-installation/README
%changelog
+* Tue Aug 21 2007 - locilka@suse.cz
+- Fixed evaluating of "enabled" tag in map of repositories in
+ inst_upgrade_urls (#300901).
+- Added ssh_host_dsa_key ssh_host_dsa_key.pub ssh_host_rsa_key
+ ssh_host_rsa_key.pub to be optionally copied as well as the SSH1
+ keys (#298798).
+- Allowing to abort the "System Probing" dialog (#298049).
+- 2.15.43
* Wed Aug 15 2007 - mzugec@suse.cz
- mark string for translation (#300268)
* Fri Aug 10 2007 - locilka@suse.cz
++++++ yast2-installation-2.15.42.tar.bz2 -> yast2-installation-2.15.43.tar.bz2 ++++++
++++ 10419 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-installation-2.15.42/configure.in new/yast2-installation-2.15.43/configure.in
--- old/yast2-installation-2.15.42/configure.in 2007-08-15 17:17:53.000000000 +0200
+++ new/yast2-installation-2.15.43/configure.in 2007-07-25 13:51:08.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-installation
dnl
-dnl -- This file is generated by y2autoconf 2.15.2 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.15.42, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.15.35, http://bugs.opensuse.org/, 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.15.42"
+VERSION="2.15.35"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
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-installation-2.15.42/control/docs/control-doc.xml new/yast2-installation-2.15.43/control/docs/control-doc.xml
--- old/yast2-installation-2.15.42/control/docs/control-doc.xml 2007-08-10 17:24:09.000000000 +0200
+++ new/yast2-installation-2.15.43/control/docs/control-doc.xml 2007-05-18 10:44:02.000000000 +0200
@@ -28,7 +28,7 @@
0.1
</revnumber>
<date>
- $Date: 2004-10-27 16:25:24 +0200 (St, 27 okt 2004) $
+ $Date: 2004-10-27 16:25:24 +0200 (Wed, 27 Oct 2004) $
</date>
<revremark>Initial Release as PDF</revremark>
</revision>
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-installation-2.15.42/missing new/yast2-installation-2.15.43/missing
--- old/yast2-installation-2.15.42/missing 2007-08-15 17:18:06.000000000 +0200
+++ new/yast2-installation-2.15.43/missing 2007-07-25 13:51:14.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2005-06-08.21
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,8 +33,6 @@
fi
run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -46,7 +44,7 @@
msg="missing on your system"
-case $1 in
+case "$1" in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -79,7 +77,6 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -109,7 +106,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case $1 in
+case "$1" in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -138,7 +135,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case "$1" in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -167,7 +164,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case $f in
+ case "$f" in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -195,8 +192,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+ test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
if test -f "$file"; then
touch $file
else
@@ -217,25 +214,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
+ if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
- case $LASTARG in
+ case "$LASTARG" in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if test ! -f y.tab.h; then
+ if [ ! -f y.tab.h ]; then
echo >y.tab.h
fi
- if test ! -f y.tab.c; then
+ if [ ! -f y.tab.c ]; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -247,18 +244,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if test $# -ne 1; then
+ if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
- case $LASTARG in
+ case "$LASTARG" in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if test ! -f lex.yy.c; then
+ if [ ! -f lex.yy.c ]; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -270,9 +267,11 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ if test -z "$file"; then
+ file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+ fi
+ if [ -f "$file" ]; then
touch $file
else
test -z "$file" || exec >$file
@@ -290,17 +289,11 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '
- /^@setfilename/{
- s/.* \([^ ]*\) *$/\1/
- p
- q
- }' $infile`
+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -324,13 +317,13 @@
fi
firstarg="$1"
if shift; then
- case $firstarg in
+ case "$firstarg" in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case $firstarg in
+ case "$firstarg" in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
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-installation-2.15.42/src/clients/inst_pre_install.ycp new/yast2-installation-2.15.43/src/clients/inst_pre_install.ycp
--- old/yast2-installation-2.15.42/src/clients/inst_pre_install.ycp 2007-08-10 17:24:11.000000000 +0200
+++ new/yast2-installation-2.15.43/src/clients/inst_pre_install.ycp 2007-08-21 16:48:40.000000000 +0200
@@ -10,7 +10,7 @@
define map > FindTheBestFiles (map > files_found);
- define void FindAndCopyNewestFiles (string copy_to, list <string> wanted_files);
+ define void FindAndCopyNewestFiles (string copy_to, list <string> wanted_files, list <string> optional_files);
// --> Variables
@@ -25,12 +25,19 @@
Initialize();
// FATE #300421: Import ssh keys from previous installations
- FindAndCopyNewestFiles("/", ["/etc/ssh/ssh_host_key", "/etc/ssh/ssh_host_key.pub"]);
+ FindAndCopyNewestFiles (
+ "/",
+ // required
+ ["/etc/ssh/ssh_host_key", "/etc/ssh/ssh_host_key.pub"],
+ // optional
+ ["/etc/ssh/ssh_host_dsa_key", "/etc/ssh/ssh_host_dsa_key.pub", "/etc/ssh/ssh_host_rsa_key", "/etc/ssh/ssh_host_rsa_key.pub"]
+ );
// FATE #120103: Import Users From Existing Partition
- FindAndCopyNewestFiles(
+ FindAndCopyNewestFiles (
sformat ("%1/imported/userdata", Directory::vardir),
- ["/etc/shadow", "/etc/passwd", "/etc/login.defs", "/etc/group"]
+ ["/etc/shadow", "/etc/passwd", "/etc/login.defs", "/etc/group"],
+ []
);
// free the memory
@@ -84,7 +91,7 @@
return ret;
}
- define void FindAndCopyNewestFiles (string copy_to, list <string> wanted_files) {
+ define void FindAndCopyNewestFiles (string copy_to, list <string> wanted_files, list <string> optional_files) {
y2milestone("Searching for files: %1", wanted_files);
string mnt_tmpdir = Directory::tmpdir + "/tmp_mnt_for_check";
@@ -175,7 +182,10 @@
foreach (string partition, map files, ic_winner, {
SystemFilesCopy::CopyFilesToTemp (
partition,
- maplist (string filename, integer filetime, files, { return filename; }),
+ (list <string>) union (
+ maplist (string filename, integer filetime, files, { return filename; }),
+ optional_files
+ ),
copy_to
);
});
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-installation-2.15.42/src/clients/inst_system_analysis.ycp new/yast2-installation-2.15.43/src/clients/inst_system_analysis.ycp
--- old/yast2-installation-2.15.42/src/clients/inst_system_analysis.ycp 2007-08-10 17:24:11.000000000 +0200
+++ new/yast2-installation-2.15.43/src/clients/inst_system_analysis.ycp 2007-08-22 11:00:59.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain
* Lukas Ocilka
*
- * $Id: inst_system_analysis.ycp 40153 2007-08-10 09:21:30Z locilka $
+ * $Id: inst_system_analysis.ycp 40392 2007-08-22 09:00:59Z locilka $
*
*/
@@ -422,6 +422,19 @@
foreach (any run_function, actions_functions, {
Progress::NextStage();
+ // Bugzilla #298049
+ // Allow to abort the probing
+ any ui_ret = UI::PollInput();
+
+ if (ui_ret == `abort) {
+ y2milestone ("Abort pressed");
+
+ if (Popup::ConfirmAbort (`painless)) {
+ y2warning ("User decided to abort the installation");
+ return `abort;
+ }
+ }
+
y2milestone ("Running function: %1", run_function);
boolean () run_this = (boolean()) (run_function);
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-installation-2.15.42/src/clients/inst_upgrade_urls.ycp new/yast2-installation-2.15.43/src/clients/inst_upgrade_urls.ycp
--- old/yast2-installation-2.15.42/src/clients/inst_upgrade_urls.ycp 2007-08-10 17:24:11.000000000 +0200
+++ new/yast2-installation-2.15.43/src/clients/inst_upgrade_urls.ycp 2007-08-21 16:09:41.000000000 +0200
@@ -59,9 +59,19 @@
map xmlcontent = (map) SCR::Read (.anyxml, one_source_file);
counter = counter + 1;
+
+ // bugzilla #300901
+ boolean enabled = nil;
+
+ if (is (xmlcontent["source","enabled","value"]:nil, boolean)) {
+ enabled = xmlcontent["source","enabled","value"]:false;
+ } else if (is (xmlcontent["source","enabled","value"]:nil, string)) {
+ enabled = (xmlcontent["source","enabled","value"]:"false" == "true");
+ }
+
map one_old_url = $[
"url" : xmlcontent["source","url","value"]:nil,
- "enabled" : xmlcontent["source","enabled","value"]:false,
+ "enabled" : enabled,
"name" : xmlcontent["source","alias","value"]:nil,
];
@@ -252,10 +262,22 @@
// If some new (since 10.3 Alpha?) URLs found, use only them
if (new_urls != nil && new_urls != []) {
foreach (map one_url_map, new_urls, {
+
+ // bugzilla #300901
+ boolean enabled = nil;
+
+ if (is (one_url_map["enabled"]:0, integer)) {
+ enabled = (one_url_map["enabled"]:0 == 1);
+ } else if (is (one_url_map["enabled"]:"0", string)) {
+ enabled = (one_url_map["enabled"]:"0" == "1");
+ } else if (is (one_url_map["enabled"]:false, boolean)) {
+ enabled = one_url_map["enabled"]:false;
+ }
+
urls = add (urls, $[
"url" : one_url_map["baseurl"]:nil,
"name" : (one_url_map["name"]:"" == "" ? one_url_map["id"]:"" : one_url_map["name"]:""),
- "enabled" : one_url_map["enabled"]:false,
+ "enabled" : enabled,
]);
});
// Fallback, old URLs found
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-installation-2.15.42/src/modules/SystemFilesCopy.ycp new/yast2-installation-2.15.43/src/modules/SystemFilesCopy.ycp
--- old/yast2-installation-2.15.42/src/modules/SystemFilesCopy.ycp 2007-08-10 17:24:11.000000000 +0200
+++ new/yast2-installation-2.15.43/src/modules/SystemFilesCopy.ycp 2007-08-21 16:46:39.000000000 +0200
@@ -155,7 +155,8 @@
// archive files were already quoted
string command = sformat (
- "cd '%1'; tar -zcvf '%2' %3",
+ // 'ignore failed read' is for optional files
+ "cd '%1'; tar -zcvf --ignore-failed-read '%2' %3",
tmp_mount_directory, String::Quote(archive_name), archive_files
);
map cmd_run = (map) SCR::Execute(.target.bash_output, command);
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-installation-2.15.42/VERSION new/yast2-installation-2.15.43/VERSION
--- old/yast2-installation-2.15.42/VERSION 2007-08-10 17:24:12.000000000 +0200
+++ new/yast2-installation-2.15.43/VERSION 2007-08-21 16:18:11.000000000 +0200
@@ -1 +1 @@
-2.15.42
+2.15.43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org