Author: lslezak Date: Tue Jul 19 20:36:41 2011 New Revision: 64899 URL: http://svn.opensuse.org/viewcvs/yast?rev=64899&view=rev Log: backport from SP2 branch: - Pkg::ZConfig() - removed solver_cleandeps_on_remove value (not present in SP2) - removed duplicate License tag from *.spec (added by devtools) Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/ (props changed) branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.cc branches/SuSE-Code-11-SP1-Branch/pkg-bindings/yast2-pkg-bindings.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.cc?rev=64899&r1=64898&r2=64899&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.cc Tue Jul 19 20:36:41 2011 @@ -334,7 +334,7 @@ ret->add(YCPString("solver_only_requires"), YCPBoolean(zconfig.solver_onlyRequires())); ret->add(YCPString("solver_allow_vendor_change"), YCPBoolean(zconfig.solver_allowVendorChange())); - ret->add(YCPString("solver_cleandeps_on_remove"), YCPBoolean(zconfig.solver_cleandepsOnRemove())); + //ret->add(YCPString("solver_cleandeps_on_remove"), YCPBoolean(zconfig.solver_cleandepsOnRemove())); ret->add(YCPString("solver_upgrade_testcases_to_keep"), YCPBoolean(zconfig.solver_upgradeTestcasesToKeep())); ret->add(YCPString("solver_upgrade_remove_dropped_packages"), YCPBoolean(zconfig.solverUpgradeRemoveDroppedPackages())); ret->add(YCPString("solver_check_system_file"), YCPString(zconfig.solver_checkSystemFile().asString())); Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/yast2-pkg-bindings.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-bindings/yast2-pkg-bindings.spec.in?rev=64899&r1=64898&r2=64899&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/yast2-pkg-bindings.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/yast2-pkg-bindings.spec.in Tue Jul 19 20:36:41 2011 @@ -2,7 +2,6 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen gcc-c++ libgcrypt-devel libxcrypt-devel libxslt perl-XML-Writer sgml-skel yast2-core-devel yast2-devtools BuildRequires: libzypp-devel >= 6.22.0 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org