Author: jsuchome Date: Fri Dec 12 16:06:30 2008 New Revision: 54098 URL: http://svn.opensuse.org/viewcvs/yast?rev=54098&view=rev Log: - call bs_productconvert from correct path - import data from -release packages when cloning product (fate#305172) - 2.17.9 Modified: trunk/add-on-creator/VERSION trunk/add-on-creator/package/yast2-add-on-creator.changes trunk/add-on-creator/src/AddOnCreator.ycp Modified: trunk/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/VERSION?rev=54098&r1=54097&r2=54098&view=diff ============================================================================== --- trunk/add-on-creator/VERSION (original) +++ trunk/add-on-creator/VERSION Fri Dec 12 16:06:30 2008 @@ -1 +1 @@ -2.17.8 +2.17.9 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=54098&r1=54097&r2=54098&view=diff ============================================================================== --- trunk/add-on-creator/package/yast2-add-on-creator.changes (original) +++ trunk/add-on-creator/package/yast2-add-on-creator.changes Fri Dec 12 16:06:30 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Dec 12 16:02:16 CET 2008 - jsuchome@suse.cz + +- call bs_productconvert from correct path +- import data from -release packages when cloning product + (fate#305172) +- 2.17.9 + +------------------------------------------------------------------- Wed Dec 3 15:08:57 CET 2008 - jsuchome@suse.cz - flag is GE, not GT Modified: trunk/add-on-creator/src/AddOnCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/AddOnCreator.ycp?rev=54098&r1=54097&r2=54098&view=diff ============================================================================== --- trunk/add-on-creator/src/AddOnCreator.ycp (original) +++ trunk/add-on-creator/src/AddOnCreator.ycp Fri Dec 12 16:06:30 2008 @@ -1582,6 +1582,25 @@ } Progress::NextStage(); } + // we want to find and read release packages for cloned product + else { + out = (map) SCR::Execute (.target.bash_output, + sformat ("find %1 -name '*-release*'", rpm_path)); + foreach (string f, splitstring (out["stdout"]:"", "\n"), { + if (f == "") return; + out = (map) SCR::Execute (.target.bash_output, + sformat ("rpm -q -p %1 --qf \"%%{NAME}\n%%|SOURCERPM?{bin}:{src}|\"",f)); + list lines = splitstring (out["stdout"]:"", "\n"); + string name = lines[0]:""; + string sourcerpm = lines[1]:""; + if (sourcerpm != "src" && name != "" && + size (name) > 8 && issubstring (name, "-release")) + { + y2milestone ("release package found: %1, %2", name, f); + release_packages = add (release_packages, f); + } + }); + } if (rpm_path == "") { Progress::Finish (); @@ -1590,7 +1609,6 @@ string reldir = tmpdir + "/release"; if (release_packages != []) { - SCR::Execute (.target.mkdir, reldir); // when release package is present, do not offer to change it generate_release_package = false; } @@ -1598,6 +1616,9 @@ // read the product info contained in release package foreach (string release_package, release_packages, { + // use 'reldir' only for one package + SCR::Execute (.target.bash, "rm -rf " + reldir); + SCR::Execute (.target.mkdir, reldir); SCR::Execute (.target.bash, sformat ("cp %1 %2", release_package, reldir)); SCR::Execute (.target.bash, @@ -1640,7 +1661,7 @@ requiremap["flavor"] = tokens[2]:""; if (tokens[5]:"" != "") requiremap["release"] = tokens[5]:""; - y2debug ("requiremap: %1", requiremap); + y2milestone ("requiremap: %1", requiremap); requireslist = add (requireslist, requiremap); }); return; @@ -2293,7 +2314,8 @@ // 2. call bs_productconvert to generate a spec file for -release package map out = (map) SCR::Execute (.target.bash_output, sformat ( - "bs_productconvert %1 %2 %3", prod_file_path, product_dir, name)); + "/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 ( -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org