Author: locilka Date: Tue Apr 15 11:45:08 2008 New Revision: 46652 URL: http://svn.opensuse.org/viewcvs/yast?rev=46652&view=rev Log: - ImageInstallation tries to find details-<arch>.xml, then details.xml to provide useful progress while deploying images. - 2.16.36 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/modules/ImageInstallation.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=46652&r1=46651&r2=46652&view=diff ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Tue Apr 15 11:45:08 2008 @@ -1 +1 @@ -2.16.35 +2.16.36 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=46652&r1=46651&r2=46652&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Apr 15 11:45:08 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Apr 15 11:45:18 CEST 2008 - locilka@suse.cz + +- ImageInstallation tries to find details-<arch>.xml, then + details.xml to provide useful progress while deploying images. +- 2.16.36 + +------------------------------------------------------------------- Tue Apr 15 10:22:04 CEST 2008 - mvidner@suse.cz - Enable printing the last few debugging log messages in the crash @@ -20,7 +27,7 @@ - Caching system files in the System Analysis dialog. - Some better texts (bnc #377959). - Better text for Software Selection dialog (bnc #379157). -- 2.13.34 +- 2.16.34 ------------------------------------------------------------------- Fri Apr 11 18:21:53 CEST 2008 - locilka@suse.cz @@ -32,7 +39,7 @@ - Added another per-image progress into the Installation images deployment (it requires details.xml). -- 2.13.33 +- 2.16.33 ------------------------------------------------------------------- Fri Apr 11 15:33:17 CEST 2008 - juhliarik@suse.cz Modified: trunk/installation/src/modules/ImageInstallation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/ImageInstallation.ycp?rev=46652&r1=46651&r2=46652&view=diff ============================================================================== --- trunk/installation/src/modules/ImageInstallation.ycp (original) +++ trunk/installation/src/modules/ImageInstallation.ycp Tue Apr 15 11:45:08 2008 @@ -49,7 +49,7 @@ /** * Template for the path for an image on the media */ -string _image_path = "/images/%1"; +string _image_path = "/images"; /** * List of already mounted images @@ -172,7 +172,7 @@ boolean DeployTarImage (string id, string target) { string file = _images[id, "file"]:""; y2milestone ("Untarring image %1 (%2) to %3", id, file, target); - file = sformat (_image_path, file); + file = sformat ("%1/%2", _image_path, file); string image = Pkg::SourceProvideFile (_repo, 1, file); if (image == nil) { @@ -254,7 +254,7 @@ boolean DeployFsImage (string id, string target) { string file = _images[id, "file"]:""; y2milestone ("Deploying FS image %1 (%2) on %3", id, file, target); - file = sformat (_image_path, file); + file = sformat ("%1/%2", _image_path, file); string image = Pkg::SourceProvideFile (_repo, 1, file); if (image == nil) { @@ -304,7 +304,7 @@ boolean MountFsImage (string id, string target) { string file = _images[id, "file"]:""; y2milestone ("Mounting image %1 (%2) on %3", id, file, target); - file = sformat (_image_path, file); + file = sformat ("%1/%2", _image_path, file); string image = Pkg::SourceProvideFile (_repo, 1, file); if (image == nil) { @@ -415,7 +415,22 @@ * Loads non-mandatory details for every single selected image. */ global boolean FillUpImagesDetails () { - string filename = Pkg::SourceProvideOptionalFile (_repo, 1, sformat (_image_path, "details.xml")); + // ppc (covers also ppc64), i386, x86_64 ... + string filename = nil; + + list <string> possible_files = [ + sformat ("%1/details-%2.xml", _image_path, Arch::arch_short()), + sformat ("%1/details.xml", _image_path), + ]; + + foreach (string try_file, possible_files, { + filename = Pkg::SourceProvideOptionalFile (_repo, 1, try_file); + if (filename != nil && filename != "") { + y2milestone ("Using file: %1 (%2)", filename, try_file); + break; + } + }); + if (filename == nil) { y2milestone ("No image installation details found"); return false; @@ -513,7 +528,7 @@ _metadata_image = ""; // checking whether images are supported - string filename = Pkg::SourceProvideOptionalFile (_repo, 1, sformat (_image_path, "images.xml")); + string filename = Pkg::SourceProvideOptionalFile (_repo, 1, sformat ("%1/images.xml", _image_path)); if (filename == nil) { Installation::image_installation = false; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org