Author: locilka Date: Mon Mar 10 09:10:18 2008 New Revision: 45317 URL: http://svn.opensuse.org/viewcvs/yast?rev=45317&view=rev Log: - Fixed restoration in autoyast (#199657). - 2.13.3 Modified: branches/SuSE-SLE-10-SP2-Branch/restore/VERSION branches/SuSE-SLE-10-SP2-Branch/restore/package/yast2-restore.changes branches/SuSE-SLE-10-SP2-Branch/restore/src/restore_auto.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/restore/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/restore/VERSION?rev=45317&r1=45316&r2=45317&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/restore/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/restore/VERSION Mon Mar 10 09:10:18 2008 @@ -1 +1 @@ -2.13.2 +2.13.3 Modified: branches/SuSE-SLE-10-SP2-Branch/restore/package/yast2-restore.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/restore/package/yast2-restore.changes?rev=45317&r1=45316&r2=45317&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/restore/package/yast2-restore.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/restore/package/yast2-restore.changes Mon Mar 10 09:10:18 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Mar 10 09:08:23 CET 2008 - locilka@suse.cz + +- Fixed restoration in autoyast (#199657). +- 2.13.3 + +------------------------------------------------------------------- Mon Dec 4 14:20:22 CET 2006 - locilka@suse.cz - Fixed restoration of archives containing files with quotes, Modified: branches/SuSE-SLE-10-SP2-Branch/restore/src/restore_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/restore/src/restore_auto.ycp?rev=45317&r1=45316&r2=45317&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/restore/src/restore_auto.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/restore/src/restore_auto.ycp Mon Mar 10 09:10:18 2008 @@ -19,6 +19,9 @@ import "Popup"; import "Restore"; import "Wizard"; +import "Directory"; +import "FileUtils"; + include "restore/ui.ycp"; /* The main () */ @@ -29,6 +32,7 @@ string func = ""; map param = $[]; +string filename = sformat ("%1/restore_archives_tmpfile.ycp", Directory::tmpdir); /* Check arguments */ if (size(WFM::Args()) > 0 && is(WFM::Args(0), string)) @@ -48,6 +52,13 @@ if (func == "Import") { ret = Restore::Import(param); + + if (FileUtils::Exists (filename)) { + SCR::Execute (.target.remove, filename); + } + + // bugzilla #199657 + SCR::Write (.target.ycp, filename, param["archives"]:[]); } /* create a summary */ else if (func == "Summary") @@ -77,7 +88,18 @@ import "Progress"; // Read archive file - list<string> volumes = param["archives"]:[]; + list <string> volumes = []; + + // bugzilla #199657 + if (param["archives"]:[] != []) { + y2milestone ("Some volumes set"); + volumes = param["archives"]:[]; + } else if (FileUtils::Exists (filename)) { + y2milestone ("Reading volumes from tmpfile"); + volumes = (list <string>) SCR::Read (.target.ycp, filename); + } + + y2milestone ("Volumes: %1", volumes); if (size(volumes) == 0) { @@ -91,6 +113,8 @@ integer index = 0; foreach(string volume, volumes, ``{ + y2milestone ("Scanning volume %1", volume); + if (ui == `abort) { ret = false; @@ -106,6 +130,7 @@ map read_result = Restore::ReadNextVolume(volume); read = (boolean)(read_result["success"]:false); } + y2milestone ("Reading volume %1 returned %2", volume, read); if (read == false) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org