Author: locilka Date: Fri Nov 7 17:18:57 2008 New Revision: 53085 URL: http://svn.opensuse.org/viewcvs/yast?rev=53085&view=rev Log: - Using Pkg::SourceProvideDigestedFile function when deploying images (bnc #409927). Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/modules/ImageInstallation.ycp trunk/installation/yast2-installation.spec.in Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=53085&r1=53084&r2=53085&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Fri Nov 7 17:18:57 2008 @@ -5,6 +5,8 @@ (bnc #442691). - Removing the congrats dialog content before cloning, storing the sources, finishing (bnc #441452). +- Using Pkg::SourceProvideDigestedFile function when deploying + images (bnc #409927). - 2.17.30 ------------------------------------------------------------------- Modified: trunk/installation/src/modules/ImageInstallation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/ImageInstallation.ycp?rev=53085&r1=53084&r2=53085&view=diff ============================================================================== --- trunk/installation/src/modules/ImageInstallation.ycp (original) +++ trunk/installation/src/modules/ImageInstallation.ycp Fri Nov 7 17:18:57 2008 @@ -207,7 +207,10 @@ string file = _images[id, "file"]:""; y2milestone ("Untarring image %1 (%2) to %3", id, file, target); file = sformat ("%1/%2", _image_path, file); - string image = Pkg::SourceProvideFile (_repo, 1, file); + // BNC #409927 + // Checking files for signatures + string image = Pkg::SourceProvideDigestedFile (_repo, 1, file, false); + if (image == nil) { y2error ("File %1 not found on media", file); @@ -306,7 +309,10 @@ string file = _images[id, "file"]:""; y2milestone ("Deploying FS image %1 (%2) on %3", id, file, target); file = sformat ("%1/%2", _image_path, file); - string image = Pkg::SourceProvideFile (_repo, 1, file); + // BNC #409927 + // Checking files for signatures + string image = Pkg::SourceProvideDigestedFile (_repo, 1, file, false); + if (image == nil) { y2error ("File %1 not found on media", file); @@ -356,7 +362,10 @@ string file = _images[id, "file"]:""; y2milestone ("Mounting image %1 (%2) on %3", id, file, target); file = sformat ("%1/%2", _image_path, file); - string image = Pkg::SourceProvideFile (_repo, 1, file); + // BNC #409927 + // Checking files for signatures + string image = Pkg::SourceProvideDigestedFile (_repo, 1, file, false); + if (image == nil) { y2error ("File %1 not found on media", file); @@ -493,7 +502,10 @@ ]; foreach (string try_file, possible_files, { - filename = Pkg::SourceProvideOptionalFile (_repo, 1, try_file); + // BNC #409927 + // Checking files for signatures + filename = Pkg::SourceProvideDigestedFile (_repo, 1, try_file, true); + if (filename != nil && filename != "") { y2milestone ("Using file: %1 (%2)", filename, try_file); break; @@ -626,7 +638,10 @@ _metadata_image = ""; // checking whether images are supported - string filename = Pkg::SourceProvideOptionalFile (_repo, 1, sformat ("%1/images.xml", _image_path)); + // BNC #409927 + // Checking files for signatures + string filename = Pkg::SourceProvideDigestedFile (_repo, 1, sformat ("%1/images.xml", _image_path), false); + if (filename == nil) { Installation::image_installation = false; Modified: trunk/installation/yast2-installation.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/yast2-installation.spec.in?rev=53085&r1=53084&r2=53085&view=diff ============================================================================== --- trunk/installation/yast2-installation.spec.in (original) +++ trunk/installation/yast2-installation.spec.in Fri Nov 7 17:18:57 2008 @@ -7,8 +7,8 @@ # PackageCallbacks::RegisterEmptyProgressCallbacks() BuildRequires: yast2 >= 2.16.52 -# Unified progress bar (done by visnov) -BuildRequires: yast2-packager >= 2.17.9 +# Pkg::SourceProvideDigestedFile() +BuildRequires: yast2-packager >= 2.17.25 # AutoinstConfig::getProposalList Requires: autoyast2-installation >= 2.17.1 @@ -25,8 +25,8 @@ # Language::Set (handles downloading the translation extensions) Requires: yast2-country-data >= 2.16.11 -# Packages::required_patterns -Requires: yast2-packager >= 2.17.23 +# Pkg::SourceProvideDigestedFile() +Requires: yast2-packager >= 2.17.25 # Storage::GetCommitInfo() call in include/misc.ycp Requires: yast2-storage >= 2.17.47 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org