April 2009 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] <sat-solver> SuSE-Code-11-Branch : - fix name/evr access (bnc#490033)
by Michael Schroeder 06 Apr '09

06 Apr '09

ref: refs/heads/SuSE-Code-11-Branch commit 19f101d0ab4098f4d372c357bdba58d467ea821a Author: Michael Schroeder <mls(a)suse.de> Date: Mon Apr 6 12:10:35 2009 +0200 - fix name/evr access (bnc#490033) --- tools/repo_rpmmd.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/repo_rpmmd.c b/tools/repo_rpmmd.c index ec50b16..027c723 100644 --- a/tools/repo_rpmmd.c +++ b/tools/repo_rpmmd.c @@ -586,20 +586,19 @@ set_sourcerpm(Repodata *data, Solvable *s, Id handle, char *sourcerpm) return; sevr = p + 1; pool = s->repo->pool; - name = id2str(pool, s->name); - evr = id2str(pool, s->evr); if (!strcmp(sarch, "src.rpm")) repodata_set_constantid(data, handle, SOLVABLE_SOURCEARCH, ARCH_SRC); else if (!strcmp(sarch, "nosrc.rpm")) repodata_set_constantid(data, handle, SOLVABLE_SOURCEARCH, ARCH_NOSRC); else repodata_set_constantid(data, handle, SOLVABLE_SOURCEARCH, strn2id(pool, sarch, strlen(sarch) - 4, 1)); - if (!strncmp(sevr, evr, sarch - sevr - 1) && evr[sarch - sevr - 1] == 0) + evr = id2str(pool, s->evr); + if (evr && !strncmp(sevr, evr, sarch - sevr - 1) && evr[sarch - sevr - 1] == 0) repodata_set_void(data, handle, SOLVABLE_SOURCEEVR); else repodata_set_id(data, handle, SOLVABLE_SOURCEEVR, strn2id(pool, sevr, sarch - sevr - 1, 1)); - if (!strncmp(sourcerpm, name, sevr - sourcerpm - 1) && name[sevr - sourcerpm - - 1] == 0) + name = id2str(pool, s->name); + if (name && !strncmp(sourcerpm, name, sevr - sourcerpm - 1) && name[sevr - sourcerpm - 1] == 0) repodata_set_void(data, handle, SOLVABLE_SOURCENAME); else repodata_set_id(data, handle, SOLVABLE_SOURCENAME, strn2id(pool, sourcerpm, sevr - sourcerpm - 1, 1)); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <zypper> master : Corrected list of priority in 'repos' command (bnc #436688).
by Ján Kupec 03 Apr '09

03 Apr '09

ref: refs/heads/master commit dc5b676fb28c0e83bcbadd4ea5c7e4f57f6dab97 Author: Susanne Oberhauser <froh(a)novell.com> Date: Fri Apr 3 12:23:59 2009 +0200 Corrected list of priority in 'repos' command (bnc #436688). --- src/repos.cc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/repos.cc b/src/repos.cc index cdbc412..3faa9f8 100644 --- a/src/repos.cc +++ b/src/repos.cc @@ -737,7 +737,7 @@ static void print_repo_list(Zypper & zypper, tr << (repo.autorefresh() ? _("Yes") : _("No")); // priority if (all || showprio) - tr << str::numstring (repo.priority()); + tr << str::numstring (repo.priority(), 4); // output flush right; looks nicer and sorts correctly // type if (all) tr << repo.type().asString(); @@ -2035,7 +2035,7 @@ static void service_list_tr( if (service) tr << ""; else - tr << str::numstring (repo->priority()); + tr << str::numstring (repo->priority(), 4); // output flush right; looks nicer and sorts correctly } // type -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <zypper> master : changes
by Ján Kupec 02 Apr '09

02 Apr '09

ref: refs/heads/master commit ad1c744ab7ad883af04ceac6e7846b60b9fbb431 Author: Ján Kupec <jkupec(a)suse.cz> Date: Thu Apr 2 20:20:47 2009 +0200 changes --- VERSION.cmake | 2 +- package/zypper.changes | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index f5889ab..35eb3b8 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -31,7 +31,7 @@ # SET(VERSION_MAJOR "1") SET(VERSION_MINOR "1") -SET(VERSION_PATCH "1") +SET(VERSION_PATCH "2") # LAST RELEASED: 1.1.1 #======= diff --git a/package/zypper.changes b/package/zypper.changes index dd76f34..1e3e541 100644 --- a/package/zypper.changes +++ b/package/zypper.changes @@ -1,4 +1,25 @@ ------------------------------------------------------------------- +Thu Apr 2 19:46:21 CEST 2009 - jkupec(a)suse.cz + +- configuration file support added. Global settings go to + /etc/zypp/zypper.conf, user's to $HOME/.zypper.conf. + Override priority order (top to bottom): + * CLI options + * $HOME/.zypper.conf + * /etc/zypp/zypper.conf + * zypp.conf +- configurable colorized output added +- improved installation summary (bnc #389128). Allows to view + version, arch, repo, vendor; view the summary in pager, + shows installed package counts +- xmloutput now writes also old version and old arch in summary + (bnc #331060) +- zypper.conf: solver/installRecommends option added, along with + --recommends option for in, up, patch, ve, and dup commands + to override zypper.conf setting. If not used, libzypp's setting + is used. (bnc #478144) + +------------------------------------------------------------------- Wed Mar 18 11:03:24 CET 2009 - jkupec(a)suse.cz - show dialog's default option in parentheses instead -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <zypper> master : comments
by Ján Kupec 02 Apr '09

02 Apr '09

ref: refs/heads/master commit f9f8774f62cf2c1b2783dabec4b23c8d1ea5293b Author: Ján Kupec <jkupec(a)suse.cz> Date: Thu Apr 2 20:20:33 2009 +0200 comments --- src/utils/Augeas.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/utils/Augeas.h b/src/utils/Augeas.h index b208d19..d0feebf 100644 --- a/src/utils/Augeas.h +++ b/src/utils/Augeas.h @@ -20,6 +20,10 @@ extern "C" /** * Zypper's wrapper around Augeas. + * + * \todo add root dir argument to constructor + * \todo add conf file to load argument + * \todo use the new API to cherry-pick the lense and conf file to load */ class Augeas : private zypp::base::NonCopyable { -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <zypper> master : arch-old attribute added to solvable-element (bnc #331060)
by Ján Kupec 02 Apr '09

02 Apr '09

ref: refs/heads/master commit 7642298425ace43ad8c117f3dd82af97e446f7a3 Author: Ján Kupec <jkupec(a)suse.cz> Date: Thu Apr 2 19:45:18 2009 +0200 arch-old attribute added to solvable-element (bnc #331060) --- src/output/xmlout.rnc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/output/xmlout.rnc b/src/output/xmlout.rnc index e4e84d6..8f4a642 100644 --- a/src/output/xmlout.rnc +++ b/src/output/xmlout.rnc @@ -112,6 +112,7 @@ solvable-element = attribute edition { xsd:string }, # target edition attribute edition-old { xsd:string }?, # currently installed version in case of upgrade attribute arch { xsd:string }, + attribute arch-old { xsd:string }?, # currently installed architecture attribute summary { xsd:string }?, text? } @@ -200,4 +201,4 @@ patch-selectable-info = attribute status { "installed" | "not-installed" | "not-applicable" | "no-longer-applicable" | "applied" | "not-needed" | "broken" | "needed" - } \ No newline at end of file + } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <zypper> master : zypper.conf: installRecommends handling added.
by Ján Kupec 02 Apr '09

02 Apr '09

ref: refs/heads/master commit edcbcec26000a9c4e72ba72812e257b82078e6ec Author: Ján Kupec <jkupec(a)suse.cz> Date: Thu Apr 2 19:38:15 2009 +0200 zypper.conf: installRecommends handling added. - --recommends option added to override zypper.conf - affected help texts reformatted to fit 80 columns (bnc #423007) - fixed unwanted overriding of zypp.conf onlyRequires option - fixes bnc #478144 --- src/Config.cc | 20 +++++++- src/Config.h | 5 ++ src/Zypper.cc | 130 ++++++++++++++++++++++++++++++-------------------- src/solve-commit.cc | 11 +++- 4 files changed, 108 insertions(+), 58 deletions(-) diff --git a/src/Config.cc b/src/Config.cc index b834bc2..91ecf1e 100644 --- a/src/Config.cc +++ b/src/Config.cc @@ -16,6 +16,7 @@ extern "C" #include "zypp/base/Measure.h" #include "zypp/base/String.h" #include "zypp/base/Exception.h" +#include "zypp/ZConfig.h" #include "utils/Augeas.h" #include "Config.h" @@ -31,7 +32,7 @@ using namespace zypp; static map<string, ConfigOption::Option> _table; static map<ConfigOption::Option, string> _table_str; - +const ConfigOption ConfigOption::SOLVER_INSTALL_RECOMMENDS(ConfigOption::SOLVER_INSTALL_RECOMMENDS_e); const ConfigOption ConfigOption::COLOR_USE_COLORS(ConfigOption::COLOR_USE_COLORS_e); const ConfigOption ConfigOption::COLOR_BACKGROUND(ConfigOption::COLOR_BACKGROUND_e); const ConfigOption ConfigOption::COLOR_RESULT(ConfigOption::COLOR_RESULT_e); @@ -52,6 +53,7 @@ ConfigOption::Option ConfigOption::parse(const std::string & strval_r) if (_table.empty()) { // initialize it + _table["solver/installRecommends"] = ConfigOption::SOLVER_INSTALL_RECOMMENDS_e; _table["color/useColors"] = ConfigOption::COLOR_USE_COLORS_e; _table["color/background"] = ConfigOption::COLOR_BACKGROUND_e; _table["color/result"] = ConfigOption::COLOR_RESULT_e; @@ -77,6 +79,7 @@ const string ConfigOption::asString() const if (_table.empty()) { // initialize it + _table_str[SOLVER_INSTALL_RECOMMENDS_e] = string("solver/installRecommends"); _table_str[COLOR_USE_COLORS_e] = string("color/useColors"); _table_str[COLOR_BACKGROUND_e] = "color/background"; _table_str[COLOR_RESULT_e] = "color/result"; @@ -95,7 +98,8 @@ const string ConfigOption::asString() const Config::Config() - : do_colors (false) + : solver_installRecommends(true) + , do_colors (false) , color_useColors ("never") , color_background (false) // dark background , color_result ("white") // default colors for dark background @@ -115,10 +119,21 @@ void Config::read() m.elapsed(); + string s; + // ---------------[ main ]-------------------------------------------------- // TODO + // ---------------[ main ]-------------------------------------------------- + + s = augeas.getOption(ConfigOption::SOLVER_INSTALL_RECOMMENDS.asString()); + if (s.empty()) + solver_installRecommends = ZConfig::instance().solver_onlyRequires(); + else + solver_installRecommends = str::strToBool(s, true); + + // ---------------[ colors ]------------------------------------------------ color_useColors = augeas.getOption(ConfigOption::COLOR_USE_COLORS.asString()); @@ -128,7 +143,6 @@ void Config::read() ////// color/background ////// - string s; s = augeas.getOption(ConfigOption::COLOR_BACKGROUND.asString()); if (s == "light") color_background = true; diff --git a/src/Config.h b/src/Config.h index 3330b8d..5871e2b 100644 --- a/src/Config.h +++ b/src/Config.h @@ -15,6 +15,8 @@ class ConfigOption { public: + static const ConfigOption SOLVER_INSTALL_RECOMMENDS; + static const ConfigOption COLOR_USE_COLORS; static const ConfigOption COLOR_BACKGROUND; static const ConfigOption COLOR_RESULT; @@ -28,6 +30,8 @@ public: enum Option { + SOLVER_INSTALL_RECOMMENDS_e, + COLOR_USE_COLORS_e, COLOR_BACKGROUND_e, COLOR_RESULT_e, @@ -67,6 +71,7 @@ struct Config void read(); + bool solver_installRecommends; /** * Whether to colorize the output. This is evaluated according to diff --git a/src/Zypper.cc b/src/Zypper.cc index bd1476c..6fd8072 100644 --- a/src/Zypper.cc +++ b/src/Zypper.cc @@ -869,14 +869,15 @@ void Zypper::processCommandOptions() {"no-confirm", no_argument, 0, 'y'}, {"auto-agree-with-licenses", no_argument, 0, 'l'}, // rug compatibility, we have --auto-agree-with-licenses - {"agree-to-third-party-licenses", no_argument, 0, 0}, - {"debug-solver", no_argument, 0, 0}, + {"agree-to-third-party-licenses", no_argument, 0, 0 }, + {"debug-solver", no_argument, 0, 0 }, {"no-force-resolution", no_argument, 0, 'R'}, {"force-resolution", no_argument, 0, 0 }, {"dry-run", no_argument, 0, 'D'}, // rug uses -N shorthand {"dry-run", no_argument, 0, 'N'}, {"no-recommends", no_argument, 0, 0 }, + {"recommends", no_argument, 0, 0 }, // rug compatibility - will mark all packages for installation (like 'in *') {"entire-catalog", required_argument, 0, 0 }, {"help", no_argument, 0, 'h'}, @@ -893,22 +894,28 @@ void Zypper::processCommandOptions() "of <, <=, =, >=, >.\n" "\n" " Command options:\n" - "-r, --repo <alias|#|URI> Install packages only from the specified repository.\n" - "-t, --type <type> Type of package (%s).\n" - " Default: %s.\n" - "-n, --name Select packages by plain name, not by capability.\n" - "-C, --capability Select packages by capability.\n" - "-f, --force Install even if the item is already installed (reinstall).\n" - "-l, --auto-agree-with-licenses Automatically say 'yes' to third party license confirmation prompt.\n" - " See 'man zypper' for more details.\n" - " --debug-solver Create solver test case for debugging.\n" - " --no-recommends Do not install recommended packages, only required.\n" - "-R, --no-force-resolution Do not force the solver to find solution, let it ask.\n" - " --force-resolution Force the solver to find a solution (even an agressive).\n" - "-D, --dry-run Test the installation, do not actually install.\n" - ), "package, patch, pattern, product", "package") + string(_( - // translators: this option belongs to 'install' command - " --from <alias|#|URI> Select packages only from specified repository.\n")); + " --from <alias|#|URI> Select packages from the specified repository.\n" + "-r, --repo <alias|#|URI> Load only the specified repository.\n" + "-t, --type <type> Type of package (%s).\n" + " Default: %s.\n" + "-n, --name Select packages by plain name, not by capability.\n" + "-C, --capability Select packages by capability.\n" + "-f, --force Reinstall the package if the exact version is\n" + " available in repositories.\n" + "-l, --auto-agree-with-licenses\n" + " Automatically say 'yes' to third party license\n" + " confirmation prompt.\n" + " See 'man zypper' for more details.\n" + " --debug-solver Create solver test case for debugging.\n" + " --no-recommends Do not install recommended packages, only required.\n" + " --recommends Install also recommended packages in addition\n" + " to the required.\n" + " --no-force-resolution Do not force the solver to find solution,\n" + " let it ask.\n" + "-R, --force-resolution Force the solver to find a solution (even\n" + " an agressive).\n" + "-D, --dry-run Test the installation, do not actually install.\n" + ), "package, patch, pattern, product", "package"); break; } @@ -1002,9 +1009,12 @@ void Zypper::processCommandOptions() " and repair eventual dependency problems.\n" "\n" " Command options:\n" - " --no-recommends Do not install recommended packages, only required.\n" - "-D, --dry-run Test the repair, do not actually do anything to the system.\n" - "-r, --repo <alias|#|URI> Use only specified repositories to install missing packages.\n" + "-r, --repo <alias|#|URI> Load only the specified repository.\n" + " --no-recommends Do not install recommended packages, only required.\n" + " --recommends Install also recommended packages in addition\n" + " to the required.\n" + "-D, --dry-run Test the repair, do not actually do anything to\n" + " the system.\n" ); break; } @@ -1479,6 +1489,7 @@ void Zypper::processCommandOptions() {"no-force-resolution", no_argument, 0, 'R'}, {"force-resolution", no_argument, 0, 0 }, {"no-recommends", no_argument, 0, 0 }, + {"recommends", no_argument, 0, 0 }, {"dry-run", no_argument, 0, 'D'}, // rug uses -N shorthand {"dry-run", no_argument, 0, 'N'}, @@ -1499,21 +1510,26 @@ void Zypper::processCommandOptions() "\n" " Command options:\n" "\n" - "-t, --type <type> Type of package (%s).\n" - " Default: %s.\n" - "-r, --repo <alias|#|URI> Limit updates to the specified repository.\n" - " --skip-interactive Skip interactive updates.\n" - "-l, --auto-agree-with-licenses Automatically say 'yes' to third party license\n" - " confirmation prompt.\n" - " See man zypper for more details.\n" - " --best-effort Do a 'best effort' approach to update. Updates\n" - " to a lower than the latest version are\n" - " also acceptable.\n" - " --debug-solver Create solver test case for debugging.\n" - " --no-recommends Do not install recommended packages, only required.\n" - "-R, --no-force-resolution Do not force the solver to find solution, let it ask.\n" - " --force-resolution Force the solver to find a solution (even an agressive).\n" - "-D, --dry-run Test the update, do not actually update.\n" + "-t, --type <type> Type of package (%s).\n" + " Default: %s.\n" + "-r, --repo <alias|#|URI> Load only the specified repository.\n" + " --skip-interactive Skip interactive updates.\n" + "-l, --auto-agree-with-licenses\n" + " Automatically say 'yes' to third party license\n" + " confirmation prompt.\n" + " See man zypper for more details.\n" + " --best-effort Do a 'best effort' approach to update. Updates\n" + " to a lower than the latest version are\n" + " also acceptable.\n" + " --debug-solver Create solver test case for debugging.\n" + " --no-recommends Do not install recommended packages, only required.\n" + " --recommends Install also recommended packages in addition\n" + " to the required.\n" + "-R, --no-force-resolution Do not force the solver to find solution,\n" + " let it ask.\n" + " --force-resolution Force the solver to find a solution (even\n" + " an agressive).\n" + "-D, --dry-run Test the update, do not actually update.\n" ), "package, patch, pattern, product", "package"); break; } @@ -1522,10 +1538,11 @@ void Zypper::processCommandOptions() { static struct option update_options[] = { {"repo", required_argument, 0, 'r'}, - {"skip-interactive", no_argument, 0, 0}, + {"skip-interactive", no_argument, 0, 0 }, {"auto-agree-with-licenses", no_argument, 0, 'l'}, - {"debug-solver", no_argument, 0, 0}, + {"debug-solver", no_argument, 0, 0 }, {"no-recommends", no_argument, 0, 0 }, + {"recommends", no_argument, 0, 0 }, {"dry-run", no_argument, 0, 'D'}, {"help", no_argument, 0, 'h'}, {0, 0, 0, 0} @@ -1538,13 +1555,17 @@ void Zypper::processCommandOptions() "\n" " Command options:\n" "\n" - "-r, --repo <alias|#|URI> Work only with specified repository.\n" - " --skip-interactive Skip interactive patches.\n" - "-l, --auto-agree-with-licenses Automatically say 'yes' to third party license\n" - " confirmation prompt.\n" - " See man zypper for more details.\n" - " --debug-solver Create solver test case for debugging.\n" - "-D, --dry-run Test the update, do not actually update.\n" + "-r, --repo <alias|#|URI> Load only the specified repository.\n" + " --skip-interactive Skip interactive patches.\n" + "-l, --auto-agree-with-licenses\n" + " Automatically say 'yes' to third party license\n" + " confirmation prompt.\n" + " See man zypper for more details.\n" + " --debug-solver Create solver test case for debugging.\n" + " --no-recommends Do not install recommended packages, only required.\n" + " --recommends Install also recommended packages in addition\n" + " to the required.\n" + "-D, --dry-run Test the update, do not actually update.\n" ); break; } @@ -1573,8 +1594,9 @@ void Zypper::processCommandOptions() static struct option dupdate_options[] = { {"repo", required_argument, 0, 'r'}, {"no-recommends", no_argument, 0, 0 }, + {"recommends", no_argument, 0, 0 }, {"auto-agree-with-licenses", no_argument, 0, 'l'}, - {"debug-solver", no_argument, 0, 0}, + {"debug-solver", no_argument, 0, 0 }, {"dry-run", no_argument, 0, 'D'}, // rug uses -N shorthand {"dry-run", no_argument, 0, 'N'}, @@ -1589,12 +1611,16 @@ void Zypper::processCommandOptions() "\n" " Command options:\n" "\n" - "-r, --repo <alias|#|URI> Limit the upgrade to the specified repository.\n" - " --no-recommends Do not install recommended packages, only required.\n" - "-l, --auto-agree-with-licenses Automatically say 'yes' to third party license confirmation prompt.\n" - " See man zypper for more details.\n" - " --debug-solver Create solver test case for debugging\n" - "-D, --dry-run Test the upgrade, do not actually upgrade\n" + "-r, --repo <alias|#|URI> Load only the specified repository.\n" + "-l, --auto-agree-with-licenses\n" + " Automatically say 'yes' to third party license\n" + " confirmation prompt.\n" + " See man zypper for more details.\n" + " --debug-solver Create solver test case for debugging\n" + " --no-recommends Do not install recommended packages, only required.\n" + " --recommends Install also recommended packages in addition\n" + " to the required.\n" + "-D, --dry-run Test the upgrade, do not actually upgrade\n" ); break; } diff --git a/src/solve-commit.cc b/src/solve-commit.cc index b6738b9..5237ca8 100755 --- a/src/solve-commit.cc +++ b/src/solve-commit.cc @@ -261,13 +261,18 @@ static void set_force_resolution(Zypper & zypper) static void set_no_recommends(Zypper & zypper) { - bool no_recommends = false; + bool no_recommends = !zypper.config().solver_installRecommends; + + // override zypper.conf in these cases: if (zypper.command() == ZypperCommand::REMOVE) // never install recommends when removing packages no_recommends = true; - else + else if (zypper.cOpts().count("no-recommends")) // install also recommended packages unless --no-recommends is specified - no_recommends = zypper.cOpts().count("no-recommends"); + no_recommends = true; + else if (zypper.cOpts().count("recommends")) + no_recommends = false; + DBG << "no recommends (only requires): " << no_recommends << endl; God->resolver()->setOnlyRequires(no_recommends); } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <zypper> master : Write package counts in summary.
by Ján Kupec 02 Apr '09

02 Apr '09

ref: refs/heads/master commit e7d09740dd730dcbc627644d495047aa3d7854d0 Author: Ján Kupec <jkupec(a)suse.cz> Date: Thu Apr 2 15:15:11 2009 +0200 Write package counts in summary. --- src/Summary.cc | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++- src/Summary.h | 3 +- src/solve-commit.cc | 1 + 3 files changed, 84 insertions(+), 2 deletions(-) diff --git a/src/Summary.cc b/src/Summary.cc index 2900622..1f6bc38 100644 --- a/src/Summary.cc +++ b/src/Summary.cc @@ -607,6 +607,86 @@ void Summary::writeDownloadAndInstalledSizeSummary(ostream & out) out << endl; } +void Summary::writePackageCounts(ostream & out) +{ + if (!packagesToGetAndInstall() && !packagesToRemove()) + return; + + ostringstream s; + bool gotcha = false; + unsigned count; + KindToResPairSet::const_iterator i; + + i = toupgrade.find(ResKind::package); + if (i != toupgrade.end()) + { + count = i->second.size(); + s << format(_PL("%d package to upgrade", "%d packages to upgrade", count)) % count; + gotcha = true; + } + i = todowngrade.find(ResKind::package); + if (i != todowngrade.end()) + { + count = i->second.size(); + if (gotcha) + s << ", " << format(_PL("%d to downgrade", "%d to downgrade", count)) % count; + else + s << format(_PL("%d package to downgrade", "%d packages to downgrade", count)) % count; + } + i = toinstall.find(ResKind::package); + if (i != toinstall.end()) + { + count = i->second.size(); + if (gotcha) + s << ", " << format(_PL("%d new", "%d new", count)) % count; + else + s << format(_PL("%d new package to install", "%d new packages to install", count)) % count; + gotcha = true; + } + i = toreinstall.find(ResKind::package); + if (i != toreinstall.end()) + { + count = i->second.size(); + if (gotcha) + s << ", " << format(_PL("%d to reinstall", "%d to reinstall", count)) % count; + else + s << format(_PL("%d package to reinstall", "%d packages to reinstall", count)) % count; + gotcha = true; + } + i = toremove.find(ResKind::package); + if (i != toremove.end()) + { + count = i->second.size(); + if (gotcha) + s << ", " << format(_PL("%d to remove", "%d to remove", count)) % count; + else + s << format(_PL("%d package to remove", "%d packages to remove", count)) % count; + gotcha = true; + } + i = tochangevendor.find(ResKind::package); + if (i != tochangevendor.end()) + { + count = i->second.size(); + if (gotcha) + s << ", " << format(_PL("%d to change vendor", "%d to change vendor", count)) % count; + else + s << format(_PL("%d package will change vendor", "%d packages will change vendor", count)) % count; + gotcha = true; + } + i = tochangearch.find(ResKind::package); + if (i != tochangearch.end()) + { + count = i->second.size(); + if (gotcha) + s << ", " << format(_PL("%d to change arch", "%d to change arch", count)) % count; + else + s << format(_PL("%d package will change arch", "%d packages will change arch", count)) % count; + gotcha = true; + } + s << "." << endl; + wrap_text(out, s.str(), 0, _wrap_width); +} + // -------------------------------------------------------------------------- void Summary::dumpTo(ostream & out) @@ -627,7 +707,7 @@ void Summary::dumpTo(ostream & out) if (_viewop & SHOW_UNSUPPORTED) writeUnsupported(out); out << endl; - //! \todo write package counts + writePackageCounts(out); writeDownloadAndInstalledSizeSummary(out); } diff --git a/src/Summary.h b/src/Summary.h index 68a6c4b..44afcec 100644 --- a/src/Summary.h +++ b/src/Summary.h @@ -27,7 +27,7 @@ public: inline bool operator()(const ResPair & p1, const ResPair & p2) const; }; typedef std::set<ResPair, ResPairNameCompare> ResPairSet; - typedef std::map<zypp::Resolvable::Kind, ResPairSet> KindToResPairSet; + typedef std::map<zypp::ResKind, ResPairSet> KindToResPairSet; enum _view_options { @@ -73,6 +73,7 @@ public: void writeChangedArch(std::ostream & out); void writeChangedVendor(std::ostream & out); void writeUnsupported(std::ostream & out); + void writePackageCounts(std::ostream & out); void writeDownloadAndInstalledSizeSummary(std::ostream & out); unsigned packagesToGetAndInstall() const diff --git a/src/solve-commit.cc b/src/solve-commit.cc index caf7760..b6738b9 100755 --- a/src/solve-commit.cc +++ b/src/solve-commit.cc @@ -464,6 +464,7 @@ void solve_and_commit (Zypper & zypper) // The anserws must be separated by slash characters '/' and must // correspond to yes/no/showproblems in that order. // The answers should be lower case letters. + //! \todo add c for changelog and x for explain (show the dep tree) popts.setOptions(_("y/n/p/v/a/r/m/d/g"), 0); popts.setShownCount(2); if (!(zypper.runtimeData().force_resolution && show_p_option)) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <sat-solver> master : test a repo for installability (of all its solvables)
by Klaus Kämpf 02 Apr '09

02 Apr '09

ref: refs/heads/master commit 38ecc0e34cbdef948609b6c044b31b040f5825a1 Author: Klaus Kämpf <kkaempf(a)suse.de> Date: Thu Apr 2 14:25:18 2009 +0200 test a repo for installability (of all its solvables) --- bindings/ruby/tests/installable.rb | 44 ++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/bindings/ruby/tests/installable.rb b/bindings/ruby/tests/installable.rb new file mode 100644 index 0000000..8dba24c --- /dev/null +++ b/bindings/ruby/tests/installable.rb @@ -0,0 +1,44 @@ +$:.unshift "../../../build/bindings/ruby" +require 'pathname' + +# test 'installability' of Repo +# +# queues every single package for installation +# and checks if solving succeeds. +# +# Usage: +# +# installable <arch> <solv>... +# +# Multiple solv files can be given and all are added to the pool. +# The last one will be tested. +# + +require 'satsolver' + +raise "Usage: installable <arch> <solv>..." unless ARGV.size > 1 + +pool = Satsolver::Pool.new + +arch = ARGV.shift +raise "Bad arch" unless ["i386", "i486", "i586","i686","x86_64","ppc","ppc64","ia64","s390", "s390x", "arm","noarch",].include? arch +pool.arch = arch + +repo = nil + +while (ARGV.size > 0) + solvname = ARGV.shift + repo = pool.add_solv( solvname ) + repo.name = solvname +end + +pool.prepare + +repo.each do |s| + transaction = Satsolver::Transaction.new( pool ) + transaction.install( s ) + + solver = Satsolver::Solver.new( pool ) + res = solver.solve( transaction ) + $stderr.puts "Package #{s} is not installable" unless res +end -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <sat-solver> master : update to 0.14.1
by Klaus Kämpf 02 Apr '09

02 Apr '09

ref: refs/heads/master commit 442179b9ff2c8ed8fe4f7a70f49a3a144ed6e6d6 Author: Klaus Kämpf <kkaempf(a)suse.de> Date: Thu Apr 2 14:24:47 2009 +0200 update to 0.14.1 --- VERSION.cmake | 4 ++-- package/libsatsolver.changes | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 64f17b3..8f796fc 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -46,6 +46,6 @@ SET(LIBSATSOLVER_MAJOR "0") SET(LIBSATSOLVER_MINOR "14") -SET(LIBSATSOLVER_PATCH "0") +SET(LIBSATSOLVER_PATCH "1") -# last released 0.14.0 +# last released 0.14.1 diff --git a/package/libsatsolver.changes b/package/libsatsolver.changes index 0c677bf..3c8dff5 100644 --- a/package/libsatsolver.changes +++ b/package/libsatsolver.changes @@ -1,4 +1,29 @@ ------------------------------------------------------------------- +Wed Apr 1 10:32:43 CEST 2009 - kkaempf(a)suse.de + +- 0.14.1 + Core changes + - fix potential NULL deref in srcrpm handling (mls) + - clean up and fix suggested/recommended list creation code (mls) + - kill obsolete and broken patchxml support (mls) + - replace old solver_problemruleinfo with new solver_ruleinfo + function (mls) + - add solvable_selfprovidedep() function (mls) + - add noinfarchcheck solver option (mls) + - clone job queue to make the code more flexible (mls) + - rewrite policy rule disabling/re-enabling (bnc#481836) (mls) + - fix out-of-bounds in solver_printproblem() (mls) + Bindings changes + - provide 'Repo.attr(String)' accessor function (kkaempf) + - provide 'Solver.sizechange' to compute the changes of the + installed size after a transaction is applied (kkaempf) + - solver result iterators for Python (jblunck) + - add %newobject to track newly created objects better (kkaempf) + - generate rdoc documentation from swig input files (kkaempf) + - add a no-op Pool destructor (bnc#483252) (kkaempf) + - provide access to all flags and settings (kkaempf) + +------------------------------------------------------------------- Wed Mar 4 14:39:00 CET 2009 - mls(a)suse.de - fix problem_to_solutions segfault -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> master : comments updated
by Michael Andres 01 Apr '09

01 Apr '09

ref: refs/heads/master commit 85254a742a9be653bb34ca69284a6bc2e5de5897 Author: Michael Andres <ma(a)suse.de> Date: Wed Apr 1 18:05:41 2009 +0200 comments updated --- zypp/ZConfig.cc | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/zypp/ZConfig.cc b/zypp/ZConfig.cc index be1c3d4..ceab33f 100644 --- a/zypp/ZConfig.cc +++ b/zypp/ZConfig.cc @@ -140,13 +140,16 @@ namespace zypp { typedef _Tp value_type; + /** Default ctor sets _Initial. */ Option() : _val( _Initial ) {} + /** Get the value. */ value_type get() const { return _val; } + /** Set a new value. */ void set( const value_type & newval_r ) { _val = newval_r; } @@ -161,15 +164,19 @@ namespace zypp typedef _Tp value_type; typedef Option<_Tp,_Initial> option_type; - void restoreDefault() + /** Reset value to the current default. */ + void restoreToDefault() { this->set( _default.get() ); } - void restoreDefault( const value_type & newval_r ) - { setDefault( newval_r ); restoreDefault(); } + /** Reset value to a new default. */ + void restoreToDefault( const value_type & newval_r ) + { setDefault( newval_r ); restoreToDefault(); } + /** Get the current default value. */ value_type getDefault() const { return _default.get(); } + /** Set a new default value. */ void setDefault( const value_type & newval_r ) { _default.set( newval_r ); } @@ -293,7 +300,7 @@ namespace zypp } else if ( entry == "download.media_preference" ) { - download_media_prefer_download.restoreDefault( str::compareCI( value, "volatile" ) != 0 ); + download_media_prefer_download.restoreToDefault( str::compareCI( value, "volatile" ) != 0 ); } else if ( entry == "download.max_concurrent_connections" ) { @@ -624,7 +631,7 @@ namespace zypp { _pimpl->download_media_prefer_download.set( yesno_r ); } void ZConfig::set_default_download_media_prefer_download() - { _pimpl->download_media_prefer_download.restoreDefault(); } + { _pimpl->download_media_prefer_download.restoreToDefault(); } long ZConfig::download_max_concurrent_connections() const { return _pimpl->download_max_concurrent_connections; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0