Hello community,
here is the log from the commit of package yast2-installation
checked in at Thu Oct 12 17:08:05 CEST 2006.
--------
--- yast2-installation/yast2-installation.changes 2006-10-09 16:53:01.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2006-10-12 16:33:25.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Oct 12 16:28:07 CEST 2006 - locilka@suse.cz
+
+- Handle Installation::destdir in *.bash properly (#211576).
+- 2.14.1
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.14.0.tar.bz2
New:
----
yast2-installation-2.14.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.KKpyHV/_old 2006-10-12 17:07:21.000000000 +0200
+++ /var/tmp/diff_new_pack.KKpyHV/_new 2006-10-12 17:07:21.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.14.0)
+# spec file for package yast2-installation (Version 2.14.1)
#
# 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.14.0
+Version: 2.14.1
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.14.0.tar.bz2
+Source0: yast2-installation-2.14.1.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-core-devel yast2-country yast2-devtools yast2-testsuite
Requires: yast2-slp yast2-firewall
@@ -68,7 +68,7 @@
Jiri Srain
%prep
-%setup -n yast2-installation-2.14.0
+%setup -n yast2-installation-2.14.1
%build
%{prefix}/bin/y2tool y2autoconf
@@ -131,6 +131,9 @@
%endif
%changelog -n yast2-installation
+* Thu Oct 12 2006 - locilka@suse.cz
+- Handle Installation::destdir in *.bash properly (#211576).
+- 2.14.1
* Mon Oct 09 2006 - locilka@suse.cz
- Merged SLES10 SP1 branch to openSUSE 10.2.
- 2.14.0
++++++ yast2-installation-2.14.0.tar.bz2 -> yast2-installation-2.14.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.0/VERSION new/yast2-installation-2.14.1/VERSION
--- old/yast2-installation-2.14.0/VERSION 2006-10-09 16:52:06.000000000 +0200
+++ new/yast2-installation-2.14.1/VERSION 2006-10-12 16:31:27.000000000 +0200
@@ -1 +1 @@
-2.14.0
+2.14.1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.0/configure new/yast2-installation-2.14.1/configure
--- old/yast2-installation-2.14.0/configure 2006-10-09 16:53:36.000000000 +0200
+++ new/yast2-installation-2.14.1/configure 2006-10-12 16:53:41.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.14.0.
+# Generated by GNU Autoconf 2.59 for yast2-installation 2.14.1.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-installation'
PACKAGE_TARNAME='yast2-installation'
-PACKAGE_VERSION='2.14.0'
-PACKAGE_STRING='yast2-installation 2.14.0'
+PACKAGE_VERSION='2.14.1'
+PACKAGE_STRING='yast2-installation 2.14.1'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
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.14.0 to adapt to many kinds of systems.
+\`configure' configures yast2-installation 2.14.1 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.14.0:";;
+ short | recursive ) echo "Configuration of yast2-installation 2.14.1:";;
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.14.0
+yast2-installation configure 2.14.1
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.14.0, which was
+It was created by yast2-installation $as_me 2.14.1, 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.14.0'
+ VERSION='2.14.1'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.14.0"
+VERSION="2.14.1"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
@@ -2933,7 +2933,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-installation $as_me 2.14.0, which was
+This file was extended by yast2-installation $as_me 2.14.1, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2988,7 +2988,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-installation config.status 2.14.0
+yast2-installation config.status 2.14.1
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.14.0/configure.in new/yast2-installation-2.14.1/configure.in
--- old/yast2-installation-2.14.0/configure.in 2006-10-09 16:53:31.000000000 +0200
+++ new/yast2-installation-2.14.1/configure.in 2006-10-12 16:53:35.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.14.0, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.14.1, 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.14.0"
+VERSION="2.14.1"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.0/src/clients/copy_files_finish.ycp new/yast2-installation-2.14.1/src/clients/copy_files_finish.ycp
--- old/yast2-installation-2.14.0/src/clients/copy_files_finish.ycp 2006-10-09 13:28:35.000000000 +0200
+++ new/yast2-installation-2.14.1/src/clients/copy_files_finish.ycp 2006-10-12 16:45:27.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain
*
- * $Id: copy_files_finish.ycp 33271 2006-10-09 11:28:31Z locilka $
+ * $Id: copy_files_finish.ycp 33360 2006-10-12 14:45:22Z locilka $
*
*/
@@ -22,6 +22,7 @@
import "Directory";
import "ProductControl";
import "FileUtils";
+import "String";
any ret = nil;
string func = "";
@@ -50,12 +51,14 @@
else if (func == "Write")
{
// copy hardware status to installed system
- SCR::Execute (.target.bash,"/bin/cp -a /var/lib/hardware " + Installation::destdir + "/var/lib");
+ SCR::Execute (.target.bash,"/bin/cp -a '/var/lib/hardware' " +
+ "'" + String::Quote (Installation::destdir) + "/var/lib'");
// if VNC, copy setup data
if (Linuxrc::vnc ())
{
- WFM::Execute (.local.bash, "/bin/cp -a /root/.vnc " + Installation::destdir + "/root");
+ WFM::Execute (.local.bash, "/bin/cp -a '/root/.vnc' " +
+ "'" + String::Quote (Installation::destdir) + "/root'");
}
@@ -66,23 +69,24 @@
// Copy control.xml so it can be read once again during continue mode
SCR::Execute (.target.bash, "/bin/cp " + ProductControl::current_control_file + " " +
- Installation::destdir + Directory::etcdir + "/control.xml");
+ "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control.xml'");
SCR::Execute (.target.bash, "/bin/chmod 0644 " +
- Installation::destdir + Directory::etcdir + "/control.xml");
+ "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control.xml'");
// Copy also control files of add-on products
string cf_dir = (string)SCR::Read (.target.tmpdir) + "/control_files";
if (size (AddOnProduct::control_files_to_add) > 0)
{
- SCR::Execute (.target.bash, "/bin/mkdir " + Installation::destdir + Directory::etcdir + "/control_files");
+ SCR::Execute (.target.bash, "/bin/mkdir '" +
+ String::Quote (Installation::destdir) + Directory::etcdir + "/control_files'");
foreach (string file, AddOnProduct::control_files_to_add, {
- SCR::Execute (.target.bash, "/bin/cp " + cf_dir + "/" + file + " "
- + Installation::destdir + Directory::etcdir + "/control_files");
+ SCR::Execute (.target.bash, "/bin/cp " + cf_dir + "/" + file + " " +
+ "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control_files'");
SCR::Execute (.target.bash, "/bin/chmod 0644 " +
- Installation::destdir + Directory::etcdir + "/control_files/" + file);
+ "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control_files/" + file + "'");
});
SCR::Write (.target.ycp, Installation::destdir + Directory::etcdir + "/control_files/order.ycp", AddOnProduct::control_files_to_add);
SCR::Execute (.target.bash, "/bin/chmod 0644 " +
- Installation::destdir + Directory::etcdir + "/control_files/order.ycp");
+ "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control_files/order.ycp'");
}
// Remove old eula.txt
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.0/src/clients/inst_extrasources.ycp new/yast2-installation-2.14.1/src/clients/inst_extrasources.ycp
--- old/yast2-installation-2.14.0/src/clients/inst_extrasources.ycp 2006-10-02 17:05:02.000000000 +0200
+++ new/yast2-installation-2.14.1/src/clients/inst_extrasources.ycp 2006-10-12 16:31:33.000000000 +0200
@@ -145,6 +145,10 @@
break;
// ping anything (www.suse.com) to trigger dod connections
+ //
+ // This ping should only set the network up,
+ // The IP now is different to the current www.suse.com's IP
+ // but it doesn't matter, what we need is just a network traffic.
SCR::Execute (.target.bash_background,
"/bin/ping -c 1 -w 1 213.95.15.200");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.0/src/clients/installation_worker.ycp new/yast2-installation-2.14.1/src/clients/installation_worker.ycp
--- old/yast2-installation-2.14.0/src/clients/installation_worker.ycp 2006-10-02 17:07:07.000000000 +0200
+++ new/yast2-installation-2.14.1/src/clients/installation_worker.ycp 2006-10-10 12:45:51.000000000 +0200
@@ -78,8 +78,6 @@
if (Stage::initial ())
{
- Pkg::InstSysMode();
-
Installation::encoding = Console::SelectFont( Language::language );
if (UI::GetDisplayInfo()["HasFullUtf8Support"]:true)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.0/src/clients/network_finish.ycp new/yast2-installation-2.14.1/src/clients/network_finish.ycp
--- old/yast2-installation-2.14.0/src/clients/network_finish.ycp 2006-07-18 11:27:46.000000000 +0200
+++ new/yast2-installation-2.14.1/src/clients/network_finish.ycp 2006-10-12 16:45:27.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain
*
- * $Id: network_finish.ycp 31881 2006-07-16 07:08:51Z olh $
+ * $Id: network_finish.ycp 33360 2006-10-12 14:45:22Z locilka $
*
*/
@@ -20,6 +20,7 @@
import "ModulesConf";
import "Arch";
import "Linuxrc";
+import "String";
any ret = nil;
string func = "";
@@ -51,15 +52,15 @@
{
y2milestone("Creating network interface");
WFM::Execute (.local.bash,
- "/sbin/create_interface " + Installation::destdir);
+ "/sbin/create_interface '" + String::Quote (Installation::destdir) + "'");
ModulesConf::RunDepmod (false);
}
// --------------------------------------------------------------
// Copy DHCP client cache so that we can request the same IP (#43974).
WFM::Execute (.local.bash, sformat (
- "mkdir -p %2%1; /bin/cp -p %1/dhcpcd-*.cache %2%1",
+ "mkdir -p '%2%1'; /bin/cp -p %1/dhcpcd-*.cache '%2%1'",
"/var/lib/dhcpcd",
- Installation::destdir));
+ String::Quote (Installation::destdir)));
}
else
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.0/src/clients/x11_finish.ycp new/yast2-installation-2.14.1/src/clients/x11_finish.ycp
--- old/yast2-installation-2.14.0/src/clients/x11_finish.ycp 2006-09-22 14:28:40.000000000 +0200
+++ new/yast2-installation-2.14.1/src/clients/x11_finish.ycp 2006-10-12 16:45:27.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain
*
- * $Id: x11_finish.ycp 33057 2006-09-22 12:26:17Z lslezak $
+ * $Id: x11_finish.ycp 33360 2006-10-12 14:45:22Z locilka $
*
*/
@@ -19,6 +19,7 @@
import "X11Version";
import "Mode";
import "Installation";
+import "String";
include "installation/misc.ycp";
@@ -79,8 +80,8 @@
"echo -e '\n#3x' >> " + filename
);
SCR::Execute (.target.bash,"/bin/ln -sf " +
- Installation::destdir + "/usr/X11R6/bin/XFree86 " +
- Installation::destdir + "/var/X11R6/bin/X"
+ "'" + String::Quote (Installation::destdir) + "/usr/X11R6/bin/XFree86' " +
+ "'" + String::Quote (Installation::destdir) + "/var/X11R6/bin/X'"
);
y2milestone ("Update: Include X11 config [3.x] to installed system");
y2milestone ("Update: X11 config [3.x] prepared for migration to [4.x]");
@@ -98,7 +99,7 @@
y2milestone ("Include X11 config [instsys] to installed system: xorg.conf");
string filename = "/etc/X11/xorg.conf";
WFM::Execute (.local.bash, "/bin/cp " + filename + " " +
- Installation::destdir + "/etc/X11/xorg.conf"
+ "'" + String::Quote (Installation::destdir) + "/etc/X11/xorg.conf'"
);
}
}
@@ -112,7 +113,7 @@
y2milestone ("Include X11 config [instsys] to installed system: xorg.conf.install");
string filename = "/etc/X11/xorg.conf";
WFM::Execute (.local.bash, "/bin/cp " + filename + " " +
- Installation::destdir + "/etc/X11/xorg.conf" + ".install"
+ "'" + String::Quote (Installation::destdir) + "/etc/X11/xorg.conf" + ".install'"
);
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.0/src/modules/Vendor.ycp new/yast2-installation-2.14.1/src/modules/Vendor.ycp
--- old/yast2-installation-2.14.0/src/modules/Vendor.ycp 2006-06-26 09:10:57.000000000 +0200
+++ new/yast2-installation-2.14.1/src/modules/Vendor.ycp 2006-10-12 16:45:27.000000000 +0200
@@ -8,7 +8,7 @@
* Summary:
* provide vendor/driver update disk functions
*
- * $Id: Vendor.ycp 22825 2005-03-29 09:31:42Z jsrain $
+ * $Id: Vendor.ycp 33360 2006-10-12 14:45:22Z locilka $
*
* Author:
* Klaus Kaempf
@@ -19,6 +19,7 @@
import "Installation";
import "Directory";
+ import "String";
// --------------------------------------------------------------
// driver update ?!
@@ -39,10 +40,12 @@
SCR::Execute(.target.bash, "/bin/rm -rf /tmp/update");
// copy log file
- WFM::Execute(.local.bash, "l=/var/log/driverupdate.log ; [ -f $l ] && /bin/cat $l >>" + Installation::destdir + "$l");
+ WFM::Execute(.local.bash, "l=/var/log/driverupdate.log ; [ -f $l ] && /bin/cat $l " +
+ ">> '" + String::Quote (Installation::destdir) + "$l'");
// copy all update files
- WFM::Execute(.local.bash, "/bin/cp -a /update " + Installation::destdir + "/tmp/update");
+ WFM::Execute(.local.bash, "/bin/cp -a /update " +
+ "'" + String::Quote (Installation::destdir) + "/tmp/update'");
// unpack update files and run update.post scripts
SCR::Execute(.target.bash,
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org