Author: lslezak Date: Wed Oct 29 15:34:55 2008 New Revision: 52677 URL: http://svn.opensuse.org/viewcvs/yast?rev=52677&view=rev Log: - copy slideshow to the correct place (bnc#439799) - 2.17.36 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=52677&r1=52676&r2=52677&view=diff ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Wed Oct 29 15:34:55 2008 @@ -1 +1 @@ -2.17.35 +2.17.36 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=52677&r1=52676&r2=52677&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed Oct 29 15:34:55 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 29 15:33:45 CET 2008 - lslezak@suse.cz + +- copy slideshow to the correct place (bnc#439799) +- 2.17.36 + +------------------------------------------------------------------- Mon Oct 27 14:04:11 CET 2008 - locilka@suse.cz - Reporting an error if software proposal cache is invalid Modified: trunk/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.ycp?rev=52677&r1=52676&r2=52677&view=diff ============================================================================== --- trunk/packager/src/modules/Packages.ycp (original) +++ trunk/packager/src/modules/Packages.ycp Wed Oct 29 15:34:55 2008 @@ -1096,8 +1096,12 @@ WFM::Execute (.local.bash, sformat ("mkdir -p '%1'", String::Quote (loc_slidedir))); // copy all files to our own cache - y2milestone ("Copying %1/* to %2", providedir, String::Quote (loc_slidedir)); - WFM::Execute (.local.bash, sformat ("cp -r %1/* '%2'", providedir, String::Quote (loc_slidedir))); + string copy_command = sformat("cp -r '%1/%2/txt/%3'/* '%4'", + String::Quote(providedir), String::Quote(search_for_dir), + String::Quote(used_loc_dir), String::Quote(loc_slidedir)); + + y2milestone ("Copying: %1", copy_command); + WFM::Execute (.local.bash, copy_command); // where images are stored string imagesdir = sformat ("%1/pic", search_for_dir); @@ -1109,8 +1113,11 @@ string our_imagesdir = sformat ("%1/pic/", our_slidedir); WFM::Execute (.local.bash, sformat ("mkdir -p '%1'", String::Quote (our_imagesdir))); - y2milestone ("Copying %1/* to '%2'", imagesdir, String::Quote (our_imagesdir)); - WFM::Execute (.local.bash, sformat ("cp -r %1/* '%2'", imagesdir, String::Quote (our_imagesdir))); + copy_command = sformat("cp -r '%1/%2/pic'/* '%3'", + String::Quote(imagesdir), String::Quote(search_for_dir), String::Quote (our_imagesdir)); + + y2milestone ("Copying: %1", copy_command); + WFM::Execute (.local.bash, copy_command); } else { y2error ("No such dir: %1", imagesdir); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org