Hello community, here is the log from the commit of package yast2-packager checked in at Thu Oct 19 13:31:13 CEST 2006. -------- --- yast2-packager/yast2-packager.changes 2006-10-16 17:30:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2006-10-19 13:11:54.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Oct 19 12:52:52 CEST 2006 - lslezak@suse.cz + +- dirinstall - quote directory name, it can contain spaces + (locilka@suse.cz) (bug #211576) +- 2.13.154 + +------------------------------------------------------------------- Old: ---- yast2-packager-2.13.153.tar.bz2 New: ---- yast2-packager-2.13.154.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.gDyBwQ/_old 2006-10-19 13:30:42.000000000 +0200 +++ /var/tmp/diff_new_pack.gDyBwQ/_new 2006-10-19 13:30:42.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.13.153) +# spec file for package yast2-packager (Version 2.13.154) # # 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-packager -Version: 2.13.153 +Version: 2.13.154 Release: 1 -License: GPL +License: GNU General Public License (GPL) - all versions Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.13.153.tar.bz2 +Source0: yast2-packager-2.13.154.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-slp yast2-testsuite yast2-xml Requires: checkmedia yast2-country @@ -45,7 +45,7 @@ Arvin Schnell <arvin@suse.de> %prep -%setup -n yast2-packager-2.13.153 +%setup -n yast2-packager-2.13.154 %build %{prefix}/bin/y2tool y2autoconf @@ -82,6 +82,10 @@ %doc %{prefix}/share/doc/packages/yast2-packager %changelog -n yast2-packager +* Thu Oct 19 2006 - lslezak@suse.cz +- dirinstall - quote directory name, it can contain spaces + (locilka@suse.cz) (bug #211576) +- 2.13.154 * Mon Oct 16 2006 - lslezak@suse.cz - script callbacks - installation and run-time (feature #100233) - 2.13.153 ++++++ yast2-packager-2.13.153.tar.bz2 -> yast2-packager-2.13.154.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.153/VERSION new/yast2-packager-2.13.154/VERSION --- old/yast2-packager-2.13.153/VERSION 2006-10-16 16:37:54.000000000 +0200 +++ new/yast2-packager-2.13.154/VERSION 2006-10-19 12:43:23.000000000 +0200 @@ -1 +1 @@ -2.13.153 +2.13.154 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.153/configure new/yast2-packager-2.13.154/configure --- old/yast2-packager-2.13.153/configure 2006-10-16 16:55:58.000000000 +0200 +++ new/yast2-packager-2.13.154/configure 2006-10-19 12:55:23.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-packager 2.13.153. +# Generated by GNU Autoconf 2.60 for yast2-packager 2.13.154. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-packager' PACKAGE_TARNAME='yast2-packager' -PACKAGE_VERSION='2.13.153' -PACKAGE_STRING='yast2-packager 2.13.153' +PACKAGE_VERSION='2.13.154' +PACKAGE_STRING='yast2-packager 2.13.154' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1180,7 +1180,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-packager 2.13.153 to adapt to many kinds of systems. +\`configure' configures yast2-packager 2.13.154 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1251,7 +1251,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-packager 2.13.153:";; + short | recursive ) echo "Configuration of yast2-packager 2.13.154:";; esac cat <<\_ACEOF @@ -1329,7 +1329,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-packager configure 2.13.153 +yast2-packager configure 2.13.154 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1343,7 +1343,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-packager $as_me 2.13.153, which was +It was created by yast2-packager $as_me 2.13.154, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2144,7 +2144,7 @@ # Define the identity of the package. PACKAGE='yast2-packager' - VERSION='2.13.153' + VERSION='2.13.154' cat >>confdefs.h <<_ACEOF @@ -2371,7 +2371,7 @@ -VERSION="2.13.153" +VERSION="2.13.154" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak@suse.cz>" @@ -3229,7 +3229,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-packager $as_me 2.13.153, which was +This file was extended by yast2-packager $as_me 2.13.154, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3272,7 +3272,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-packager config.status 2.13.153 +yast2-packager config.status 2.13.154 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.153/configure.in new/yast2-packager-2.13.154/configure.in --- old/yast2-packager-2.13.153/configure.in 2006-10-16 16:55:48.000000000 +0200 +++ new/yast2-packager-2.13.154/configure.in 2006-10-19 12:55:19.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.13.153, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.13.154, http://bugs.opensuse.org/, yast2-packager) 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.153" +VERSION="2.13.154" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak@suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.153/src/clients/inst_dirinstall.ycp new/yast2-packager-2.13.154/src/clients/inst_dirinstall.ycp --- old/yast2-packager-2.13.153/src/clients/inst_dirinstall.ycp 2006-04-27 08:29:36.000000000 +0200 +++ new/yast2-packager-2.13.154/src/clients/inst_dirinstall.ycp 2006-10-19 13:04:49.000000000 +0200 @@ -5,7 +5,7 @@ * * Purpose: Install into directory * - * $Id: inst_dirinstall.ycp 30518 2006-04-27 06:24:33Z lslezak $ + * $Id: inst_dirinstall.ycp 33515 2006-10-19 11:04:46Z lslezak $ */ { @@ -20,15 +20,16 @@ import "PackageCallbacks"; import "Wizard"; import "Progress"; + import "String"; Pkg::TargetFinish (); DirInstall::MountFilesystems (); // create /dev/zero and /dev/null devices in the target directory, // some packages require them in the postinstall script - SCR::Execute(.target.bash, sformat("mkdir -p %1/dev", DirInstall::target)); - SCR::Execute(.target.bash, sformat("mknod -m 666 %1/dev/zero c 1 5", DirInstall::target)); - SCR::Execute(.target.bash, sformat("mknod -m 666 %1/dev/null c 1 3", DirInstall::target)); + SCR::Execute(.target.bash, sformat("mkdir -p '%1/dev'", String::Quote (DirInstall::target))); + SCR::Execute(.target.bash, sformat("mknod -m 666 '%1/dev/zero' c 1 5", String::Quote (DirInstall::target))); + SCR::Execute(.target.bash, sformat("mknod -m 666 '%1/dev/null' c 1 3", String::Quote (DirInstall::target))); /* if(Pkg::TargetInit (Installation::destdir,true) != true) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.153/src/clients/inst_dirinstall_finish.ycp new/yast2-packager-2.13.154/src/clients/inst_dirinstall_finish.ycp --- old/yast2-packager-2.13.153/src/clients/inst_dirinstall_finish.ycp 2006-06-02 08:17:55.000000000 +0200 +++ new/yast2-packager-2.13.154/src/clients/inst_dirinstall_finish.ycp 2006-10-19 13:04:49.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Anas Nashif <nashif@suse.de> * - * $Id: inst_dirinstall_finish.ycp 31191 2006-05-30 14:12:50Z jsrain $ + * $Id: inst_dirinstall_finish.ycp 33515 2006-10-19 11:04:46Z lslezak $ * */ { @@ -23,6 +23,7 @@ import "Timezone"; import "Console"; import "RunlevelEd"; + import "String"; list<string> progress_stages = [ @@ -116,9 +117,9 @@ DirInstall::image_name != "") { Progress::NextStage(); - string cmd = sformat("cd %1 && tar -zcf %2 . && cd - ", - DirInstall::target, - DirInstall::image_dir + "/" + DirInstall::image_name + ".tgz"); + string cmd = sformat("cd '%1' && tar -zcf '%2' . && cd - ", + String::Quote (DirInstall::target), + String::Quote (DirInstall::image_dir + "/" + DirInstall::image_name + ".tgz")); y2debug("cmd: %1", cmd); // progress title Progress::Title(_("Building directory image...")); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.153/src/clients/inst_kickoff.ycp new/yast2-packager-2.13.154/src/clients/inst_kickoff.ycp --- old/yast2-packager-2.13.153/src/clients/inst_kickoff.ycp 2006-05-19 13:54:10.000000000 +0200 +++ new/yast2-packager-2.13.154/src/clients/inst_kickoff.ycp 2006-10-19 11:23:58.000000000 +0200 @@ -25,6 +25,7 @@ import "Arch"; import "FileUtils"; import "ProductFeatures"; + import "String"; void AcpiToInitrd () { if (! (Arch::i386 () || Arch::x86_64 () || Arch::ia64 ())) @@ -47,10 +48,12 @@ string mtab = (string) WFM::Read(.local.string, mtabname); SCR::Write(.target.string, tmpdir + "/mtab", mtab); - SCR::Execute (.target.bash, "/bin/cat " + tmpdir + "/mtab" + SCR::Execute (.target.bash, "/bin/cat " + + "'" + String::Quote (tmpdir + "/mtab") + "'" + " | /bin/sed \"s: " + Installation::destdir + "/: /:\"| /bin/sed \"s: " + Installation::destdir - + ": /:\" > " + Installation::destdir + mtabname); + + ": /:\" " + + "> '" + String::Quote (Installation::destdir) + "'" + mtabname); } @@ -62,7 +65,7 @@ // remove old junk, script is in yast2-update SCR::Execute (.target.bash, Directory::ybindir + "/remove_junk " + - Installation::destdir); + "'" + String::Quote (Installation::destdir) + "'"); // possibly remove /usr/share/info/dir if (!Pkg::TargetFileHasOwner ("/usr/share/info/dir")) @@ -93,8 +96,8 @@ if (Update::remove_old_backups) { - SCR::Execute (.target.bash, "/bin/rm -f " + Installation::destdir + - Update::backup_path + "/*-*-*.tar.{gz,bz2}"); + SCR::Execute (.target.bash, "cd '" + String::Quote (Installation::destdir) + "'; " + + "/bin/rm -f " + Update::backup_path + "/*-*-*.tar.{gz,bz2}"); } if (true) @@ -115,9 +118,8 @@ num = num + 1; } - if (SCR::Execute (.target.bash, "cd " + Installation::destdir + - " ; /bin/tar czf " + Installation::destdir + - filename + " " + "var/log/YaST2") != 0) + if (SCR::Execute (.target.bash, "cd '" + String::Quote (Installation::destdir) + "'; " + + "/bin/tar czf ." + filename + " " + "var/log/YaST2") != 0) { y2error ("backup of %1 to %2 failed", Directory::logdir, filename); // an error popup @@ -126,8 +128,8 @@ } else { - SCR::Execute (.target.bash, "/bin/rm -rf " + Installation::destdir + - "var/log/YaST2/*"); + SCR::Execute (.target.bash, "cd '" + String::Quote (Installation::destdir) + "'; " + + "/bin/rm -rf var/log/YaST2/*"); } } @@ -151,9 +153,8 @@ num = num + 1; } - if (SCR::Execute (.target.bash, "cd " + Installation::destdir + - " ; /bin/tar czf " + Installation::destdir + - filename + " " + "etc/sysconfig") != 0) + if (SCR::Execute (.target.bash, "cd '" + String::Quote (Installation::destdir) + "'; " + + "/bin/tar czf ." + filename + " " + "etc/sysconfig") != 0) { y2error ("backup of %1 to %2 failed", "/etc/sysconfig", filename); // an error popup @@ -178,10 +179,9 @@ num = num + 1; } - if (SCR::Execute (.target.bash, "cd " + Installation::destdir + - " ; /bin/tar czf " + Installation::destdir + - filename + " " + "etc/rc.config" + " " + - "etc/rc.config.d") != 0) + if (SCR::Execute (.target.bash, "cd '" + String::Quote (Installation::destdir) + "'; " + + "/bin/tar czf ." + filename + " " + + "etc/rc.config etc/rc.config.d") != 0) { y2error ("backup of %1 to %2 failed", "/etc/rc.config", filename); // an error popup @@ -204,8 +204,9 @@ // have to handle older version in a special case. string idfile = (string) SCR::Read(.target.tmpdir) + "/idline"; - if (SCR::Execute (.target.bash, "/bin/grep ^id: " + Installation::destdir + - "/etc/inittab >" + idfile) == 0) + if (SCR::Execute (.target.bash, "/bin/grep ^id: " + + "'" + String::Quote (Installation::destdir) + "/etc/inittab" + "'" + + " >" + idfile) == 0) { // idline = "id:X:initdefault:" @@ -255,7 +256,9 @@ } // get the current raid configuration - map out = (map) SCR::Execute (.target.bash_output, "chroot " + Installation::destdir + " mdadm -Ds"); + map out = (map) SCR::Execute (.target.bash_output, + "chroot '" + String::Quote (Installation::destdir) + "' " + + "mdadm -Ds"); if (out["exit"]:-1 != 0) { y2error ("Error occurred while getting raid configuration: %1", out); return; @@ -318,16 +321,18 @@ { string template_dir= "/var/adm/fillup-templates"; // hack 'pre-req' cyclic dependency between bash, aaa_base, and perl - SCR::Execute(.target.bash, "/bin/cp " + template_dir + "/passwd.aaa_base " - + Installation::destdir + "/etc/passwd"); - SCR::Execute(.target.bash, "/bin/cp " + template_dir + "/group.aaa_base " - + Installation::destdir + "/etc/group"); - SCR::Execute(.target.bash, "/bin/cp " + template_dir + "/shadow.aaa_base " - + Installation::destdir + "/etc/shadow"); + SCR::Execute(.target.bash, "/bin/cp " + template_dir + "/passwd.aaa_base " + + "'" + String::Quote (Installation::destdir) + "/etc/passwd" + "'"); + SCR::Execute(.target.bash, "/bin/cp " + template_dir + "/group.aaa_base " + + "'" + String::Quote (Installation::destdir) + "/etc/group" + "'"); + SCR::Execute(.target.bash, "/bin/cp " + template_dir + "/shadow.aaa_base " + + "'" + String::Quote (Installation::destdir) + "/etc/shadow" + "'"); } else { - SCR::Execute(.target.bash, "/bin/cp /etc/passwd " + Installation::destdir + "/etc"); - SCR::Execute(.target.bash, "/bin/cp /etc/group " + Installation::destdir + "/etc"); + SCR::Execute(.target.bash, "/bin/cp /etc/passwd " + + "'" + String::Quote (Installation::destdir) + "/etc" + "'"); + SCR::Execute(.target.bash, "/bin/cp /etc/group " + + "'" + String::Quote (Installation::destdir) + "/etc" + "'"); } // fake mtab @@ -368,7 +373,7 @@ // check passwd and group of target SCR::Execute (.target.bash, "/usr/lib/YaST2/bin/update_users_groups " + - Installation::destdir); + "'" + String::Quote (Installation::destdir) + "'"); // update inittab update_inittab (); @@ -397,9 +402,9 @@ { ProductFeatures::Save(); WFM::Execute (.local.bash, sformat ( - "/bin/mkdir -p %1/etc/YaST2", Installation::destdir)); + "/bin/mkdir -p '%1/etc/YaST2'", String::Quote (Installation::destdir))); WFM::Execute (.local.bash, sformat ( - "/bin/cp %1 %2/%1", "/etc/YaST2/ProductFeatures", Installation::destdir)); + "/bin/cp '%1' '%2/%1'", "/etc/YaST2/ProductFeatures", String::Quote (Installation::destdir))); } return `next; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.153/src/clients/inst_rpmcopy.ycp new/yast2-packager-2.13.154/src/clients/inst_rpmcopy.ycp --- old/yast2-packager-2.13.153/src/clients/inst_rpmcopy.ycp 2006-10-13 11:12:08.000000000 +0200 +++ new/yast2-packager-2.13.154/src/clients/inst_rpmcopy.ycp 2006-10-19 13:04:49.000000000 +0200 @@ -13,7 +13,7 @@ * Packages module : * "installed" * - * $Id: inst_rpmcopy.ycp 33383 2006-10-13 09:12:02Z lslezak $ + * $Id: inst_rpmcopy.ycp 33515 2006-10-19 11:04:46Z lslezak $ */ { @@ -36,6 +36,7 @@ import "Service"; import "SourceManager"; import "Linuxrc"; + import "String"; // variables related to installation source caching @@ -93,6 +94,7 @@ { map<string,string> product_data = (map<string,string>)Pkg::SourceProduct (id); y2milestone ("Id %1: SourceProduct %2", id, product_data); + // FIXME: find() if (find (product_data["flags"]:"", "cache") >= 0) { cached_id = id; @@ -271,7 +273,7 @@ } map ta_out = (map)SCR::Execute (.target.bash_output, - sformat ("mkdir -p %1", Installation::destdir + cache_dir)); + sformat ("mkdir -p '%1'", String::Quote (Installation::destdir + cache_dir))); y2milestone ("Created cached dir '%1': %2", Installation::destdir+cache_dir, ta_out); if (ta_out["exit"]:0 != 0) { @@ -285,7 +287,7 @@ string tmp_dir = cache_dir; ta_out = (map)SCR::Execute (.target.bash_output, - sformat ("mktemp -d -p %1", Installation::destdir + cache_dir)); + sformat ("mktemp -d -p '%1'", String::Quote (Installation::destdir + cache_dir))); y2milestone ("Created temp dir %1: %2", Installation::destdir+cache_dir, ta_out); if (ta_out["exit"]:0 != 0) { @@ -302,16 +304,16 @@ ta_out = (map)SCR::Execute (.target.bash_output, // first line is in target system // the second one in installation system - sformat ("rm -rf %3%1/%4; ln -s %3%2 %3%1/%4; - rm -rf %1/%4; ln -s %3%2 %1/%4;", + sformat ("rm -rf '%3%1/%4'; ln -s '%3%2' '%3%1/%4'; + rm -rf '%1/%4'; ln -s '%3%2' '%1/%4';", tmp_dir, substring (cache_dir, size (Installation::destdir)), - Installation::destdir, cached_source_datadir)); - y2milestone ("rm -rf %3%1/%4; ln -s %3%2 %3%1/%4; - rm -rf %1/%4; ln -s %3%2 %1/%4;", + String::Quote (Installation::destdir), cached_source_datadir)); + y2milestone ("rm -rf '%3%1/%4'; ln -s '%3%2' '%3%1/%4'; + rm -rf '%1/%4'; ln -s '%3%2' '%1/%4';", tmp_dir, substring (cache_dir, size (Installation::destdir)), - Installation::destdir, cached_source_datadir); + String::Quote (Installation::destdir), cached_source_datadir); y2milestone ("Result %1", ta_out); if (ta_out["exit"]:0 != 0) { @@ -588,6 +590,7 @@ Pkg::SourceMoveDownloadArea (download_dir); } + // FIXME: find() if (find (Kernel::GetCmdLine (), "yastnocache") != -1) { y2milestone ("'yastnocache' found, disabling source cache"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.153/src/clients/pkg_finish.ycp new/yast2-packager-2.13.154/src/clients/pkg_finish.ycp --- old/yast2-packager-2.13.153/src/clients/pkg_finish.ycp 2006-03-29 14:28:02.000000000 +0200 +++ new/yast2-packager-2.13.154/src/clients/pkg_finish.ycp 2006-10-19 13:04:49.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Jiri Srain <jsrain@suse.cz> * - * $Id: pkg_finish.ycp 29493 2006-03-29 07:09:43Z locilka $ + * $Id: pkg_finish.ycp 33515 2006-10-19 11:04:46Z lslezak $ * */ @@ -17,6 +17,7 @@ textdomain "packager"; import "Installation"; +import "String"; any ret = nil; string func = ""; @@ -52,9 +53,9 @@ // copy list of failed packages to installed system WFM::Execute (.local.bash, sformat ( - "test -f %1 && /bin/cp -a %1 %2%1", + "test -f %1 && /bin/cp -a %1 '%2%1'", "/var/lib/YaST2/failed_packages", - Installation::destdir)); + String::Quote (Installation::destdir))); } else { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.153/src/modules/DirInstall.ycp new/yast2-packager-2.13.154/src/modules/DirInstall.ycp --- old/yast2-packager-2.13.153/src/modules/DirInstall.ycp 2006-04-18 15:17:32.000000000 +0200 +++ new/yast2-packager-2.13.154/src/modules/DirInstall.ycp 2006-10-19 13:04:49.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Instalation into a Directory settings, input and output functions * Authors: Anas Nashif <nashif@suse.de> * - * $Id: DirInstall.ycp 30174 2006-04-18 13:13:12Z lslezak $ + * $Id: DirInstall.ycp 33515 2006-10-19 11:04:46Z lslezak $ * */ { @@ -14,7 +14,7 @@ import "Stage"; import "HTML"; import "ProductControl"; - +import "String"; global boolean runme_at_boot = false; global string target = "/var/tmp/dirinstall"; @@ -83,9 +83,9 @@ string dev = descr[1]:""; string type = descr[2]:""; mp = target + mp; - WFM::Execute (.local.bash, sformat ("test -d %1 || mkdir -p %1", mp)); - WFM::Execute (.local.bash, sformat ("/bin/mount -t %1 %2 %3", - type, dev, mp)); + WFM::Execute (.local.bash, sformat ("test -d '%1' || mkdir -p '%1'", String::Quote (mp))); + WFM::Execute (.local.bash, sformat ("/bin/mount -t %1 %2 '%3'", + type, dev, String::Quote (mp))); mounted_fs = add (mounted_fs, mp); }); y2milestone ("Mounted filesystems: %1", mounted_fs); @@ -94,7 +94,7 @@ global void UmountFilesystems () { y2milestone ("Mounted filesystems: %1", mounted_fs); foreach (string mp, mounted_fs, { - WFM::Execute (.local.bash, sformat ("/bin/umount %1", mp)); + WFM::Execute (.local.bash, sformat ("/bin/umount '%1'", String::Quote (mp))); }); mounted_fs = []; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.153/src/modules/PackageCallbacks.ycp new/yast2-packager-2.13.154/src/modules/PackageCallbacks.ycp --- old/yast2-packager-2.13.153/src/modules/PackageCallbacks.ycp 2006-10-16 17:21:50.000000000 +0200 +++ new/yast2-packager-2.13.154/src/modules/PackageCallbacks.ycp 2006-10-19 11:23:58.000000000 +0200 @@ -366,8 +366,8 @@ if (error != 0) { string infopath = (string) SCR::Read (.target.tmpdir) + "/rpmlog"; - SCR::Execute (.target.bash, "/usr/bin/tail " + Installation::destdir - + Directory::logdir + "/y2logRPM > " + infopath); + SCR::Execute (.target.bash, "/usr/bin/tail '" + String::Quote (Installation::destdir) + + Directory::logdir + "/y2logRPM' > " + infopath); string info = reason + "\n---\n" + (string) SCR::Read (.target.string, [infopath, "-?-"]); string message = sformat ( _deleting_package ? ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org