Author: locilka Date: Fri Sep 7 14:31:15 2007 New Revision: 40803 URL: http://svn.opensuse.org/viewcvs/yast?rev=40803&view=rev Log: - Fixed SlideShow initialization, using Pkg::SourceProvideDirectory instead of obsolete Pkg::SourceProvideDir (#305097). - 2.15.76 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/Packages.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=40803&r1=40802&r2=40803&view=diff ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Fri Sep 7 14:31:15 2007 @@ -1 +1 @@ -2.15.75 +2.15.76 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=40803&r1=40802&r2=40803&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Fri Sep 7 14:31:15 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Sep 7 14:30:32 CEST 2007 - locilka@suse.cz + +- Fixed SlideShow initialization, using Pkg::SourceProvideDirectory + instead of obsolete Pkg::SourceProvideDir (#305097). +- 2.15.76 + +------------------------------------------------------------------- Wed Sep 5 13:41:41 CEST 2007 - locilka@suse.cz - Reading and using proxy settings before inst_productsources Modified: trunk/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.ycp?rev=40803&r1=40802&r2=40803&view=diff ============================================================================== --- trunk/packager/src/modules/Packages.ycp (original) +++ trunk/packager/src/modules/Packages.ycp Fri Sep 7 14:31:15 2007 @@ -808,28 +808,30 @@ // setup slidedir map productmap = Pkg::SourceProductData (source); string datadir = productmap["datadir"]:"suse"; - string slidedir_find = "/" + datadir + "/setup/slide"; - string dir = Pkg::SourceProvideOptionalFile (source, 1, - slidedir_find + "/directory.yast"); - string slidedir = nil; - if (dir != nil) - slidedir = Pkg::SourceProvideDir (source, 1, slidedir_find); - - string our_slidedir = (string)WFM::Read (.local.tmpdir, ""); - if (slidedir == nil) - { - y2milestone("No slide directory '%1' found in repository '%2'.", - slidedir_find, source); - } - else - { + + // media directory + // bugzilla #305097 + string search_for_dir = sformat ("/%1/setup/slide/", datadir); + string slidedir = Pkg::SourceProvideDirectory (source, 1, search_for_dir, true, true); + + // target slideshow directory + string our_slidedir = (string) WFM::Read (.local.tmpdir, ""); + + if (slidedir == nil) { + y2milestone ("No slide directory '%1' found in repository '%2'.", + search_for_dir, source); + } else { // copy all files to our own copy + y2milestone ("Copying %1/* to %2/", slidedir, our_slidedir); + WFM::Execute (.local.bash, sformat ("cp -r %1/* %2/", slidedir, our_slidedir)) ; } y2milestone ("Setting up the slide directory local copy: %1", our_slidedir); + SlideShow::SetSlideDir (our_slidedir); + if (load_release_notes (source)) { SlideShow::relnotes = media_prefix + media_text; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org