Author: jsuchome Date: Wed May 30 13:30:12 2007 New Revision: 38191 URL: http://svn.opensuse.org/viewcvs/yast?rev=38191&view=rev Log: - added support for source rpm's (#279004) - 2.13.21 Modified: branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/AddOnCreator.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION?rev=38191&r1=38190&r2=38191&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION Wed May 30 13:30:12 2007 @@ -1 +1 @@ -2.13.20 +2.13.21 Modified: branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes?rev=38191&r1=38190&r2=38191&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes Wed May 30 13:30:12 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed May 30 10:06:57 CEST 2007 - jsuchome@suse.cz + +- added support for source rpm's (#279004) +- 2.13.21 + +------------------------------------------------------------------- Tue May 22 10:40:53 CEST 2007 - jsuchome@suse.cz - enable rpm directory with .rpm extension (#276861) Modified: branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/AddOnCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/AddOnCreator.ycp?rev=38191&r1=38190&r2=38191&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/AddOnCreator.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/AddOnCreator.ycp Wed May 30 13:30:12 2007 @@ -592,6 +592,9 @@ // mapping of package name to full file name global map package2filename = $[]; +// mapping of source package name to full file name +global map srcpackage2filename = $[]; + // if we want only to sign existing product (and possibly create iso of it) global boolean only_sign_product = false; @@ -1004,17 +1007,23 @@ y2milestone ("asking the RPM's for ARCH and NAME..."); foreach (string f, splitstring (out["stdout"]:"", "\n"), { if (f == "") return; - out = (map) SCR::Execute (.target.bash_output, - sformat ("rpm -q -p %1 --qf \"%%{ARCH}\n%%{NAME}\"", f)); + sformat ("rpm -q -p %1 --qf \"%%{ARCH}\n%%{NAME}\n%%|SOURCERPM?{bin}:{src}|\"",f)); list lines = splitstring (out["stdout"]:"", "\n"); string arch = lines[0]:""; string name = lines[1]:""; + string sourcerpm = lines[2]:""; + // 'arch' is directory where to put final package + if (sourcerpm == "src") + arch = "src"; if (name != "" && arch != "") { available_packages[arch] = add ( available_packages[arch]:[], name); - package2filename[name] = f; + if (arch != "src") + package2filename[name] = f; + else + srcpackage2filename[name] = f; } }); y2milestone ("... done"); @@ -1437,13 +1446,20 @@ if (arch != "ZZZ_imported" && arch != "ZZZ_required" && FileUtils::Exists (out_dir)) { - if (size (package2filename) > 0) + if (size (package2filename) > 0 && arch != "src") { foreach (string p, (list<string>) pa, { SCR::Execute (.target.bash, sformat ( "/bin/cp %1 '%2/'", package2filename[p]:"", out_dir)); }); } + else if (size (srcpackage2filename) > 0 && arch == "src") + { + foreach (string p, (list<string>) pa, { + SCR::Execute (.target.bash, sformat ( + "/bin/cp %1 '%2/'", srcpackage2filename[p]:"", out_dir)); + }); + } else { foreach (string p, (list<string>) pa, { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org