Author: locilka Date: Thu Aug 14 15:05:29 2008 New Revision: 50077 URL: http://svn.opensuse.org/viewcvs/yast?rev=50077&view=rev Log: - Disabling hotfix (bnc #385868) for /openSUSE-release.prod file, it is properly fixed in zypp already. Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/pkg_finish.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=50077&r1=50076&r2=50077&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Thu Aug 14 15:05:29 2008 @@ -4,6 +4,8 @@ - Added support for several products on one media by making add_on_products obsolete and introducing new add_on_products.xml format (FATE #303675). +- Disabling hotfix (bnc #385868) for /openSUSE-release.prod file, + it is properly fixed in zypp already. - 2.17.5 ------------------------------------------------------------------- Modified: trunk/packager/src/clients/pkg_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/pkg_finish.ycp?rev=50077&r1=50076&r2=50077&view=diff ============================================================================== --- trunk/packager/src/clients/pkg_finish.ycp (original) +++ trunk/packager/src/clients/pkg_finish.ycp Thu Aug 14 15:05:29 2008 @@ -105,6 +105,14 @@ } else if (func == "Write") { + +/* + File "/openSUSE-release.prod" is no more on the media + but directly in the RPM. Don't create the directory + and don't copy the file manually anymore. + + (since evrsion 2.17.5) + // Copy information about product (bnc#385868) // FIXME: this is a temporary hack containing a hardcoded file name string media_prod = Pkg::SourceProvideOptionalFile ( @@ -117,6 +125,7 @@ WFM::Execute (.local.bash, sformat ("test -d %3%2 && /bin/cp %1 %3%2", media_prod, "/etc/zypp/products.d", Installation::destdir)); } +*/ // See bnc #384827, #381360 if (Mode::update()) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org