Author: lslezak Date: Mon Mar 3 15:22:32 2008 New Revision: 45162 URL: http://svn.opensuse.org/viewcvs/yast?rev=45162&view=rev Log: - merged changes from SP1 branch (r40028) - 2.13.14 Modified: branches/SuSE-SLE-10-SP2-Branch/cd-creator/VERSION branches/SuSE-SLE-10-SP2-Branch/cd-creator/package/yast2-cd-creator.changes branches/SuSE-SLE-10-SP2-Branch/cd-creator/src/CDCreator.ycp branches/SuSE-SLE-10-SP2-Branch/cd-creator/src/data/isolinux.cfg branches/SuSE-SLE-10-SP2-Branch/cd-creator/src/dialogs.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/cd-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/cd-creator/VERSION?rev=45162&r1=45161&r2=45162&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/cd-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/cd-creator/VERSION Mon Mar 3 15:22:32 2008 @@ -1 +1 @@ -2.13.12 +2.13.14 Modified: branches/SuSE-SLE-10-SP2-Branch/cd-creator/package/yast2-cd-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/cd-creator/package/yast2-cd-creator.changes?rev=45162&r1=45161&r2=45162&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/cd-creator/package/yast2-cd-creator.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/cd-creator/package/yast2-cd-creator.changes Mon Mar 3 15:22:32 2008 @@ -2,6 +2,22 @@ Thu Jan 17 13:01:19 CET 2008 - jsrain@suse.cz - merged texts from proofread +- 2.13.14 + +------------------------------------------------------------------- +Mon Sep 17 20:51:40 CEST 2007 - jsuchome@suse.cz + +- support s390x architecture (#301362) +- 2.13.13 + +------------------------------------------------------------------- +Thu Jul 26 08:22:32 CEST 2007 - lslezak@suse.cz + +- always store isolinux.cfg into the config file, even if there + is no change, fixed the default boot item in isolinux.cfg for + AutoYast installation (#260246) +- use the correct architecture when copying packages to the target + directory (#292681) - 2.13.12 ------------------------------------------------------------------- Modified: branches/SuSE-SLE-10-SP2-Branch/cd-creator/src/CDCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/cd-creator/src/CDCreator.ycp?rev=45162&r1=45161&r2=45162&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/cd-creator/src/CDCreator.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/cd-creator/src/CDCreator.ycp Mon Mar 3 15:22:32 2008 @@ -368,7 +368,10 @@ } else { - bootconfig_path = sformat("boot/%1/loader/isolinux.cfg", Arch::architecture()); + string arch = Arch::architecture(); + if (arch == "s390_64") arch = "s390x"; + + bootconfig_path = sformat("boot/%1/loader/isolinux.cfg", arch); list<integer> srcids = UrlToId([Config["sources", 0]:""]); @@ -707,6 +710,7 @@ integer sles_src = 0; string descr_dir = ""; string arch = Arch::architecture(); + if (arch == "s390_64") arch = "s390x"; y2milestone("Config: %1", Config); @@ -1308,6 +1312,7 @@ string cpCmd = ""; string arch = Arch::architecture(); + if (arch == "s390_64") arch = "s390x"; y2debug("isolinux.cfg: %1", Config["bootconfig"]:"" ); if (Config["bootconfig"]:"" != "") { @@ -1318,11 +1323,6 @@ : sformat("%1/boot/loader/isolinux.cfg", skel_root); SCR::Write(.target.string, fname, Config["bootconfig"]:"" ); - /* - string cpCmd = sformat("cp %1/cd-creator/isolinux.cfg %2/boot/loader", - Directory::datadir, skel_root); - SCR::Execute (.target.bash, cpCmd); - */ } cpCmd = (Config["code10"]:false) ? sformat("cp %1/cd-creator/message %2/boot/%3/loader", Directory::datadir, skel_root, arch) @@ -1589,12 +1589,24 @@ Progress::Title(_("Checking for package availability...")); list<string> selectedPackages = Pkg::GetPackages (`selected , true); + y2milestone("Selected %1 packages: %2", size(selectedPackages), sort(selectedPackages)); list<string> failed = []; toCopy = $[]; foreach(string package, selectedPackages, ``{ - map package_data = Pkg::PkgProperties(package); + list<map> package_data_list = Pkg::PkgPropertiesAll(package); + map package_data = nil; + + // get the selected package + foreach(map pkg_data, package_data_list, + { + if (pkg_data["status"]:`unknown == `selected) + { + package_data = pkg_data; + } + } + ); if (package_data == nil || package_data == $[]) { Modified: branches/SuSE-SLE-10-SP2-Branch/cd-creator/src/data/isolinux.cfg URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/cd-creator/src/data/isolinux.cfg?rev=45162&r1=45161&r2=45162&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/cd-creator/src/data/isolinux.cfg (original) +++ branches/SuSE-SLE-10-SP2-Branch/cd-creator/src/data/isolinux.cfg Mon Mar 3 15:22:32 2008 @@ -2,8 +2,7 @@ # hard disk label harddisk - kernel linux - append SLX=0x202 showopts + localboot 0x80 # autoyast label AutoYaST Modified: branches/SuSE-SLE-10-SP2-Branch/cd-creator/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/cd-creator/src/dialogs.ycp?rev=45162&r1=45161&r2=45162&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/cd-creator/src/dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/cd-creator/src/dialogs.ycp Mon Mar 3 15:22:32 2008 @@ -500,9 +500,11 @@ y2milestone("content file: %1", read_content); boolean found_architecture = false; + string arch = Arch::architecture (); + if (arch == "s390_64") arch = "s390x"; foreach(string key, string value, read_content, { - if (key == "ARCH." + Arch::architecture()) + if (key == "ARCH." + arch); { found_architecture = true; break; @@ -523,7 +525,7 @@ } else { - Report::Error(sformat(_("The source does not support architecture of this machine (%1).\nSelect another source."), Arch::architecture())); + Report::Error(sformat(_("The source does not support architecture of this machine (%1).\nSelect another source."), arch)); } } else if (ret == `remove) @@ -609,11 +611,8 @@ } else if(ret == `next) { string isolinux_new = (string)UI::QueryWidget(`id(`isolinux), `Value); - if (isolinux_new != isolinux) - { - CDCreator::Config["bootconfig"] = isolinux_new; - } - + CDCreator::Config["bootconfig"] = isolinux_new; + y2milestone("Isolinux config: %1", isolinux_new); break; } @@ -633,6 +632,9 @@ define void CheckCode10Source() { + string arch = Arch::architecture (); + if (arch == "s390_64") arch = "s390x"; + boolean code10 = false; foreach (string url , CDCreator::Config["sources"]:[], { @@ -650,7 +652,7 @@ { list<string> items = splitstring(dir_listing, "\n"); - code10 = code10 || contains(items, Arch::architecture() + "/"); + code10 = code10 || contains(items, arch + "/"); } } }); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org