Author: locilka
Date: Thu Jan 29 19:36:15 2009
New Revision: 55155
URL: http://svn.opensuse.org/viewcvs/yast?rev=55155&view=rev
Log:
- Fixed displaying i18n characters in summary (bnc #460674).
- Save summary to file - huge speedup (bnc #460674).
- 2.18.0
Modified:
trunk/restore/VERSION
trunk/restore/package/yast2-restore.changes
trunk/restore/src/Restore.ycp
trunk/restore/src/summary_dialog.ycp
Modified: trunk/restore/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/restore/VERSION?rev=55155&r1=55154&r2=55155&view=diff
==============================================================================
--- trunk/restore/VERSION (original)
+++ trunk/restore/VERSION Thu Jan 29 19:36:15 2009
@@ -1 +1 @@
-2.17.0
+2.18.0
Modified: trunk/restore/package/yast2-restore.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/restore/package/yast2-restore.changes?rev=55155&r1=55154&r2=55155&view=diff
==============================================================================
--- trunk/restore/package/yast2-restore.changes (original)
+++ trunk/restore/package/yast2-restore.changes Thu Jan 29 19:36:15 2009
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Thu Jan 29 19:21:35 CET 2009 - locilka@suse.cz
+
+- Fixed displaying i18n characters in summary (bnc #460674).
+- Save summary to file - huge speedup (bnc #460674).
+- 2.18.0
+
+-------------------------------------------------------------------
Tue Dec 16 15:42:40 CET 2008 - locilka@suse.cz
- Fixed alignment of buttons (bnc #447102).
Modified: trunk/restore/src/Restore.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/restore/src/Restore.ycp?rev=55155&r1=55154&r2=55155&view=diff
==============================================================================
--- trunk/restore/src/Restore.ycp (original)
+++ trunk/restore/src/Restore.ycp Thu Jan 29 19:36:15 2009
@@ -972,7 +972,7 @@
infofiles = infofiles + (compressed_packages_info ? "info/packages_info.gz" : "info/packages_info");
// unpack info files
- result = (map) SCR::Execute(.target.bash_output, "/bin/tar -C " + tempdir + " -x -f " + filename + " " + infofiles + " 2> /dev/null");
+ result = (map) SCR::Execute(.target.bash_output, "/bin/tar -C '" + String::Quote (tempdir) + "' -x -f " + filename + " " + infofiles + " 2> /dev/null");
date = (string) SCR::Read(.target.string, tempdir + "/info/date");
comment = (string) SCR::Read(.target.string, tempdir + "/info/comment");
@@ -1460,6 +1460,10 @@
}
);
+ // BNC #460674, Do not change the system locale
+ // It can change I18N characters in output
+ string locale_modifications = "export LANG=C; ";
+
if (fileinarchive == "")
{
y2error("Can't find subarchive for package %1", package);
@@ -1478,14 +1482,14 @@
}
);
- string command = "export LC_ALL=C; echo q | /bin/tar -C " + tempdir + " -x -M " + param + fileinarchive + " 2> /dev/null";
+ string command = locale_modifications + "echo q | /bin/tar -C " + tempdir + " -x -M " + param + fileinarchive + " 2> /dev/null";
y2debug("Running command: %1", command);
started = (boolean) SCR::Execute(.background.run, command);
}
else
{
- started = (boolean) SCR::Execute(.background.run, "export LC_ALL=C; /bin/tar -C " + tempdir + " -x -f " + filename + " " + fileinarchive);
+ started = (boolean) SCR::Execute(.background.run, locale_modifications + "/bin/tar -C " + tempdir + " -x -f " + filename + " " + fileinarchive);
}
// abort test cycle
@@ -1563,11 +1567,11 @@
// for tar: --files-from=filename
// create (s)tar command
- string tarcommand = (star == false) ? ("export LC_ALL=C; /bin/tar -C " + targetdir + " "
+ string tarcommand = (star == false) ? (locale_modifications + "/bin/tar -C " + targetdir + " "
+ compress + " -x -v -f " + tempdir + "/" + fileinarchive + " " + RPMdb
+ " " + unpackfiles + " 2> " + tempdir + "/tar.stderr > " + tempdir
+ "/tar.stdout")
- : ("export LC_ALL=C; /usr/bin/star -C " + targetdir + " "
+ : (locale_modifications + "/usr/bin/star -C " + targetdir + " "
+ compress + " -x -v -U -f " + tempdir + "/" + fileinarchive + " " + RPMdb
+ " " + unpackfiles + " 2> " + tempdir + "/tar.stderr > " + tempdir
+ "/tar.stdout");
Modified: trunk/restore/src/summary_dialog.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/restore/src/summary_dialog.ycp?rev=55155&r1=55154&r2=55155&view=diff
==============================================================================
--- trunk/restore/src/summary_dialog.ycp (original)
+++ trunk/restore/src/summary_dialog.ycp Thu Jan 29 19:36:15 2009
@@ -25,6 +25,8 @@
import "Popup";
import "Label";
+import "Directory";
+import "String";
/**
* This function removes HTML tags from input string
@@ -32,8 +34,7 @@
* @return string String without tags
*/
-define string RemoveTags(string input) ``{
- string ret = input;
+define string RemoveTags(string & ret) ``{
map