July 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r64903 - in /branches/SuSE-Code-11-SP1-Branch/pkg-bindings: ./ package/yast2-pkg-bindings.changes src/Package.cc src/PkgFunctions.h
by lslezak＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: lslezak Date: Tue Jul 19 20:43:00 2011 New Revision: 64903 URL: http://svn.opensuse.org/viewcvs/yast?rev=64903&view=rev Log: backport from SP2 branch: - added Pkg::Add/RemoveUpgradeRepo() and Pkg::GetUpgradeRepos() (fate#311994) Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/ (props changed) branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Tue Jul 19 20:43:00 2011 @@ -1,5 +1,6 @@ ------------------------------------------------------------------- +- added Pkg::Add/RemoveUpgradeRepo() and Pkg::GetUpgradeRepos() - added Pkg::CommitPolicy() - support for download in advance mode in yast2-wagon (fate#308951) - added Pkg::Commit() function which accepts commit options map Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc Tue Jul 19 20:43:00 2011 @@ -2346,6 +2346,101 @@ return ret; } +/* + Helper function for adding/removing an upgrade repository +*/ +YCPValue PkgFunctions::AddRemoveUpgradeRepo(const YCPInteger &repo, bool add) +{ + if (repo.isNull()) + { + y2error("Passed nil paramter"); + _last_error.setLastError("Used 'nil' repository ID for upgrade"); + return YCPBoolean(false); + } + + long long repo_id = repo->value(); + YRepo_Ptr r = logFindRepository(repo_id); + if (!r) + { + y2error("Invalid repository ID %lld", repo_id); + _last_error.setLastError("Invalid repository ID " + repo->toString()); + return YCPBoolean(false); + } + + zypp::Repository repository(zypp::ResPool::instance().reposFind(r->repoInfo().alias())); + + if (repository == zypp::Repository::noRepository) + { + y2error("Invalid repository ID %lld", repo_id); + _last_error.setLastError("Invalid repository ID " + repo->toString()); + return YCPBoolean(false); + } + + if (add) + { + y2milestone("Adding upgrade repo %lld", repo_id); + zypp_ptr()->resolver()->addUpgradeRepo(repository); + } + else + { + y2milestone("Removing upgrade repo %lld", repo_id); + zypp_ptr()->resolver()->removeUpgradeRepo(repository); + } + + return YCPBoolean(true); +} + +/** + @builtin AddUpgradeRepo + + @short Add upgrade repository for distribution upgrade + @return boolean true on success +*/ +YCPValue PkgFunctions::AddUpgradeRepo(const YCPInteger &repo) +{ + return AddRemoveUpgradeRepo(repo, true); +} + +/** + @builtin RemoveUpgradeRepo + + @short Remove a repository from upgrade list + @return boolean true on success +*/ +YCPValue PkgFunctions::RemoveUpgradeRepo(const YCPInteger &repo) +{ + return AddRemoveUpgradeRepo(repo, false); +} + +/** + @builtin GetUpgradeRepos + + @short Get list of current upgrade repositories + @return list<integer> all current upgrade repositories +*/ +YCPValue PkgFunctions::GetUpgradeRepos() +{ + YCPList ret; + + unsigned long index = 0; + for_(it, repos.begin(), repos.end()) + { + if (!(*it)->isDeleted()) + { + zypp::Repository repository(zypp::ResPool::instance().reposFind((*it)->repoInfo().alias())); + if (zypp_ptr()->resolver()->upgradingRepo(repository)) + { + ret->add(YCPInteger(index)); + } + } + index++; + } + + std::string result(ret->toString()); + y2milestone("Current upgrade repos: %s", result.c_str()); + return ret; +} + /** @builtin GetBackupPath Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h Tue Jul 19 20:43:00 2011 @@ -232,6 +232,10 @@ YCPValue SourceProvideFileCommon(const YCPInteger &id, const YCPInteger &mid, const YCPString& f, const bool optional, const bool check_signatures, const bool digested); + + // a helper function to add or remove an upgrade repository + YCPValue AddRemoveUpgradeRepo(const YCPInteger &repo, bool add); + public: // general /* TYPEINFO: void() */ @@ -716,6 +720,12 @@ YCPValue Commit (const YCPMap& config); /* TYPEINFO: map<string,any>()*/ YCPValue CommitPolicy(); + /* TYPEINFO: boolean(integer)*/ + YCPValue AddUpgradeRepo(const YCPInteger &repo); + /* TYPEINFO: list<integer>()*/ + YCPValue GetUpgradeRepos(); + /* TYPEINFO: boolean(integer)*/ + YCPValue RemoveUpgradeRepo(const YCPInteger &repo); /* TYPEINFO: boolean(map<string,any>)*/ YCPValue AddLock(const YCPMap &lock); -- 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] r64902 - in /branches/SuSE-Code-11-SP1-Branch/pkg-bindings: ./ src/PkgFunctions.h
by lslezak＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: lslezak Date: Tue Jul 19 20:41:05 2011 New Revision: 64902 URL: http://svn.opensuse.org/viewcvs/yast?rev=64902&view=rev Log: backport from SP2 branch: - fixed type info Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/ (props changed) branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h Tue Jul 19 20:41:05 2011 @@ -714,7 +714,7 @@ YCPValue PkgCommit (const YCPInteger& medianr); /* TYPEINFO: list<any>(map<string,any>)*/ YCPValue Commit (const YCPMap& config); - /* TYPEINFO: map<string,any>*/ + /* TYPEINFO: map<string,any>()*/ YCPValue CommitPolicy(); /* TYPEINFO: boolean(map<string,any>)*/ -- 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] r64901 - in /branches/SuSE-Code-11-SP1-Branch/pkg-bindings: ./ src/Package.cc
by lslezak＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: lslezak Date: Tue Jul 19 20:40:23 2011 New Revision: 64901 URL: http://svn.opensuse.org/viewcvs/yast?rev=64901&view=rev Log: backport from SP2 branch: - fix for SLES11-SP1 libzypp Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/ (props changed) branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc Tue Jul 19 20:40:23 2011 @@ -2107,9 +2107,6 @@ switch (d_mode) { - case zypp::DownloadDefault: - mode = "default"; - break; case zypp::DownloadOnly: mode = "download_only"; break; -- 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] r64900 - in /branches/SuSE-Code-11-SP1-Branch/pkg-bindings: ./ package/yast2-pkg-bindings.changes src/Package.cc src/PkgFunctions.cc src/PkgFunctions.h
by lslezak＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: lslezak Date: Tue Jul 19 20:39:23 2011 New Revision: 64900 URL: http://svn.opensuse.org/viewcvs/yast?rev=64900&view=rev Log: backport from SP2 branch: - implemented download in advance mode support for yast2-wagon (fate#308951) Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/ (props changed) branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.cc branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Tue Jul 19 20:39:23 2011 @@ -1,5 +1,7 @@ ------------------------------------------------------------------- +- added Pkg::CommitPolicy() +- support for download in advance mode in yast2-wagon (fate#308951) - added Pkg::Commit() function which accepts commit options map (with download_mode, dry_run... options) (FATE#308951) - added Pkg::ZConfig() function returning current libzypp config Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc Tue Jul 19 20:39:23 2011 @@ -2015,7 +2015,7 @@ return YCPVoid(); } -YCPValue PkgFunctions::CommitHelper(const zypp::ZYppCommitPolicy &policy) +YCPValue PkgFunctions::CommitHelper(const zypp::ZYppCommitPolicy *policy) { zypp::ZYpp::CommitResult result; @@ -2029,7 +2029,7 @@ last_reported_repo = -1; last_reported_mediumnr = 1; - result = zypp_ptr()->commit(policy); + result = zypp_ptr()->commit(*policy); } catch (const zypp::target::TargetAbortedException & excpt) { @@ -2093,6 +2093,48 @@ return ret; } +YCPValue PkgFunctions::CommitPolicy() +{ + YCPMap ret; + + if (commit_policy == NULL) + { + return ret; + } + + zypp::DownloadMode d_mode = commit_policy->downloadMode(); + std::string mode; + + switch (d_mode) + { + case zypp::DownloadDefault: + mode = "default"; + break; + case zypp::DownloadOnly: + mode = "download_only"; + break; + case zypp::DownloadInAdvance: + mode = "download_in_advance"; + break; + case zypp::DownloadInHeaps: + mode = "download_in_heaps"; + break; + case zypp::DownloadAsNeeded: + mode = "download_as_needed"; + break; + default : + y2error("Unknown download mode"); + } + + if (!mode.empty()) + { + ret->add(YCPString("download_mode"), YCPSymbol(mode)); + } + + + return ret; +} + /** @builtin PkgCommit @@ -2118,10 +2160,15 @@ return YCPError ("Bad args to Pkg::PkgCommit"); } - zypp::ZYppCommitPolicy policy; - policy.restrictToMedia( medianr ); + commit_policy = new zypp::ZYppCommitPolicy; + commit_policy->restrictToMedia(medianr); + + YCPValue ret = CommitHelper(commit_policy); - return CommitHelper(policy); + delete commit_policy; + commit_policy = NULL; + + return ret; } /** @@ -2143,7 +2190,7 @@ /* TYPEINFO: list<any>(integer)*/ YCPValue PkgFunctions::Commit (const YCPMap& config) { - zypp::ZYppCommitPolicy policy; + commit_policy = new zypp::ZYppCommitPolicy; if (!config.isNull()) { @@ -2158,28 +2205,32 @@ if (mode == "default") { - policy.downloadMode(zypp::DownloadDefault); + commit_policy->downloadMode(zypp::DownloadDefault); } else if (mode == "download_only") { - policy.downloadMode(zypp::DownloadOnly); + commit_policy->downloadMode(zypp::DownloadOnly); } else if (mode == "download_in_advance") { - policy.downloadMode(zypp::DownloadInAdvance); + commit_policy->downloadMode(zypp::DownloadInAdvance); } else if (mode == "download_in_heaps") { - policy.downloadMode(zypp::DownloadInHeaps); + commit_policy->downloadMode(zypp::DownloadInHeaps); } else if (mode == "download_as_needed") { - policy.downloadMode(zypp::DownloadAsNeeded); + commit_policy->downloadMode(zypp::DownloadAsNeeded); } else { y2error("Invalid download mode: %s", mode.c_str()); _last_error.setLastError(std::string("Invalid download mode: ") + mode); + + delete commit_policy; + commit_policy = NULL; + return YCPVoid(); } @@ -2189,6 +2240,10 @@ { y2error("Invalid download mode: symbol is required, got: %s", config->value(key)->asString()->value().c_str()); _last_error.setLastError(std::string("Invalid download mode: ") + config->value(key)->asString()->value()); + + delete commit_policy; + commit_policy = NULL; + return YCPVoid(); } } @@ -2200,7 +2255,7 @@ if (config->value(key)->isInteger()) { unsigned medium_nr = config->value(key)->asInteger()->value(); - policy.restrictToMedia(medium_nr); + commit_policy->restrictToMedia(medium_nr); y2milestone("Restricting commit only to medium number: %u", medium_nr); } @@ -2208,6 +2263,10 @@ { y2error("Invalid medium number: integer is required, got: %s", config->value(key)->asString()->value().c_str()); _last_error.setLastError(std::string("Invalid medium number: ") + config->value(key)->asString()->value()); + + delete commit_policy; + commit_policy = NULL; + return YCPVoid(); } } @@ -2219,7 +2278,7 @@ if (config->value(key)->isBoolean()) { bool dry_run = config->value(key)->asBoolean()->value(); - policy.dryRun(dry_run); + commit_policy->dryRun(dry_run); y2milestone("Dry run commit: %s", config->value(key)->asString()->value().c_str()); } @@ -2227,6 +2286,10 @@ { y2error("Dry run option: boolean is required, got: %s", config->value(key)->asString()->value().c_str()); _last_error.setLastError(std::string("Invalid dry run option: ") + config->value(key)->asString()->value()); + + delete commit_policy; + commit_policy = NULL; + return YCPVoid(); } } @@ -2238,7 +2301,7 @@ if (config->value(key)->isBoolean()) { bool exclude_docs = config->value(key)->asBoolean()->value(); - policy.rpmExcludeDocs(exclude_docs); + commit_policy->rpmExcludeDocs(exclude_docs); y2milestone("Excluding documentation: %s", config->value(key)->asString()->value().c_str()); } @@ -2246,6 +2309,10 @@ { y2error("Exclude documentation option: boolean is required, got: %s", config->value(key)->asString()->value().c_str()); _last_error.setLastError(std::string("Invalid exclude documentation option: ") + config->value(key)->asString()->value()); + + delete commit_policy; + commit_policy = NULL; + return YCPVoid(); } } @@ -2257,7 +2324,7 @@ if (config->value(key)->isBoolean()) { bool no_signature = config->value(key)->asBoolean()->value(); - policy.rpmNoSignature(no_signature); + commit_policy->rpmNoSignature(no_signature); y2milestone("Don't check RPM signature: %s", config->value(key)->asString()->value().c_str()); } @@ -2265,12 +2332,21 @@ { y2error("No signature option: boolean is required, got: %s", config->value(key)->asString()->value().c_str()); _last_error.setLastError(std::string("Invalid no signature option: ") + config->value(key)->asString()->value()); + + delete commit_policy; + commit_policy = NULL; + return YCPVoid(); } } } - return CommitHelper(policy); + YCPValue ret = CommitHelper(commit_policy); + + delete commit_policy; + commit_policy = NULL; + + return ret; } /** 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-b… ============================================================================== --- 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:39:23 2011 @@ -61,6 +61,7 @@ _target_root( "/" ) , _target_loaded(false) , zypp_pointer(NULL) + , commit_policy(NULL) ,_callbackHandler( *new CallbackHandler(*this) ) , base_product(NULL) { Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h Tue Jul 19 20:39:23 2011 @@ -49,6 +49,7 @@ #include <zypp/RepoManager.h> #include <zypp/ProgressData.h> #include <zypp/TmpPath.h> +#include <zypp/ZYppCommitPolicy.h> #include <YRepo.h> #include <i18n.h> @@ -195,6 +196,9 @@ YCPMap Resolvable2YCPMap(const zypp::PoolItem &item, const std::string &req_kind, bool dependencies); + // CommitPolicy used for commit + zypp::ZYppCommitPolicy *commit_policy; + private: /** @@ -705,11 +709,13 @@ YCPBoolean PkgSolveCheckTargetOnly (); /* TYPEINFO: integer()*/ YCPValue PkgSolveErrors (); - YCPValue CommitHelper(const zypp::ZYppCommitPolicy &policy); + YCPValue CommitHelper(const zypp::ZYppCommitPolicy *policy); /* TYPEINFO: list<any>(integer)*/ YCPValue PkgCommit (const YCPInteger& medianr); /* TYPEINFO: list<any>(map<string,any>)*/ YCPValue Commit (const YCPMap& config); + /* TYPEINFO: map<string,any>*/ + YCPValue CommitPolicy(); /* TYPEINFO: boolean(map<string,any>)*/ YCPValue AddLock(const YCPMap &lock); -- 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] r64899 - in /branches/SuSE-Code-11-SP1-Branch/pkg-bindings: ./ src/PkgFunctions.cc yast2-pkg-bindings.spec.in
by lslezak＠svn2.opensuse.org 19 Jul '11

19 Jul '11

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-b… ============================================================================== --- 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-b… ============================================================================== --- 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(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64898 - in /branches/SuSE-Code-11-SP1-Branch/pkg-bindings: ./ package/yast2-pkg-bindings.changes src/PkgFunctions.cc src/PkgFunctions.h
by lslezak＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: lslezak Date: Tue Jul 19 20:28:52 2011 New Revision: 64898 URL: http://svn.opensuse.org/viewcvs/yast?rev=64898&view=rev Log: backport from SP2 branch: - added Pkg::ZConfig() function returning current libzypp config (FATE#308951) Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/ (props changed) branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.cc branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Tue Jul 19 20:28:52 2011 @@ -2,6 +2,8 @@ - added Pkg::Commit() function which accepts commit options map (with download_mode, dry_run... options) (FATE#308951) +- added Pkg::ZConfig() function returning current libzypp config + (FATE#308951) ------------------------------------------------------------------- Wed Apr 21 17:22:31 UTC 2010 - lslezak(a)suse.cz 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-b… ============================================================================== --- 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:28:52 2011 @@ -35,6 +35,8 @@ #include <ycp/YCPBoolean.h> #include <ycp/YCPMap.h> #include <ycp/YCPVoid.h> +#include <ycp/YCPSymbol.h> +#include <ycp/YCPList.h> #include <zypp/ZYppFactory.h> @@ -274,3 +276,105 @@ last_reported_repo = repo; last_reported_mediumnr = medium; } + +/** + * @builtin ZConfig + * @short get the current libzypp configuration + * @return map<string,any> libzypp configuration map + */ +YCPValue PkgFunctions::ZConfig() +{ + zypp::ZConfig &zconfig = zypp::ZConfig::instance(); + + YCPMap ret; + + ret->add(YCPString("repo_cache_path"), YCPString(zconfig.repoCachePath().asString())); + ret->add(YCPString("repo_metadata_path"), YCPString(zconfig.repoMetadataPath().asString())); + ret->add(YCPString("repo_solv_files_path"), YCPString(zconfig.repoSolvfilesPath().asString())); + ret->add(YCPString("repo_packages_path"), YCPString(zconfig.repoPackagesPath().asString())); + + ret->add(YCPString("config_path"), YCPString(zconfig.configPath().asString())); + + ret->add(YCPString("known_repos_path"), YCPString(zconfig.knownReposPath().asString())); + ret->add(YCPString("known_services_path"), YCPString(zconfig.knownServicesPath().asString())); + + ret->add(YCPString("repo_add_probe"), YCPBoolean(zconfig.repo_add_probe())); + ret->add(YCPString("repo_refresh_delay"), YCPInteger(zconfig.repo_refresh_delay())); + ret->add(YCPString("repo_label_is_alias"), YCPBoolean(zconfig.repoLabelIsAlias())); + + ret->add(YCPString("download_max_concurrent_connections"), YCPInteger(zconfig.download_max_concurrent_connections())); + ret->add(YCPString("download_min_download_speed"), YCPInteger(zconfig.download_min_download_speed())); + ret->add(YCPString("download_max_download_speed"), YCPInteger(zconfig.download_max_download_speed())); + ret->add(YCPString("download_max_silent_tries"), YCPInteger(zconfig.download_max_silent_tries())); + ret->add(YCPString("download_use_deltarpm"), YCPBoolean(zconfig.download_use_deltarpm())); + ret->add(YCPString("download_use_deltarpm_always"), YCPBoolean(zconfig.download_use_deltarpm_always())); + ret->add(YCPString("download_media_prefer_download"), YCPBoolean(zconfig.download_media_prefer_download())); + ret->add(YCPString("download_media_prefer_volatile"), YCPBoolean(zconfig.download_media_prefer_volatile())); + + const char* dmode; + zypp::DownloadMode dm = zconfig.commit_downloadMode(); + + if (dm == zypp::DownloadDefault) dmode = "default"; + else if (dm == zypp::DownloadInAdvance) dmode = "download_in_advance"; + else if (dm == zypp::DownloadAsNeeded) dmode = "download_as_needed"; + else if (dm == zypp::DownloadInHeaps) dmode = "download_in_heaps"; + else if (dm == zypp::DownloadOnly) dmode = "download_only"; + else dmode = "unknown"; + + ret->add(YCPString("download_mode"), YCPSymbol(dmode)); + + ret->add(YCPString("system_root"), YCPString(zconfig.systemRoot().asString())); + ret->add(YCPString("system_architecture"), YCPString(zconfig.systemArchitecture().asString())); + ret->add(YCPString("system_default_architecture"), YCPString(zconfig.defaultSystemArchitecture().asString())); + + ret->add(YCPString("text_locale_default"), YCPString(zconfig.defaultTextLocale().code())); + ret->add(YCPString("text_locale"), YCPString(zconfig.textLocale().code())); + + ret->add(YCPString("vendor_path"), YCPString(zconfig.vendorPath().asString())); + + 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_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())); + + ret->add(YCPString("locks_file"), YCPString(zconfig.locksFile().asString())); + ret->add(YCPString("locks_file_apply"), YCPBoolean(zconfig.apply_locks_file())); + + ret->add(YCPString("update_data_path"), YCPString(zconfig.update_dataPath().asString())); + ret->add(YCPString("update_messages_path"), YCPString(zconfig.update_messagesPath().asString())); + ret->add(YCPString("update_scripts_path"), YCPString(zconfig.update_scriptsPath().asString())); + ret->add(YCPString("update_messages_notify"), YCPString(zconfig.updateMessagesNotify())); + + YCPList rpm_flags; + zypp::target::rpm::RpmInstFlags flags = zconfig.rpmInstallFlags(); + + if (flags.testFlag(zypp::target::rpm::RPMINST_EXCLUDEDOCS)) rpm_flags->add(YCPString("--excludedocs")); + if (flags.testFlag(zypp::target::rpm::RPMINST_NOSCRIPTS)) rpm_flags->add(YCPString("--noscripts")); + if (flags.testFlag(zypp::target::rpm::RPMINST_FORCE)) rpm_flags->add(YCPString("--force")); + if (flags.testFlag(zypp::target::rpm::RPMINST_IGNORESIZE)) rpm_flags->add(YCPString("--ignoresize")); + if (flags.testFlag(zypp::target::rpm::RPMINST_JUSTDB)) rpm_flags->add(YCPString("--justdb")); + if (flags.testFlag(zypp::target::rpm::RPMINST_NODEPS)) rpm_flags->add(YCPString("--nodeps")); + if (flags.testFlag(zypp::target::rpm::RPMINST_NODIGEST)) rpm_flags->add(YCPString("--nodigest")); + if (flags.testFlag(zypp::target::rpm::RPMINST_NOSIGNATURE)) rpm_flags->add(YCPString("--nosignature")); + if (flags.testFlag(zypp::target::rpm::RPMINST_TEST)) rpm_flags->add(YCPString("--test")); + + if (flags.testFlag(zypp::target::rpm::RPMINST_NOUPGRADE)) + rpm_flags->add(YCPString("-i")); + else + rpm_flags->add(YCPString("-U")); + + ret->add(YCPString("rpm_install_flags"), rpm_flags); + + ret->add(YCPString("history_log_file"), YCPString(zconfig.historyLogFile().asString())); + + ret->add(YCPString("credentials_global_dir"), YCPString(zconfig.credentialsGlobalDir().asString())); + ret->add(YCPString("credentials_global_file"), YCPString(zconfig.credentialsGlobalFile().asString())); + + ret->add(YCPString("plugins_path"), YCPString(zconfig.pluginsPath().asString())); + + ret->add(YCPString("distro_version_pkg"), YCPString(zconfig.distroverpkg())); + + return ret; +} Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h Tue Jul 19 20:28:52 2011 @@ -826,6 +826,9 @@ /* TYPEINFO: boolean(string)*/ YCPValue ServiceSave(const YCPString &alias); + // configuration related functions + /* TYPEINFO: map<string,any>()*/ + YCPValue ZConfig(); YCPValue ResolvablePropertiesEx(const YCPString& name, const YCPSymbol& kind_r, const YCPString& version, bool dependencies); YCPValue ResolvableSetPatches(const YCPSymbol& kind_r, bool preselect); -- 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] r64897 - in /branches/SuSE-Code-11-SP1-Branch/pkg-bindings: ./ package/yast2-pkg-bindings.changes src/Package.cc src/PkgFunctions.h
by lslezak＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: lslezak Date: Tue Jul 19 20:26:35 2011 New Revision: 64897 URL: http://svn.opensuse.org/viewcvs/yast?rev=64897&view=rev Log: backport from SP2 branch: - added Pkg::Commit() function which accepts commit options map (with download_mode, dry_run... options) (FATE#308951) Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/ (props changed) branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Tue Jul 19 20:26:35 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- + +- added Pkg::Commit() function which accepts commit options map + (with download_mode, dry_run... options) (FATE#308951) + +------------------------------------------------------------------- Wed Apr 21 17:22:31 UTC 2010 - lslezak(a)suse.cz - reload services after refresh to avoid overwriting the updated Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc Tue Jul 19 20:26:35 2011 @@ -2015,31 +2015,8 @@ return YCPVoid(); } -/** - @builtin PkgCommit - - @short Commit package changes (actually install/delete packages) - @description - - if medianr == 0, all packages regardless of media are installed - - if medianr > 0, only packages from this media are installed - - @param integer medianr Media Number - @return list [ int successful, list failed, list remaining, list srcremaining ] - The 'successful' value will be negative, if installation was aborted ! - -*/ -YCPValue -PkgFunctions::PkgCommit (const YCPInteger& media) +YCPValue PkgFunctions::CommitHelper(const zypp::ZYppCommitPolicy &policy) { - int medianr = media->value (); - - if (medianr < 0) - { - return YCPError ("Bad args to Pkg::PkgCommit"); - } - zypp::ZYpp::CommitResult result; // clean the last reported source @@ -2052,8 +2029,6 @@ last_reported_repo = -1; last_reported_mediumnr = 1; - zypp::ZYppCommitPolicy policy; - policy.restrictToMedia( medianr ); result = zypp_ptr()->commit(policy); } catch (const zypp::target::TargetAbortedException & excpt) @@ -2119,6 +2094,186 @@ } /** + @builtin PkgCommit + + @short Commit package changes (actually install/delete packages), see also Pkg::Commit() + @description + + if medianr == 0, all packages regardless of media are installed + + if medianr > 0, only packages from this media are installed + + @param integer medianr Media Number + @return list [ int successful, list failed, list remaining, list srcremaining ] + The 'successful' value will be negative, if installation was aborted ! + +*/ +YCPValue +PkgFunctions::PkgCommit (const YCPInteger& media) +{ + int medianr = media->value (); + + if (medianr < 0) + { + return YCPError ("Bad args to Pkg::PkgCommit"); + } + + zypp::ZYppCommitPolicy policy; + policy.restrictToMedia( medianr ); + + return CommitHelper(policy); +} + +/** + * @builtin Commit + * + * @short Commit package changes (actually install/delete packages) + * @description + * + * @param map commit configuration, currently supported values: + * $["download_mode":`default|`download_only|`download_only|`download_in_advance| + * `download_in_heaps|`download_as_needed, "medium_nr":<integer>, + * "dry_run":<boolean>, "exclude_docs":<boolean>, "no_signature":<boolean>], + * the default is $["download_mode":`default, "medium_nr":0 (all media), + * "dry_run":false, "exclude_docs":false, "no_signature":false], + * + * @return list [ int successful, list failed, list remaining, list srcremaining ] + * The 'successful' value will be negative, if installation was aborted ! +*/ +/* TYPEINFO: list<any>(integer)*/ +YCPValue PkgFunctions::Commit (const YCPMap& config) +{ + zypp::ZYppCommitPolicy policy; + + if (!config.isNull()) + { + YCPString key("download_mode"); + + // set the download mode + if(!config->value(key).isNull()) + { + if (config->value(key)->isSymbol()) + { + std::string mode = config->value(key)->asSymbol()->symbol(); + + if (mode == "default") + { + policy.downloadMode(zypp::DownloadDefault); + } + else if (mode == "download_only") + { + policy.downloadMode(zypp::DownloadOnly); + } + else if (mode == "download_in_advance") + { + policy.downloadMode(zypp::DownloadInAdvance); + } + else if (mode == "download_in_heaps") + { + policy.downloadMode(zypp::DownloadInHeaps); + } + else if (mode == "download_as_needed") + { + policy.downloadMode(zypp::DownloadAsNeeded); + } + else + { + y2error("Invalid download mode: %s", mode.c_str()); + _last_error.setLastError(std::string("Invalid download mode: ") + mode); + return YCPVoid(); + } + + y2milestone("Using download mode: %s", mode.c_str()); + } + else + { + y2error("Invalid download mode: symbol is required, got: %s", config->value(key)->asString()->value().c_str()); + _last_error.setLastError(std::string("Invalid download mode: ") + config->value(key)->asString()->value()); + return YCPVoid(); + } + } + + key = YCPString("medium_nr"); + // set the medium number + if(!config->value(key).isNull()) + { + if (config->value(key)->isInteger()) + { + unsigned medium_nr = config->value(key)->asInteger()->value(); + policy.restrictToMedia(medium_nr); + + y2milestone("Restricting commit only to medium number: %u", medium_nr); + } + else + { + y2error("Invalid medium number: integer is required, got: %s", config->value(key)->asString()->value().c_str()); + _last_error.setLastError(std::string("Invalid medium number: ") + config->value(key)->asString()->value()); + return YCPVoid(); + } + } + + key = YCPString("dry_run"); + // set the medium number + if(!config->value(key).isNull()) + { + if (config->value(key)->isBoolean()) + { + bool dry_run = config->value(key)->asBoolean()->value(); + policy.dryRun(dry_run); + + y2milestone("Dry run commit: %s", config->value(key)->asString()->value().c_str()); + } + else + { + y2error("Dry run option: boolean is required, got: %s", config->value(key)->asString()->value().c_str()); + _last_error.setLastError(std::string("Invalid dry run option: ") + config->value(key)->asString()->value()); + return YCPVoid(); + } + } + + key = YCPString("exclude_docs"); + // set the medium number + if(!config->value(key).isNull()) + { + if (config->value(key)->isBoolean()) + { + bool exclude_docs = config->value(key)->asBoolean()->value(); + policy.rpmExcludeDocs(exclude_docs); + + y2milestone("Excluding documentation: %s", config->value(key)->asString()->value().c_str()); + } + else + { + y2error("Exclude documentation option: boolean is required, got: %s", config->value(key)->asString()->value().c_str()); + _last_error.setLastError(std::string("Invalid exclude documentation option: ") + config->value(key)->asString()->value()); + return YCPVoid(); + } + } + + key = YCPString("no_signature"); + // set the medium number + if(!config->value(key).isNull()) + { + if (config->value(key)->isBoolean()) + { + bool no_signature = config->value(key)->asBoolean()->value(); + policy.rpmNoSignature(no_signature); + + y2milestone("Don't check RPM signature: %s", config->value(key)->asString()->value().c_str()); + } + else + { + y2error("No signature option: boolean is required, got: %s", config->value(key)->asString()->value().c_str()); + _last_error.setLastError(std::string("Invalid no signature option: ") + config->value(key)->asString()->value()); + return YCPVoid(); + } + } + } + + return CommitHelper(policy); +} + +/** @builtin GetBackupPath @short get current path for update backup of rpm config files Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h Tue Jul 19 20:26:35 2011 @@ -705,8 +705,11 @@ YCPBoolean PkgSolveCheckTargetOnly (); /* TYPEINFO: integer()*/ YCPValue PkgSolveErrors (); + YCPValue CommitHelper(const zypp::ZYppCommitPolicy &policy); /* TYPEINFO: list<any>(integer)*/ YCPValue PkgCommit (const YCPInteger& medianr); + /* TYPEINFO: list<any>(map<string,any>)*/ + YCPValue Commit (const YCPMap& config); /* TYPEINFO: boolean(map<string,any>)*/ YCPValue AddLock(const YCPMap &lock); -- 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] r64896 - /tags/branch-Code-11-SP2-2_17_39/ldap-server/
by rhafer＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: rhafer Date: Tue Jul 19 17:51:51 2011 New Revision: 64896 URL: http://svn.opensuse.org/viewcvs/yast?rev=64896&view=rev Log: Created tag branch-Code-11-SP2-2_17_39 for ldap-server Added: tags/branch-Code-11-SP2-2_17_39/ldap-server/ (props changed) - copied from r64895, branches/SuSE-Code-11-SP2-Branch/ldap-server/ -- 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] r64895 - in /branches/SuSE-Code-11-SP2-Branch/ldap-server: VERSION package/yast2-ldap-server.changes
by rhafer＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: rhafer Date: Tue Jul 19 17:50:04 2011 New Revision: 64895 URL: http://svn.opensuse.org/viewcvs/yast?rev=64895&view=rev Log: Preparing 2.17.39 Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/VERSION branches/SuSE-Code-11-SP2-Branch/ldap-server/package/yast2-ldap-server.changes Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/VERSION Tue Jul 19 17:50:04 2011 @@ -1 +1 @@ -2.17.38 +2.17.39 Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/package/yast2-ldap-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/package/yast2-ldap-server.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/package/yast2-ldap-server.changes Tue Jul 19 17:50:04 2011 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Jul 19 15:43:28 UTC 2011 - rhafer(a)suse.de + +- Version 2.17.39 +- Clarify meaning of mirrormode checkbox (bnc#705474) +- Add DB_CONFIG settings to cn=config for first database (bnc#706447) +- Fixed crash when creating additional database (bnc#706468) + +------------------------------------------------------------------- Mon Jul 18 13:07:51 UTC 2011 - rhafer(a)suse.de - Version 2.17.38 -- 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] r64894 - in /branches/SuSE-Code-11-SP2-Branch/ldap-server/src: dialogs.ycp helps.ycp
by rhafer＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: rhafer Date: Tue Jul 19 17:43:02 2011 New Revision: 64894 URL: http://svn.opensuse.org/viewcvs/yast?rev=64894&view=rev Log: Clarify meaning of mirrormode checkbox (bnc#705474) Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/dialogs.ycp branches/SuSE-Code-11-SP2-Branch/ldap-server/src/helps.ycp Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/src/dialogs.ycp Tue Jul 19 17:43:02 2011 @@ -1093,7 +1093,9 @@ `VSpacing( 0.5 ), `Password( `id( `te_valid_rootpw ), `opt( `hstretch ), _("&Validate Password") ), `VSpacing( 0.5 ), - `CheckBox( `id( `cb_mirror_mode ), _("MirrorMode") ) + `Left( + `CheckBox( `id( `cb_mirror_mode ), _("Prepare for MirrorMode replication (generates the serverId attribute)") ) + ) ) ) ); Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/src/helps.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/src/helps.ycp Tue Jul 19 17:43:02 2011 @@ -298,12 +298,14 @@ "master_setup_dialog" : _("Enter a password for the configuration database (\"cn=config\") here. This is required to make -the configuration database accessible remotely."), +the configuration database accessible remotely.") + + _("If the server is supposed to participate in a MirrorMode setup, select the \"Prepare for MirrorMode replication\" +checkbox. This will ensure that the serverId Attribute is generated as needed for MirrorMode replication."), "slave_dialog" : _("To setup a slave server some details need to be queried from the master server. Please enter the master server's hostname, adjust the protocol (either \"ldap\" or \"ldaps\") and port number as needed and enter the password -for the master's configuration database (\"cn=config\")."), +for the master's configuration database (\"cn=config\").") ]; /* EOF */ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0