Author: jsuchome Date: Mon Jan 19 15:52:30 2009 New Revision: 54761 URL: http://svn.opensuse.org/viewcvs/yast?rev=54761&view=rev Log: - generate package metadata for -release packages (bnc#466327) Modified: trunk/add-on-creator/package/yast2-add-on-creator.changes trunk/add-on-creator/src/AddOnCreator.ycp Modified: trunk/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/package/yast2-add-on-creator.changes?rev=54761&r1=54760&r2=54761&view=diff ============================================================================== --- trunk/add-on-creator/package/yast2-add-on-creator.changes (original) +++ trunk/add-on-creator/package/yast2-add-on-creator.changes Mon Jan 19 15:52:30 2009 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Mon Jan 19 15:52:12 CET 2009 - jsuchome@suse.cz + +- generate package metadata for -release packages (bnc#466327) + +------------------------------------------------------------------- +Wed Jan 14 09:02:42 CET 2009 - jsuchome@suse.cz + +- fixed missing translation mark (bnc#464479) + +------------------------------------------------------------------- Wed Dec 17 21:21:18 CET 2008 - jsuchome@suse.cz - added CLI support for product file (disable generating, offer Modified: trunk/add-on-creator/src/AddOnCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/AddOnCreator.ycp?rev=54761&r1=54760&r2=54761&view=diff ============================================================================== --- trunk/add-on-creator/src/AddOnCreator.ycp (original) +++ trunk/add-on-creator/src/AddOnCreator.ycp Mon Jan 19 15:52:30 2009 @@ -2216,9 +2216,11 @@ y2error ("obs-productconverter not installed, not generating -release"); return false; } - if (!FileUtils::Exists (base_path)) + if (!FileUtils::Exists (full_data_path)) + { + y2error ("path '%1' does not exist", full_data_path); return false; - + } // release packages names and architectures map release_packages = $[]; @@ -2321,18 +2323,18 @@ "/usr/lib/obs/server/bs_productconvert %1 %2 %3", prod_file_path, product_dir, name)); - // 3. build the release package from generated .spec file - string cmd = sformat ( - "rpmbuild -bb `find -L %1 -name %2-release.spec`", tmpdir, name); - if (out["exit"]:0 != 0) { - y2error ("rpmbuild failed with %1", out["stderr"]:""); + y2error ("bs_productconvert failed with %1", out["stderr"]:""); SCR::Execute (.target.remove, prod_file_path); SCR::Execute (.target.bash, sformat ("rm -rf '%1'", product_dir)); return false; } + // 3. build the release package from generated .spec file + string cmd = sformat ( + "rpmbuild -bb `find -L %1 -name %2-release.spec`", tmpdir, name); + out = (map) SCR::Execute (.target.bash_output, cmd, $["LANG":"C"]); if (out["exit"]:0 != 0) { @@ -2366,7 +2368,15 @@ SCR::Execute (.target.bash, sformat ("/bin/cp -r %1 '%2/%3'", package_path, full_data_path, arch)); }); - // 5. delete the tmp files, so it doesn't mess possible next builds + // 5. generate metadata for new package + y2milestone("updating packages descriptions after adding release packages"); + cmd = sformat("/usr/bin/create_package_descr -d %1 -C -F -o %2", + full_data_path, tmpdir); + if (SCR::Execute (.target.bash, cmd, $["LANG":"C"]) != 0) + { + y2error ("'%1' failed", cmd); + } + // 6. delete the tmp files, so it doesn't mess possible next builds SCR::Execute (.target.remove, prod_file_path); SCR::Execute (.target.bash, sformat ("rm -rf '%1'", product_dir)); return true; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org