March 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67589 - /tags/branch-Code-11-SP1-2_17_2/rdp/
by locilka＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: locilka Date: Thu Mar 8 11:20:51 2012 New Revision: 67589 URL: http://svn.opensuse.org/viewcvs/yast?rev=67589&view=rev Log: Created tag branch-Code-11-SP1-2_17_2 for rdp Added: tags/branch-Code-11-SP1-2_17_2/rdp/ (props changed) - copied from r67588, branches/SuSE-Code-11-SP1-Branch/rdp/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67588 - in /branches/SuSE-Code-11-SP1-Branch/rdp: MAINTAINER VERSION package/yast2-rdp.changes src/RDP.ycp
by locilka＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: locilka Date: Thu Mar 8 11:20:20 2012 New Revision: 67588 URL: http://svn.opensuse.org/viewcvs/yast?rev=67588&view=rev Log: - Applied patch from Takashi Iwai - Changed maintainer according to PDB Modified: branches/SuSE-Code-11-SP1-Branch/rdp/MAINTAINER branches/SuSE-Code-11-SP1-Branch/rdp/VERSION branches/SuSE-Code-11-SP1-Branch/rdp/package/yast2-rdp.changes branches/SuSE-Code-11-SP1-Branch/rdp/src/RDP.ycp Modified: branches/SuSE-Code-11-SP1-Branch/rdp/MAINTAINER URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/rdp/M… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/rdp/MAINTAINER (original) +++ branches/SuSE-Code-11-SP1-Branch/rdp/MAINTAINER Thu Mar 8 11:20:20 2012 @@ -1 +1 @@ -David Reveman <dreveman(a)novell.com> +Lance Wang <lzwang(a)suse.com> Modified: branches/SuSE-Code-11-SP1-Branch/rdp/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/rdp/V… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/rdp/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/rdp/VERSION Thu Mar 8 11:20:20 2012 @@ -1 +1 @@ -2.17.1 +2.17.2 Modified: branches/SuSE-Code-11-SP1-Branch/rdp/package/yast2-rdp.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/rdp/p… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/rdp/package/yast2-rdp.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/rdp/package/yast2-rdp.changes Thu Mar 8 11:20:20 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Mar 8 11:14:29 CET 2012 - tiwai(a)suse.com + +- Fixed module behavior when installation of requested packages + fails (bnc #744100) +- 2.17.2 + +------------------------------------------------------------------- Mon Jan 18 10:02:07 CET 2010 - mzugec(a)suse.cz - fixed rdp.desktop file (Categories) Modified: branches/SuSE-Code-11-SP1-Branch/rdp/src/RDP.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/rdp/s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/rdp/src/RDP.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/rdp/src/RDP.ycp Thu Mar 8 11:20:20 2012 @@ -16,6 +16,7 @@ import "Label"; import "Mode"; import "Package"; +import "PackageSystem"; import "Service"; import "SuSEFirewall"; import "Progress"; @@ -64,7 +65,7 @@ global boolean Read() { list<string> packages = [ "xrdp" ]; - if (!Package::InstallAll(packages)) { + if (!PackageSystem::CheckAndInstallPackagesInteractive (packages)) { y2error("Installing of required packages failed"); return false; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67587 - /trunk/ncurses-pkg/src/NCPkgPackageDetails.cc
by gs＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: gs Date: Thu Mar 8 09:37:56 2012 New Revision: 67587 URL: http://svn.opensuse.org/viewcvs/yast?rev=67587&view=rev Log: better initialisation of package pointer Modified: trunk/ncurses-pkg/src/NCPkgPackageDetails.cc Modified: trunk/ncurses-pkg/src/NCPkgPackageDetails.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPackageDeta… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPackageDetails.cc (original) +++ trunk/ncurses-pkg/src/NCPkgPackageDetails.cc Thu Mar 8 09:37:56 2012 @@ -182,13 +182,13 @@ text += pkgPtr->installSize().asString(); text += " "; - ZyppPkg package; + ZyppPkg package = tryCastToZyppPkg( pkgPtr ); ZyppPkg candidate = tryCastToZyppPkg( slbPtr->candidateObj() ); ZyppPkg installed = tryCastToZyppPkg( slbPtr->installedObj() ); if ( installed ) package = installed; - else + else if ( candidate ) package = candidate; if ( package ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67586 - /tags/stable-2_22_4/product-creator/
by jsuchome＠svn2.opensuse.org 07 Mar '12

07 Mar '12

Author: jsuchome Date: Wed Mar 7 16:32:38 2012 New Revision: 67586 URL: http://svn.opensuse.org/viewcvs/yast?rev=67586&view=rev Log: Created tag stable-2_22_4 for product-creator Added: tags/stable-2_22_4/product-creator/ - copied from r67585, trunk/product-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67585 - in /trunk/product-creator: VERSION package/yast2-product-creator.changes src/Kiwi.ycp src/kiwi_dialogs.ycp
by jsuchome＠svn2.opensuse.org 07 Mar '12

07 Mar '12

Author: jsuchome Date: Wed Mar 7 16:32:12 2012 New Revision: 67585 URL: http://svn.opensuse.org/viewcvs/yast?rev=67585&view=rev Log: - do not discard bootinclude packages after conflict (bnc#750739) - backup the original version of config.xml (bnc#750989) - 2.22.4 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/Kiwi.ycp trunk/product-creator/src/kiwi_dialogs.ycp Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=6758… ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Wed Mar 7 16:32:12 2012 @@ -1 +1 @@ -2.22.3 +2.22.4 Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Wed Mar 7 16:32:12 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Mar 7 16:30:06 CET 2012 - jsuchome(a)suse.cz + +- do not discard bootinclude packages after conflict (bnc#750739) +- backup the original version of config.xml (bnc#750989) +- 2.22.4 + +------------------------------------------------------------------- Wed Mar 7 09:18:05 CET 2012 - jsuchome(a)suse.cz - new check for conflicting delete packages (bnc#748488) Modified: trunk/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/Kiwi.ycp?rev… ============================================================================== --- trunk/product-creator/src/Kiwi.ycp (original) +++ trunk/product-creator/src/Kiwi.ycp Wed Mar 7 16:32:12 2012 @@ -294,8 +294,8 @@ { string backup = base_path + "/config.xml.POSsave"; y2milestone ("creating backup of config file: %1", backup); - SCR::Execute (.target.bash, sformat ("cp -- '%1' '%2'", - String::Quote (file_path), String::Quote (backup))); + SCR::Execute (.target.bash, sformat ("cp -- '%1/config.xml' '%2'", + String::Quote (base_path), String::Quote (backup))); } file_path = slepos_path; } Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs… ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Wed Mar 7 16:32:12 2012 @@ -1343,16 +1343,30 @@ ProductCreator::MarkTaboo (maplist (map i, pmap["ignore"]:[], ``(i["name"]:""))); - foreach (map p, KiwiConfig["packages",index,"package"]:[], { + // remember bootinclude packages: in Package selector we will lose this information (bnc#750739) + map bi_packages = $[]; + foreach (map p, KiwiConfig["packages",index,"package"]:[], { + if (p["bootinclude"]:"" == "true") + { + bi_packages[p["name"]:""] = true; + } InstallPackageOrProvider (p["name"]:""); - }); - + }); boolean solved = Pkg::PkgSolve (true); if (!solved) { map sw_contents = modifyPackageSelection (KiwiConfig["packages",index]:$[]); if (sw_contents != nil) { + sw_contents["package"] = maplist (map p, sw_contents["package"]:[], { + string name = p["name"]:""; + if (bi_packages[name]:false) + { + y2milestone ("package %1 was marked as bootinclude", name); + p["bootinclude"] = "true"; + } + return p; + }); KiwiConfig["packages",index] = sw_contents; } else -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67584 - /tags/branch-Code-11-SP2-2_17_49/product-creator/
by jsuchome＠svn2.opensuse.org 07 Mar '12

07 Mar '12

Author: jsuchome Date: Wed Mar 7 16:30:05 2012 New Revision: 67584 URL: http://svn.opensuse.org/viewcvs/yast?rev=67584&view=rev Log: Created tag branch-Code-11-SP2-2_17_49 for product-creator Added: tags/branch-Code-11-SP2-2_17_49/product-creator/ (props changed) - copied from r67583, branches/SuSE-Code-11-SP2-Branch/product-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67583 - in /branches/SuSE-Code-11-SP2-Branch/product-creator: VERSION package/yast2-product-creator.changes src/Kiwi.ycp src/kiwi_dialogs.ycp
by jsuchome＠svn2.opensuse.org 07 Mar '12

07 Mar '12

Author: jsuchome Date: Wed Mar 7 16:29:54 2012 New Revision: 67583 URL: http://svn.opensuse.org/viewcvs/yast?rev=67583&view=rev Log: - do not discard bootinclude packages after conflict (bnc#750739) - backup the original version of config.xml (bnc#750989) - 2.17.49 Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-Code-11-SP2-Branch/product-creator/src/Kiwi.ycp branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION Wed Mar 7 16:29:54 2012 @@ -1 +1 @@ -2.17.48 +2.17.49 Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes Wed Mar 7 16:29:54 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Mar 7 16:19:01 CET 2012 - jsuchome(a)suse.cz + +- do not discard bootinclude packages after conflict (bnc#750739) +- backup the original version of config.xml (bnc#750989) +- 2.17.49 + +------------------------------------------------------------------- Tue Mar 6 17:32:14 CET 2012 - jsuchome(a)suse.cz - new check for conflicting delete packages (bnc#748488) Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/product-creator/src/Kiwi.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/product-creator/src/Kiwi.ycp Wed Mar 7 16:29:54 2012 @@ -274,8 +274,8 @@ { string backup = base_path + "/config.xml.POSsave"; y2milestone ("creating backup of config file: %1", backup); - SCR::Execute (.target.bash, sformat ("cp -- '%1' '%2'", - String::Quote (file_path), String::Quote (backup))); + SCR::Execute (.target.bash, sformat ("cp -- '%1/config.xml' '%2'", + String::Quote (base_path), String::Quote (backup))); } file_path = slepos_path; } Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp Wed Mar 7 16:29:54 2012 @@ -1323,16 +1323,30 @@ ProductCreator::MarkTaboo (maplist (map i, pmap["ignore"]:[], ``(i["name"]:""))); - foreach (map p, KiwiConfig["packages",index,"package"]:[], { + // remember bootinclude packages: in Package selector we will lose this information (bnc#750739) + map bi_packages = $[]; + foreach (map p, KiwiConfig["packages",index,"package"]:[], { + if (p["bootinclude"]:"" == "true") + { + bi_packages[p["name"]:""] = true; + } InstallPackageOrProvider (p["name"]:""); - }); - + }); boolean solved = Pkg::PkgSolve (true); if (!solved) { map sw_contents = modifyPackageSelection (KiwiConfig["packages",index]:$[]); if (sw_contents != nil) { + sw_contents["package"] = maplist (map p, sw_contents["package"]:[], { + string name = p["name"]:""; + if (bi_packages[name]:false) + { + y2milestone ("package %1 was marked as bootinclude", name); + p["bootinclude"] = "true"; + } + return p; + }); KiwiConfig["packages",index] = sw_contents; } else -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67582 - in /branches/SuSE-Code-11-SP2-Branch/network: ./ package/yast2-network.changes src/installation/dialogs.ycp
by mvidner＠svn2.opensuse.org 07 Mar '12

07 Mar '12

Author: mvidner Date: Wed Mar 7 16:00:10 2012 New Revision: 67582 URL: http://svn.opensuse.org/viewcvs/yast?rev=67582&view=rev Log: internet test: "Abort > Continue Installation" should not abort (bnc#748251) merged from trunk Modified: branches/SuSE-Code-11-SP2-Branch/network/ (props changed) branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP2-Branch/network/src/installation/dialogs.ycp Modified: branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes Wed Mar 7 16:00:10 2012 @@ -6,6 +6,12 @@ - 2.17.172 ------------------------------------------------------------------- +Wed Feb 29 11:39:49 CET 2012 - jsuchome(a)suse.cz + +- internet test: "Abort > Continue Installation" should not abort + (bnc#748251) + +------------------------------------------------------------------- Fri Feb 3 13:52:59 CET 2012 - mvidner(a)suse.cz - Fix detection of properly configured LCS and CTC devices (bnc#741071#c20) Modified: branches/SuSE-Code-11-SP2-Branch/network/src/installation/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/installation/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/installation/dialogs.ycp Wed Mar 7 16:00:10 2012 @@ -207,6 +207,7 @@ exit=true; break; } + break; case `next: case `back: exit=true; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67581 - /trunk/network/package/yast2-network.changes
by mvidner＠svn2.opensuse.org 07 Mar '12

07 Mar '12

Author: mvidner Date: Wed Mar 7 15:48:02 2012 New Revision: 67581 URL: http://svn.opensuse.org/viewcvs/yast?rev=67581&view=rev Log: a more informative changelog item Modified: trunk/network/package/yast2-network.changes Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Wed Mar 7 15:48:02 2012 @@ -8,7 +8,8 @@ ------------------------------------------------------------------- Wed Feb 29 11:39:49 CET 2012 - jsuchome(a)suse.cz -- missing break at the end of case statement (bnc#748251) +- internet test: "Abort > Continue Installation" should not abort + (bnc#748251) ------------------------------------------------------------------- Mon Feb 27 09:38:49 UTC 2012 - mfilka(a)suse.com -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67580 - in /trunk/network: ./ VERSION package/yast2-network.changes src/modules/Lan.ycp
by mvidner＠svn2.opensuse.org 07 Mar '12

07 Mar '12

Author: mvidner Date: Wed Mar 7 15:47:08 2012 New Revision: 67580 URL: http://svn.opensuse.org/viewcvs/yast?rev=67580&view=rev Log: Sleep between writing udev rules and ifcfgs so that rcnetwork reload works (bnc#749365) merged c67572 from sp2 Modified: trunk/network/ (props changed) trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/modules/Lan.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=67580&r1=675… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Wed Mar 7 15:47:08 2012 @@ -1 +1 @@ -2.22.4 +2.22.5 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Wed Mar 7 15:47:08 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Mar 7 11:10:31 CET 2012 - mvidner(a)suse.cz + +- Sleep between writing udev rules and ifcfgs so that + rcnetwork reload works (bnc#749365) +- 2.22.5 + +------------------------------------------------------------------- Wed Feb 29 11:39:49 CET 2012 - jsuchome(a)suse.cz - missing break at the end of case statement (bnc#748251) Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=… ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Wed Mar 7 15:47:08 2012 @@ -431,6 +431,11 @@ ProgressNextStage(_("Writing device configuration...")); if (!Mode::autoinst() && LanUdevAuto::AllowUdevModify()) { LanItems::WriteUdevDriverRules(); + // wait so that ifcfgs written in NetworkInterfaces are newer + // (1-second-wise) than netcontrol status files, + // and rcnetwork reload actually works (bnc#749365) + SCR::Execute(.target.bash, "udevadm settle"); + sleep(1000); } // hack: no "netcard" filter as biosdevname names it diferently (bnc#712232) NetworkInterfaces::Write(""); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67579 - /tags/stable-2_22_2/ncurses-pkg/
by gs＠svn2.opensuse.org 07 Mar '12

07 Mar '12

Author: gs Date: Wed Mar 7 12:36:15 2012 New Revision: 67579 URL: http://svn.opensuse.org/viewcvs/yast?rev=67579&view=rev Log: Created tag stable-2_22_2 for ncurses-pkg Added: tags/stable-2_22_2/ncurses-pkg/ - copied from r67578, trunk/ncurses-pkg/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67578 - /tags/stable-2_22_2/ncurses-pkg/
by gs＠svn2.opensuse.org 07 Mar '12

07 Mar '12

Author: gs Date: Wed Mar 7 12:35:38 2012 New Revision: 67578 URL: http://svn.opensuse.org/viewcvs/yast?rev=67578&view=rev Log: retag version Removed: tags/stable-2_22_2/ncurses-pkg/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67577 - /trunk/ncurses-pkg/src/NCPkgPackageDetails.cc
by gs＠svn2.opensuse.org 07 Mar '12

07 Mar '12

Author: gs Date: Wed Mar 7 12:33:48 2012 New Revision: 67577 URL: http://svn.opensuse.org/viewcvs/yast?rev=67577&view=rev Log: revert change regarding authors line (authors will disappear from description Modified: trunk/ncurses-pkg/src/NCPkgPackageDetails.cc Modified: trunk/ncurses-pkg/src/NCPkgPackageDetails.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPackageDeta… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPackageDetails.cc (original) +++ trunk/ncurses-pkg/src/NCPkgPackageDetails.cc Wed Mar 7 12:33:48 2012 @@ -358,10 +358,7 @@ ul_found = false; ul_begin = false; } - else if ( curr_line.Str().substr(0,8) != "--------" ) - { - html_descr.append( NCstring(" " + curr_line.Str()) ); - } + html_descr.append( NCstring(" " + curr_line.Str()) ); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67576 - /tags/stable-2_22_2/ncurses-pkg/
by gs＠svn2.opensuse.org 07 Mar '12

07 Mar '12

Author: gs Date: Wed Mar 7 12:20:34 2012 New Revision: 67576 URL: http://svn.opensuse.org/viewcvs/yast?rev=67576&view=rev Log: Created tag stable-2_22_2 for ncurses-pkg Added: tags/stable-2_22_2/ncurses-pkg/ - copied from r67575, trunk/ncurses-pkg/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67575 - in /trunk/ncurses-pkg: VERSION package/yast2-ncurses-pkg.changes
by gs＠svn2.opensuse.org 07 Mar '12

07 Mar '12

Author: gs Date: Wed Mar 7 12:20:19 2012 New Revision: 67575 URL: http://svn.opensuse.org/viewcvs/yast?rev=67575&view=rev Log: 2.22.2 Modified: trunk/ncurses-pkg/VERSION trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes Modified: trunk/ncurses-pkg/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/VERSION?rev=67575&r1… ============================================================================== --- trunk/ncurses-pkg/VERSION (original) +++ trunk/ncurses-pkg/VERSION Wed Mar 7 12:20:19 2012 @@ -1 +1 @@ -2.22.1 +2.22.2 Modified: trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/package/yast2-ncurse… ============================================================================== --- trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes (original) +++ trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes Wed Mar 7 12:20:19 2012 @@ -1,7 +1,13 @@ ------------------------------------------------------------------- +Tue Mar 6 13:25:45 CET 2012 - gs(a)suse.de + +- Better formatting also for notify messages (bnc #746876) +- 2.22.2 + +------------------------------------------------------------------- Thu Mar 1 14:34:21 CET 2012 - gs(a)suse.de -- Better formatting of package and patch descriptions +- Better formatting of package and patch descriptions (bnc #691572) - 2.22.1 ------------------------------------------------------------------- -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67574 - /trunk/ncurses-pkg/src/NCPkgPackageDetails.cc
by gs＠svn2.opensuse.org 07 Mar '12

07 Mar '12

Author: gs Date: Wed Mar 7 12:12:46 2012 New Revision: 67574 URL: http://svn.opensuse.org/viewcvs/yast?rev=67574&view=rev Log: don't show authors parting line Modified: trunk/ncurses-pkg/src/NCPkgPackageDetails.cc Modified: trunk/ncurses-pkg/src/NCPkgPackageDetails.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPackageDeta… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPackageDetails.cc (original) +++ trunk/ncurses-pkg/src/NCPkgPackageDetails.cc Wed Mar 7 12:12:46 2012 @@ -358,7 +358,10 @@ ul_found = false; ul_begin = false; } - html_descr.append( NCstring(" " + curr_line.Str()) ); + else if ( curr_line.Str().substr(0,8) != "--------" ) + { + html_descr.append( NCstring(" " + curr_line.Str()) ); + } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67573 - /trunk/ncurses-pkg/src/NCPkgPackageDetails.cc
by gs＠svn2.opensuse.org 07 Mar '12

07 Mar '12

Author: gs Date: Wed Mar 7 12:06:20 2012 New Revision: 67573 URL: http://svn.opensuse.org/viewcvs/yast?rev=67573&view=rev Log: if available take installed pkg pointer to get package data Modified: trunk/ncurses-pkg/src/NCPkgPackageDetails.cc Modified: trunk/ncurses-pkg/src/NCPkgPackageDetails.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPackageDeta… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPackageDetails.cc (original) +++ trunk/ncurses-pkg/src/NCPkgPackageDetails.cc Wed Mar 7 12:06:20 2012 @@ -92,7 +92,10 @@ { if ( oneline && i < 999 ) { - text += ", "; + if ( boost::ends_with( text, ":" ) ) + text += " "; + else + text += ", "; } else { @@ -179,7 +182,15 @@ text += pkgPtr->installSize().asString(); text += " "; - ZyppPkg package = tryCastToZyppPkg (pkgPtr); + ZyppPkg package; + ZyppPkg candidate = tryCastToZyppPkg( slbPtr->candidateObj() ); + ZyppPkg installed = tryCastToZyppPkg( slbPtr->installedObj() ); + + if ( installed ) + package = installed; + else + package = candidate; + if ( package ) { // add the media nr @@ -211,11 +222,15 @@ list<string> authors = package->authors(); // zypp::Package if ( !authors.empty() ) { + string author_text; text += NCPkgStrings::Authors(); //authors, in one line - text += createText( authors, true ); + author_text = createText( authors, true ); + // escape html + boost::replace_all( author_text, "<", "<" ); + boost::replace_all( author_text, ">", ">" ); + text += author_text; } - } setValue (text); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67572 - in /branches/SuSE-Code-11-SP2-Branch/network: VERSION package/yast2-network.changes src/modules/Lan.ycp
by mvidner＠svn2.opensuse.org 07 Mar '12

07 Mar '12

Author: mvidner Date: Wed Mar 7 11:16:40 2012 New Revision: 67572 URL: http://svn.opensuse.org/viewcvs/yast?rev=67572&view=rev Log: Sleep between writing udev rules and ifcfgs (bnc#749365) so that rcnetwork reload works Modified: branches/SuSE-Code-11-SP2-Branch/network/VERSION branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP2-Branch/network/src/modules/Lan.ycp Modified: branches/SuSE-Code-11-SP2-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/network/VERSION Wed Mar 7 11:16:40 2012 @@ -1 +1 @@ -2.17.171 +2.17.172 Modified: branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes Wed Mar 7 11:16:40 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Mar 7 11:10:31 CET 2012 - mvidner(a)suse.cz + +- Sleep between writing udev rules and ifcfgs so that + rcnetwork reload works (bnc#749365) +- 2.17.172 + +------------------------------------------------------------------- Fri Feb 3 13:52:59 CET 2012 - mvidner(a)suse.cz - Fix detection of properly configured LCS and CTC devices (bnc#741071#c20) Modified: branches/SuSE-Code-11-SP2-Branch/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/modules/Lan.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/modules/Lan.ycp Wed Mar 7 11:16:40 2012 @@ -462,6 +462,11 @@ ProgressNextStage(_("Writing device configuration...")); if (!Mode::autoinst() && LanUdevAuto::AllowUdevModify()) { LanItems::WriteUdevDriverRules(); + // wait so that ifcfgs written in NetworkInterfaces are newer + // (1-second-wise) than netcontrol status files, + // and rcnetwork reload actually works (bnc#749365) + SCR::Execute(.target.bash, "udevadm settle"); + sleep(1000); } // hack: no "netcard" filter as biosdevname names it diferently (bnc#712232) NetworkInterfaces::Write(""); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67571 - /tags/stable-2_22_3/product-creator/
by jsuchome＠svn2.opensuse.org 07 Mar '12

07 Mar '12

Author: jsuchome Date: Wed Mar 7 09:37:22 2012 New Revision: 67571 URL: http://svn.opensuse.org/viewcvs/yast?rev=67571&view=rev Log: Created tag stable-2_22_3 for product-creator Added: tags/stable-2_22_3/product-creator/ - copied from r67570, trunk/product-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67570 - in /trunk/product-creator: VERSION package/yast2-product-creator.changes src/Kiwi.ycp src/kiwi_dialogs.ycp
by jsuchome＠svn2.opensuse.org 07 Mar '12

07 Mar '12

Author: jsuchome Date: Wed Mar 7 09:37:11 2012 New Revision: 67570 URL: http://svn.opensuse.org/viewcvs/yast?rev=67570&view=rev Log: - new check for conflicting delete packages (bnc#748488) - allow writing empty package list (bnc#749029) - 2.22.3 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/Kiwi.ycp trunk/product-creator/src/kiwi_dialogs.ycp Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=6757… ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Wed Mar 7 09:37:11 2012 @@ -1 +1 @@ -2.22.2 +2.22.3 Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Wed Mar 7 09:37:11 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Mar 7 09:18:05 CET 2012 - jsuchome(a)suse.cz + +- new check for conflicting delete packages (bnc#748488) +- allow writing empty package list (bnc#749029) +- 2.22.3 + +------------------------------------------------------------------- Wed Feb 22 13:19:58 CET 2012 - jsuchome(a)suse.cz - do not show duplicates in locale entry (bnc#748122) Modified: trunk/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/Kiwi.ycp?rev… ============================================================================== --- trunk/product-creator/src/Kiwi.ycp (original) +++ trunk/product-creator/src/Kiwi.ycp Wed Mar 7 09:37:11 2012 @@ -417,7 +417,6 @@ size (packagemap["package"]:[]) == 0) { y2milestone ("no patterns/packages in %1", packagemap); - return; } image_contents = image_contents + MapAny2XML ("packages", packagemap, 1) + "\n"; Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs… ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Wed Mar 7 09:37:11 2012 @@ -382,9 +382,54 @@ } /** + * check the conflicts between packages selected and marked for deletion (fate#305254) + * @param packages_before map of packages already selected before entering package selector + */ + define boolean CheckForDeletedPackages (map packages_before) { + + y2milestone ("checking list of selected packages..."); + StoreSWDelete ("delete_sw", $[]); + map to_delete = $[]; + foreach (map pmap, KiwiConfig["packages"]:[], { + string type = pmap["type"]:""; + if (type == "delete") + { + to_delete = listmap (map pacmap, pmap["package"]:[], ``( + $[ pacmap["name"]:"" : true ]) + ); + } + }); + boolean conflicting = false; + if (size (to_delete) > 0) + { + foreach (map package, Pkg::ResolvableProperties("", `package, ""), { + if (conflicting) + break; + string name = package["name"]:""; + // only look at packages selected in last package selector run + if (package["status"]:nil == `selected && !haskey (packages_before, name)) + { + symbol transact_by = package["transact_by"]:`none; + if (transact_by == `solver || transact_by == `user || transact_by == `app_high) + { + if (haskey (to_delete, name)) + { + y2milestone ("packege %1 selected by %2 is present in the delete list", + name, transact_by); + conflicting = true; + } + } + } + }); + } + return conflicting; + } + + /** * Handler for software selection */ define symbol HandleSWSelection (string key, map event) { + if (event["ID"]:nil == key) { integer package_set = KiwiConfig["package_set"]:0; @@ -396,10 +441,12 @@ } map sw_contents = KiwiConfig["packages",package_set]:$[]; + map packages_before = $[]; // separate bootinclude packages from normal ones list bi_packages = []; sw_contents["package"] = filter (map p, sw_contents["package"]:[], { + packages_before[p["name"]:""] = true; if (p["bootinclude"]:"" == "true") bi_packages = add (bi_packages, p); return p["bootinclude"]:"" != "true"; @@ -411,7 +458,18 @@ } else { - sw_contents = modifyPackageSelection (sw_contents); + boolean again = true; + while (again) + { + sw_contents = modifyPackageSelection (sw_contents); + again = CheckForDeletedPackages (packages_before); + if (again && Popup::YesNo (_("Some of the packages that are selected for installation +are also included in the list for deletion. +Continue anyway?"))) + { + again = false; + } + } } if (sw_contents != nil && bi_packages != nil) @@ -1308,6 +1366,7 @@ return ret; } + /** * handler for main action: create the iso image with kiwi */ @@ -1315,45 +1374,6 @@ if (event["ID"]:nil != `next) return true; - // check the conflicts between packages selected and marked for deletion (fate#305254) - y2milestone ("checking list of selected packages..."); - map to_delete = $[]; - foreach (map pmap, KiwiConfig["packages"]:[], { - string type = pmap["type"]:""; - if (type == "delete") - { - to_delete = listmap (map pacmap, pmap["package"]:[], ``( - $[ pacmap["name"]:"" : true ]) - ); - } - }); - boolean conflicting = false; - if (size (to_delete) > 0) - { - foreach (map package, Pkg::ResolvableProperties("", `package, ""), { - if (conflicting) - break; - if (package["status"]:nil == `selected) - { - symbol transact_by = package["transact_by"]:`none; - string name = package["name"]:""; - if (transact_by == `solver || transact_by == `user || transact_by == `app_high) - { - if (haskey (to_delete, name)) - { - y2milestone ("packege %1 selected by %2 is present in the delete list", - name, transact_by); - conflicting = true; - } - } - } - }); - } - // yes/no popup - if (conflicting && !Popup::YesNo (_("Some of the packages that are selected for installation -are also included in the list for deletion. -Continue anyway?"))) - return false; boolean ret = true; map question = $[ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67569 - /tags/branch-Code-11-SP2-2_17_48/product-creator/
by jsuchome＠svn2.opensuse.org 06 Mar '12

06 Mar '12

Author: jsuchome Date: Tue Mar 6 17:44:43 2012 New Revision: 67569 URL: http://svn.opensuse.org/viewcvs/yast?rev=67569&view=rev Log: Created tag branch-Code-11-SP2-2_17_48 for product-creator Added: tags/branch-Code-11-SP2-2_17_48/product-creator/ (props changed) - copied from r67568, branches/SuSE-Code-11-SP2-Branch/product-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67568 - in /branches/SuSE-Code-11-SP2-Branch/product-creator: VERSION package/yast2-product-creator.changes src/Kiwi.ycp src/kiwi_dialogs.ycp
by jsuchome＠svn2.opensuse.org 06 Mar '12

06 Mar '12

Author: jsuchome Date: Tue Mar 6 17:44:20 2012 New Revision: 67568 URL: http://svn.opensuse.org/viewcvs/yast?rev=67568&view=rev Log: - new check for conflicting delete packages (bnc#748488) - allow writing empty package list (bnc#749029) - 2.17.48 Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-Code-11-SP2-Branch/product-creator/src/Kiwi.ycp branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION Tue Mar 6 17:44:20 2012 @@ -1 +1 @@ -2.17.47 +2.17.48 Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes Tue Mar 6 17:44:20 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Mar 6 17:32:14 CET 2012 - jsuchome(a)suse.cz + +- new check for conflicting delete packages (bnc#748488) +- allow writing empty package list (bnc#749029) +- 2.17.48 + +------------------------------------------------------------------- Wed Feb 22 08:07:48 CET 2012 - jsuchome(a)suse.cz - do not show duplicates in locale entry (bnc#748122) Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/product-creator/src/Kiwi.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/product-creator/src/Kiwi.ycp Tue Mar 6 17:44:20 2012 @@ -397,7 +397,6 @@ size (packagemap["package"]:[]) == 0) { y2milestone ("no patterns/packages in %1", packagemap); - return; } image_contents = image_contents + MapAny2XML ("packages", packagemap, 1) + "\n"; Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp Tue Mar 6 17:44:20 2012 @@ -362,9 +362,54 @@ } /** + * check the conflicts between packages selected and marked for deletion (fate#305254) + * @param packages_before map of packages already selected before entering package selector + */ + define boolean CheckForDeletedPackages (map packages_before) { + + y2milestone ("checking list of selected packages..."); + StoreSWDelete ("delete_sw", $[]); + map to_delete = $[]; + foreach (map pmap, KiwiConfig["packages"]:[], { + string type = pmap["type"]:""; + if (type == "delete") + { + to_delete = listmap (map pacmap, pmap["package"]:[], ``( + $[ pacmap["name"]:"" : true ]) + ); + } + }); + boolean conflicting = false; + if (size (to_delete) > 0) + { + foreach (map package, Pkg::ResolvableProperties("", `package, ""), { + if (conflicting) + break; + string name = package["name"]:""; + // only look at packages selected in last package selector run + if (package["status"]:nil == `selected && !haskey (packages_before, name)) + { + symbol transact_by = package["transact_by"]:`none; + if (transact_by == `solver || transact_by == `user || transact_by == `app_high) + { + if (haskey (to_delete, name)) + { + y2milestone ("packege %1 selected by %2 is present in the delete list", + name, transact_by); + conflicting = true; + } + } + } + }); + } + return conflicting; + } + + /** * Handler for software selection */ define symbol HandleSWSelection (string key, map event) { + if (event["ID"]:nil == key) { integer package_set = KiwiConfig["package_set"]:0; @@ -376,10 +421,12 @@ } map sw_contents = KiwiConfig["packages",package_set]:$[]; + map packages_before = $[]; // separate bootinclude packages from normal ones list bi_packages = []; sw_contents["package"] = filter (map p, sw_contents["package"]:[], { + packages_before[p["name"]:""] = true; if (p["bootinclude"]:"" == "true") bi_packages = add (bi_packages, p); return p["bootinclude"]:"" != "true"; @@ -391,7 +438,18 @@ } else { - sw_contents = modifyPackageSelection (sw_contents); + boolean again = true; + while (again) + { + sw_contents = modifyPackageSelection (sw_contents); + again = CheckForDeletedPackages (packages_before); + if (again && Popup::YesNo (_("Some of the packages that are selected for installation +are also included in the list for deletion. +Continue anyway?"))) + { + again = false; + } + } } if (sw_contents != nil && bi_packages != nil) @@ -1288,6 +1346,7 @@ return ret; } + /** * handler for main action: create the iso image with kiwi */ @@ -1295,45 +1354,6 @@ if (event["ID"]:nil != `next) return true; - // check the conflicts between packages selected and marked for deletion (fate#305254) - y2milestone ("checking list of selected packages..."); - map to_delete = $[]; - foreach (map pmap, KiwiConfig["packages"]:[], { - string type = pmap["type"]:""; - if (type == "delete") - { - to_delete = listmap (map pacmap, pmap["package"]:[], ``( - $[ pacmap["name"]:"" : true ]) - ); - } - }); - boolean conflicting = false; - if (size (to_delete) > 0) - { - foreach (map package, Pkg::ResolvableProperties("", `package, ""), { - if (conflicting) - break; - if (package["status"]:nil == `selected) - { - symbol transact_by = package["transact_by"]:`none; - string name = package["name"]:""; - if (transact_by == `solver || transact_by == `user || transact_by == `app_high) - { - if (haskey (to_delete, name)) - { - y2milestone ("packege %1 selected by %2 is present in the delete list", - name, transact_by); - conflicting = true; - } - } - } - }); - } - // yes/no popup - if (conflicting && !Popup::YesNo (_("Some of the packages that are selected for installation -are also included in the list for deletion. -Continue anyway?"))) - return false; boolean ret = true; map question = $[ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67567 - in /trunk/perl-bindings/pluglib-bindings: ./ tests/ tests/BloCxx/Hash/ tests/BloCxx/HashList/ tests/std/Hash/ tests/std/HashList/ tests/std/ListAbc/ tests/std/ListHash/ tests/std/ListList/
by mvidner＠svn2.opensuse.org 06 Mar '12

06 Mar '12

Author: mvidner Date: Tue Mar 6 15:08:36 2012 New Revision: 67567 URL: http://svn.opensuse.org/viewcvs/yast?rev=67567&view=rev Log: Fixing the (deactivated) tests - need to run the tests before attempting to fix bnc#535200 - now the C++ part builds Added: trunk/perl-bindings/pluglib-bindings/tests/README Modified: trunk/perl-bindings/pluglib-bindings/Makefile.swig trunk/perl-bindings/pluglib-bindings/Makefile.swig+blocxx trunk/perl-bindings/pluglib-bindings/tests/BloCxx/Hash/test_blocxxHash.cc trunk/perl-bindings/pluglib-bindings/tests/BloCxx/HashList/test_blocxxHash.cc trunk/perl-bindings/pluglib-bindings/tests/std/Hash/test_stdHash.cc trunk/perl-bindings/pluglib-bindings/tests/std/HashList/test_stdHash.cc trunk/perl-bindings/pluglib-bindings/tests/std/ListAbc/test.cc trunk/perl-bindings/pluglib-bindings/tests/std/ListHash/test_stdHash.cc trunk/perl-bindings/pluglib-bindings/tests/std/ListList/test_listList.cc Modified: trunk/perl-bindings/pluglib-bindings/Makefile.swig URL: http://svn.opensuse.org/viewcvs/yast/trunk/perl-bindings/pluglib-bindings/M… ============================================================================== --- trunk/perl-bindings/pluglib-bindings/Makefile.swig (original) +++ trunk/perl-bindings/pluglib-bindings/Makefile.swig Tue Mar 6 15:08:36 2012 @@ -5,7 +5,7 @@ SWIGFLAGS ?= -I$(BASEDIR)/swig -c++ -CXXFLAGS ?= -g -O0 +CXXFLAGS ?= -g -O0 -fPIC CPPFLAGS += -I. LDFLAGS ?= -shared LDLIBS ?= -lstdc++ Modified: trunk/perl-bindings/pluglib-bindings/Makefile.swig+blocxx URL: http://svn.opensuse.org/viewcvs/yast/trunk/perl-bindings/pluglib-bindings/M… ============================================================================== --- trunk/perl-bindings/pluglib-bindings/Makefile.swig+blocxx (original) +++ trunk/perl-bindings/pluglib-bindings/Makefile.swig+blocxx Tue Mar 6 15:08:36 2012 @@ -2,8 +2,8 @@ include $(BASEDIR)/Makefile.swig -BLOCXX_INCLUDES = -I/usr/local/include -BLOCXX_LDFLAGS = -L/usr/local/lib -Xlinker -rpath -Xlinker /usr/local/lib +BLOCXX_INCLUDES = -I/usr/include +BLOCXX_LDFLAGS = -L/usr/lib -Xlinker -rpath -Xlinker /usr/lib BLOCXX_LIBS = -lblocxx SWIGFLAGS += $(BLOCXX_INCLUDES) Modified: trunk/perl-bindings/pluglib-bindings/tests/BloCxx/Hash/test_blocxxHash.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/perl-bindings/pluglib-bindings/t… ============================================================================== --- trunk/perl-bindings/pluglib-bindings/tests/BloCxx/Hash/test_blocxxHash.cc (original) +++ trunk/perl-bindings/pluglib-bindings/tests/BloCxx/Hash/test_blocxxHash.cc Tue Mar 6 15:08:36 2012 @@ -1,5 +1,6 @@ #include <iostream> #include <iterator> +#include <cstdio> #include <blocxx/String.hpp> #include <blocxx/Map.hpp> Modified: trunk/perl-bindings/pluglib-bindings/tests/BloCxx/HashList/test_blocxxHash.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/perl-bindings/pluglib-bindings/t… ============================================================================== --- trunk/perl-bindings/pluglib-bindings/tests/BloCxx/HashList/test_blocxxHash.cc (original) +++ trunk/perl-bindings/pluglib-bindings/tests/BloCxx/HashList/test_blocxxHash.cc Tue Mar 6 15:08:36 2012 @@ -1,5 +1,6 @@ #include <iostream> #include <iterator> +#include <cstdio> #include <blocxx/String.hpp> #include <blocxx/Map.hpp> Added: trunk/perl-bindings/pluglib-bindings/tests/README URL: http://svn.opensuse.org/viewcvs/yast/trunk/perl-bindings/pluglib-bindings/t… ============================================================================== --- trunk/perl-bindings/pluglib-bindings/tests/README (added) +++ trunk/perl-bindings/pluglib-bindings/tests/README Tue Mar 6 15:08:36 2012 @@ -0,0 +1,8 @@ +The tests directory is currently excluded from automake SUBDIRS +because +1) it does not use automake +2) the tests don't pass + +Anyway, work on (2) by iterating + make -C pluglib-bindings/tests all check + fix what is broken Modified: trunk/perl-bindings/pluglib-bindings/tests/std/Hash/test_stdHash.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/perl-bindings/pluglib-bindings/t… ============================================================================== --- trunk/perl-bindings/pluglib-bindings/tests/std/Hash/test_stdHash.cc (original) +++ trunk/perl-bindings/pluglib-bindings/tests/std/Hash/test_stdHash.cc Tue Mar 6 15:08:36 2012 @@ -1,5 +1,6 @@ #include <iostream> #include <iterator> +#include <cstdio> #include <string> #include <map> Modified: trunk/perl-bindings/pluglib-bindings/tests/std/HashList/test_stdHash.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/perl-bindings/pluglib-bindings/t… ============================================================================== --- trunk/perl-bindings/pluglib-bindings/tests/std/HashList/test_stdHash.cc (original) +++ trunk/perl-bindings/pluglib-bindings/tests/std/HashList/test_stdHash.cc Tue Mar 6 15:08:36 2012 @@ -1,5 +1,6 @@ #include <iostream> #include <iterator> +#include <cstdio> #include <string> #include <map> Modified: trunk/perl-bindings/pluglib-bindings/tests/std/ListAbc/test.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/perl-bindings/pluglib-bindings/t… ============================================================================== --- trunk/perl-bindings/pluglib-bindings/tests/std/ListAbc/test.cc (original) +++ trunk/perl-bindings/pluglib-bindings/tests/std/ListAbc/test.cc Tue Mar 6 15:08:36 2012 @@ -1,5 +1,6 @@ #include <iostream> #include <iterator> +#include <cstdio> #include <list> Modified: trunk/perl-bindings/pluglib-bindings/tests/std/ListHash/test_stdHash.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/perl-bindings/pluglib-bindings/t… ============================================================================== --- trunk/perl-bindings/pluglib-bindings/tests/std/ListHash/test_stdHash.cc (original) +++ trunk/perl-bindings/pluglib-bindings/tests/std/ListHash/test_stdHash.cc Tue Mar 6 15:08:36 2012 @@ -1,5 +1,6 @@ #include <iostream> #include <iterator> +#include <cstdio> #include <string> #include <map> Modified: trunk/perl-bindings/pluglib-bindings/tests/std/ListList/test_listList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/perl-bindings/pluglib-bindings/t… ============================================================================== --- trunk/perl-bindings/pluglib-bindings/tests/std/ListList/test_listList.cc (original) +++ trunk/perl-bindings/pluglib-bindings/tests/std/ListList/test_listList.cc Tue Mar 6 15:08:36 2012 @@ -1,5 +1,6 @@ #include <iostream> #include <iterator> +#include <cstdio> #include <list> #include <string> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67566 - in /trunk/qt-pkg: VERSION.cmake package/yast2-qt-pkg.changes src/YQPkgDescriptionView.cc
by tgoettlicher＠svn2.opensuse.org 06 Mar '12

06 Mar '12

Author: tgoettlicher Date: Tue Mar 6 14:37:06 2012 New Revision: 67566 URL: http://svn.opensuse.org/viewcvs/yast?rev=67566&view=rev Log: Fixed bnc#691572: Formatting Package Descriptions (2.21.19) Modified: trunk/qt-pkg/VERSION.cmake trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPkgDescriptionView.cc Modified: trunk/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=67566&r… ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Tue Mar 6 14:37:06 2012 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "18") +SET(VERSION_PATCH "19") Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.chan… ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Tue Mar 6 14:37:06 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Mar 6 14:36:45 CET 2012 - tgoettlicher(a)suse.de + +- Fixed bnc#691572: Formatting Package Descriptions +- Version: 2.21.19 + +------------------------------------------------------------------- Thu Jan 19 16:19:19 CET 2012 - tgoettlicher(a)suse.de - Fixed bnc #734763: yast2 sw_single software management with QT ui Modified: trunk/qt-pkg/src/YQPkgDescriptionView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgDescriptionView.… ============================================================================== --- trunk/qt-pkg/src/YQPkgDescriptionView.cc (original) +++ trunk/qt-pkg/src/YQPkgDescriptionView.cc Tue Mar 6 14:37:06 2012 @@ -164,6 +164,11 @@ { QString line = htmlEscape( *it ).trimmed(); + if ( line.startsWith("* ") || line.startsWith("- ") || line.startsWith("# ") ) + { + line = "<li>" + line + "</li>"; + } + if ( line.startsWith( "Authors:" ) ) { line = "" + line + "<ul>"; @@ -183,6 +188,9 @@ html_text += " " + line; } + + + ++it; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67565 - /trunk/ncurses-pkg/src/NCPkgTable.cc
by gs＠svn2.opensuse.org 06 Mar '12

06 Mar '12

Author: gs Date: Tue Mar 6 13:20:14 2012 New Revision: 67565 URL: http://svn.opensuse.org/viewcvs/yast?rev=67565&view=rev Log: create html text from notify messages Modified: trunk/ncurses-pkg/src/NCPkgTable.cc Modified: trunk/ncurses-pkg/src/NCPkgTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgTable.cc?re… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgTable.cc (original) +++ trunk/ncurses-pkg/src/NCPkgTable.cc Tue Mar 6 13:20:14 2012 @@ -300,9 +300,10 @@ if ( ok && !notify.empty() ) { + string html_text = packager->InfoText()->createHtmlText( notify ); NCPopupInfo * info = new NCPopupInfo( wpos( (lines * 35)/100, (cols * 25)/100), header, - "" + pkgName + " " + notify + "" + pkgName + " " + html_text ); info->setPreferredSize( (NCurses::cols() * 50)/100, (NCurses::lines() * 30)/100); info->showInfoPopup( ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0