September 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r11197 - in /trunk/zypper/src: Zypper.cc update.cc
by jkupec＠svn.opensuse.org 29 Sep '08

29 Sep '08

Author: jkupec Date: Mon Sep 29 12:08:06 2008 New Revision: 11197 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11197&view=rev Log: - show in 'lu' what will 'up' actually propose to install (bnc #395480) - new --all/-a option for 'lu' to show the original raw list of packages for which newer versions exist Modified: trunk/zypper/src/Zypper.cc trunk/zypper/src/update.cc Modified: trunk/zypper/src/Zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/Zypper.cc?rev=11197&r… ============================================================================== --- trunk/zypper/src/Zypper.cc (original) +++ trunk/zypper/src/Zypper.cc Mon Sep 29 12:08:06 2008 @@ -1400,7 +1400,8 @@ // rug compatibility option, we have --repo {"catalog", required_argument, 0, 'c'}, {"type", required_argument, 0, 't'}, - {"best-effort", no_argument, 0, 0 }, + {"all", no_argument, 0, 'a'}, + {"best-effort", no_argument, 0, 0 }, {"help", no_argument, 0, 'h'}, {0, 0, 0, 0} }; @@ -1413,13 +1414,16 @@ "List all available updates.\n" "\n" " Command options:\n" - "-t, --type <type> Type of package (%s).\n" - " Default: %s.\n" - "-r, --repo <alias|#|URI> List only updates from the specified repository.\n" - " --best-effort Do a 'best effort' approach to update. Updates\n" - " to a lower than the latest version are\n" - " also acceptable.\n" - ), "package, patch, pattern, product", "patch"); + "-t, --type <type> Type of package (%s).\n" + " Default: %s.\n" + "-r, --repo <alias|#|URI> List only updates from the specified repository.\n" + " --best-effort Do a 'best effort' approach to update. Updates\n" + " to a lower than the latest version are\n" + " also acceptable.\n" + "-a, --all List all packages for which newer versions are\n" + " available, regardless whether they are\n" + " installable or not.\n" + ), "package, patch, pattern, product", "package"); break; } Modified: trunk/zypper/src/update.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/update.cc?rev=11197&r… ============================================================================== --- trunk/zypper/src/update.cc (original) +++ trunk/zypper/src/update.cc Mon Sep 29 12:08:06 2008 @@ -261,10 +261,24 @@ find_updates( const ResKind & kind, Candidates & candidates ) { const zypp::ResPool& pool = God->pool(); + DBG << "Looking for update candidates of kind " << kind << endl; + + // package updates + if (kind == ResKind::package && !Zypper::instance()->cOpts().count("all")) + { + God->resolver()->doUpdate(); + ResPool::const_iterator + it = God->pool().begin(), + e = God->pool().end(); + for (; it != e; ++it) + if (it->status().isToBeInstalled()) + candidates.insert(*it); + return; + } + ResPool::byKind_iterator it = pool.byKindBegin (kind), e = pool.byKindEnd (kind); - DBG << "Looking for update candidates of kind " << kind << endl; for (; it != e; ++it) { if (it->status().isUninstalled()) -- 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] r11196 - /trunk/zypper/package/zypper.changes
by jkupec＠svn.opensuse.org 29 Sep '08

29 Sep '08

Author: jkupec Date: Mon Sep 29 10:48:10 2008 New Revision: 11196 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11196&view=rev Log: - changes Modified: trunk/zypper/package/zypper.changes Modified: trunk/zypper/package/zypper.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/package/zypper.changes?re… ============================================================================== --- trunk/zypper/package/zypper.changes (original) +++ trunk/zypper/package/zypper.changes Mon Sep 29 10:48:10 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Sep 29 10:47:08 CEST 2008 - jkupec(a)suse.cz + +- proper error message if the repository type can't be determined + on refresh (bnc #389690) +- r11195 + +------------------------------------------------------------------- Sun Sep 28 22:07:18 CEST 2008 - jkupec(a)suse.cz - 'update' and 'list-updates' now defaults to '-t package' -- 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] r11195 - in /trunk/zypper: doc/TODO src/repos.cc
by jkupec＠svn.opensuse.org 29 Sep '08

29 Sep '08

Author: jkupec Date: Mon Sep 29 10:46:24 2008 New Revision: 11195 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11195&view=rev Log: - proper error message if the repository type can't be determined on refresh (bnc #389690) Modified: trunk/zypper/doc/TODO trunk/zypper/src/repos.cc Modified: trunk/zypper/doc/TODO URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/TODO?rev=11195&r1=111… ============================================================================== --- trunk/zypper/doc/TODO (original) +++ trunk/zypper/doc/TODO Mon Sep 29 10:46:24 2008 @@ -5,8 +5,6 @@ - implement all rug commands (where it makes sense) - zypper [help] rug - add help texts for prompts -- show recommended and suggested in the summary -- report licenses of installed software NOT SCHEDULED @@ -37,3 +35,4 @@ User can upgrade such packages with 'zypper in foo' then. ? list packages newly added to repos since last update (might be easy once we have package history) +- show recommended and suggested in the summary Modified: trunk/zypper/src/repos.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/repos.cc?rev=11195&r1… ============================================================================== --- trunk/zypper/src/repos.cc (original) +++ trunk/zypper/src/repos.cc Mon Sep 29 10:46:24 2008 @@ -80,7 +80,7 @@ _("Checking whether to refresh metadata for %s")) % repo.name()), Out::HIGH); for(RepoInfo::urls_const_iterator it = repo.baseUrlsBegin(); - it != repo.baseUrlsEnd(); ++it) + it != repo.baseUrlsEnd();) { try { @@ -115,7 +115,11 @@ catch (const Exception & e) { ZYPP_CAUGHT(e); - ERR << *it << " doesn't look good. Trying another url." << endl; + Url badurl(*it); + if (++it == repo.baseUrlsEnd()) + ZYPP_RETHROW(e); + ERR << badurl << " doesn't look good. Trying another url (" + << *it << ")." << endl; } } } @@ -262,7 +266,7 @@ { ZYPP_CAUGHT(e); zypper.out().error(e, - _("Error building the cache database:")); + _("Error building the cache:")); // log untranslated message ERR << "Error writing to cache db" << endl; -- 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] r11194 - in /trunk/zypper: doc/zypper.8 package/zypper.changes
by jkupec＠svn.opensuse.org 28 Sep '08

28 Sep '08

Author: jkupec Date: Mon Sep 29 00:29:11 2008 New Revision: 11194 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11194&view=rev Log: - doc and changes Modified: trunk/zypper/doc/zypper.8 trunk/zypper/package/zypper.changes Modified: trunk/zypper/doc/zypper.8 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper.8?rev=11194&r1… ============================================================================== --- trunk/zypper/doc/zypper.8 (original) +++ trunk/zypper/doc/zypper.8 Mon Sep 29 00:29:11 2008 @@ -1,7 +1,7 @@ -.TH "zypper" "8" "0.12.6" "zypper" "System Tools" +.TH "zypper" "8" "0.12.7" "zypper" "System Tools" .SH "SYNTAX" .LP -zypper [\fI\-\-global\-options\fR] <\fBcommand\fR> [\fI\-\-command\-options\fR] [\fBcommand-arguments\fR] +zypper [\fI\-\-global\-opts\fR] <\fBcommand\fR> [\fI\-\-command\-opts\fR] [\fBcommand-arguments\fR] zypper \fBhelp\fR [\fBcommand\fR] .SH "DESCRIPTION" @@ -285,21 +285,6 @@ Create solver test case for debugging. See the install command for details. .TP -.B list-updates (lu) [options] -List available updates. -.TP -\fI\-t, --type\fR <type> -Type of package (default: patch). See the beginning of this subsection for the list -of available package types. -.TP -\fI\-r, \-\-repo\fR <alias|#|URI> -List only updates from the repository specified by the alias, number or URI. -This option can be used multiple times. - -See also the NOTE at -.BR update . - -.TP .B remove (rm) [options] <name> ... .TP .B remove (rm) [options] --capability <capability> ... @@ -341,6 +326,22 @@ Test the removal of packages, do not actually remove anything. This option will add the \-\-test option to the rpm commands run by the remove command. + +.SS Update Management Commands + + +.TP +.B list-updates (lu) [options] +List available updates. +.TP +\fI\-t, --type\fR <type> +Type of package (default: package). See Package Managemet Commands subsection +for the list of available package types. +.TP +\fI\-r, \-\-repo\fR <alias|#|URI> +List only updates from the repository specified by the alias, number or URI. +This option can be used multiple times. + .TP .B update (up) [options] [packagename] ... Update installed packages with patches or newer version, where applicable. @@ -349,16 +350,10 @@ use the '*' and '?' wildcard characters in the package names to specify multiple packages matching the pattern. -.B NOTE: -Zypper prefers to update only those packages for which a patch -description exists, like on the SUSE update servers. To operate on all -packages for which there is a better version instead, select \fI--type -package\fR which is also the default in rug compatibility mode. - .TP \fI\-t, -\-type\fR <type> -Type of package (default: patch). See the beginning of this subsection for the list -of available package types. +Type of package (default: package). See Package Management Commands subsection +for the list of available package types. .TP \fI\-r, \-\-repo\fR <alias|#|URI> Limit updates to repository specified by alias, number or URI. @@ -390,6 +385,36 @@ add the \-\-test option to the rpm commands run by the update command. .TP +.B list-patches (lp) [options] +List all available needed patches. + +.TP +.I \-r, --repo <alias|#|URI> +List only patches from the specified repository. + + +.TP +.B patch [options] +Install all available needed patches. + +.TP +.I \-r, \-\-repo <alias|#|URI> +Work only with specified repository. +.TP +.I \-\-skip\-interactive +Skip interactive patches. +.TP +.I \-l, \-\-auto\-agree\-with\-licenses +See the \fBupdate\fR command for description of this option. +.TP +.I \-\-debug\-solver +Create test case for debugging of dependency resolver. +.TP +.I \-D, \-\-dry\-run +Test the update, do not actually update. + + +.TP .B dist-upgrade (dup) [options] Perform a distribution upgrade. This command performs an update of all packages with a special resolver algorithm which takes care of package splits, pattern @@ -410,6 +435,10 @@ Test the upgrade, do not actually install or update any package. This option will add the \-\-test option to the rpm commands run by the dist-upgrade command. + +.SS Query Commands + + .TP \fBsearch\fR (\fBse\fR) [\fIoptions\fR] [\fBquerystring\fR] ... Search for packages matching given strings. * (any substring) and ? (any character) wildcards can also be used within search strings. Modified: trunk/zypper/package/zypper.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/package/zypper.changes?re… ============================================================================== --- trunk/zypper/package/zypper.changes (original) +++ trunk/zypper/package/zypper.changes Mon Sep 29 00:29:11 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Sun Sep 28 22:07:18 CEST 2008 - jkupec(a)suse.cz + +- 'update' and 'list-updates' now defaults to '-t package' + patch/list-patches commands added to install/list patches + (bnc #395480) +- r11191 + +------------------------------------------------------------------- Thu Sep 25 16:17:15 CEST 2008 - jkupec(a)suse.cz - sort packages by name in the install summary (bnc #389128) -- 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] r11193 - /trunk/zypper/src/Zypper.cc
by jkupec＠svn.opensuse.org 28 Sep '08

28 Sep '08

Author: jkupec Date: Sun Sep 28 23:42:54 2008 New Revision: 11193 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11193&view=rev Log: - wrapped main help at 79th column (bnc #423007) Modified: trunk/zypper/src/Zypper.cc Modified: trunk/zypper/src/Zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/Zypper.cc?rev=11193&r… ============================================================================== --- trunk/zypper/src/Zypper.cc (original) +++ trunk/zypper/src/Zypper.cc Sun Sep 28 23:42:54 2008 @@ -154,29 +154,32 @@ static string help_global_options = _(" Global Options:\n" "\t--help, -h\t\tHelp.\n" "\t--version, -V\t\tOutput the version number.\n" - "\t--quiet, -q\t\tSuppress normal output, print only error messages.\n" + "\t--quiet, -q\t\tSuppress normal output, print only error\n" + "\t\t\t\tmessages.\n" "\t--verbose, -v\t\tIncrease verbosity.\n" "\t--no-abbrev, -A\t\tDo not abbreviate text in tables.\n" "\t--table-style, -s\tTable style (integer).\n" "\t--rug-compatible, -r\tTurn on rug compatibility.\n" - "\t--non-interactive, -n\tDo not ask anything, use default answers automatically.\n" + "\t--non-interactive, -n\tDo not ask anything, use default answers\n" + "\t\t\t\tautomatically.\n" "\t--xmlout, -x\t\tSwitch to XML output.\n" - "\t--reposd-dir, -D <dir>\tUse alternative repository definition files directory.\n" - "\t--cache-dir, -C <dir>\tUse alternative meta-data cache database directory.\n" + "\t--reposd-dir, -D <dir>\tUse alternative repository definition files\n" + "\t\t\t\tdirectory.\n" + "\t--cache-dir, -C <dir>\tUse alternative meta-data cache directory.\n" "\t--raw-cache-dir <dir>\tUse alternative raw meta-data cache directory.\n" ); - static string help_global_source_options = _( - "\tRepository Options:\n" + static string help_global_source_options = _(" Repository Options:\n" "\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n" "\t--plus-repo, -p <URI>\tUse an additional repository.\n" "\t--disable-repositories\tDo not read meta-data from repositories.\n" "\t--no-refresh\t\tDo not refresh the repositories.\n" ); - static string help_global_target_options = _("\tTarget Options:\n" + static string help_global_target_options = _(" Target Options:\n" "\t--root, -R <dir>\tOperate on a different root directory.\n" - "\t--disable-system-resolvables Do not read installed resolvables.\n" + "\t--disable-system-resolvables\n" + "\t\t\t\tDo not read installed packages.\n" ); static string help_commands = _( @@ -185,7 +188,7 @@ "\tshell, sh\t\tAccept multiple commands at once.\n" ); - static string help_repo_commands = _("\tRepository Handling:\n" + static string help_repo_commands = _(" Repository Management:\n" "\trepos, lr\t\tList all defined repositories.\n" "\taddrepo, ar\t\tAdd a new repository.\n" "\tremoverepo, rr\t\tRemove specified repository.\n" @@ -195,7 +198,7 @@ "\tclean\t\t\tClean local caches.\n" ); - static string help_service_commands = _("\tService Handling:\n" + static string help_service_commands = _(" Service Management:\n" "\tservices, ls\t\tList all defined services.\n" "\taddservice, as\t\tAdd a new service.\n" "\tmodifyservice, ms\tModify specified service.\n" @@ -203,24 +206,27 @@ "\trefresh-services, refs\tRefresh all services.\n" ); - static string help_package_commands = _("\tSoftware Management:\n" + static string help_package_commands = _(" Software Management:\n" "\tinstall, in\t\tInstall packages.\n" "\tremove, rm\t\tRemove packages.\n" "\tverify, ve\t\tVerify integrity of package dependencies.\n" - "\tsource-install, si\tInstall source packages and their build dependencies.\n" - "\tinstall-new-recommends, inr Install newly added packages recommended by installed packages.\n" + "\tsource-install, si\tInstall source packages and their build\n" + "\t\t\t\tdependencies.\n" + "\tinstall-new-recommends, inr\n" + "\t\t\t\tInstall newly added packages recommended\n" + "\t\t\t\tby installed packages.\n" ); - static string help_update_commands = _("\tUpdate Management:\n" + static string help_update_commands = _(" Update Management:\n" "\tupdate, up\t\tUpdate installed packages with newer versions.\n" "\tlist-updates, lu\tList available updates.\n" "\tpatch\t\t\tInstall needed patches.\n" - "\tlist-updates, lu\tList needed patches.\n" + "\tlist-patches, lp\tList needed patches.\n" "\tdist-upgrade, dup\tPerform a distribution upgrade.\n" "\tpatch-check, pchk\tCheck for patches.\n" ); - static string help_query_commands = _("\tQuerying:\n" + static string help_query_commands = _(" Querying:\n" "\tsearch, se\t\tSearch for packages matching a pattern.\n" "\tinfo, if\t\tShow full information for specified packages.\n" "\tpatch-info\t\tShow full information for specified patches.\n" @@ -235,16 +241,17 @@ //"\twhat-conflicts, wc\tList packages conflicting with specified capability.\n" ); - static string help_lock_commands = _("\tPackage Locks:\n" + static string help_lock_commands = _(" Package Locks:\n" "\taddlock, al\t\tAdd a package lock.\n" "\tremovelock, rl\t\tRemove a package lock.\n" "\tlocks, ll\t\tList current package locks.\n" ); - static string help_other_commands = _("\tOther Commands:\n" + static string help_other_commands = _(" Other Commands:\n" "\tversioncmp, vcmp\tCompare two version strings.\n" "\ttargetos, tos\t\tPrint the target operating system ID string.\n" - "\tlicenses\t\tPrint report about licenses and EULAs of installed packages.\n" + "\tlicenses\t\tPrint report about licenses and EULAs of\n" + "\t\t\t\tinstalled packages.\n" ); static string help_usage = _( -- 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] r11192 - /trunk/zypper/src/Zypper.cc
by jkupec＠svn.opensuse.org 28 Sep '08

28 Sep '08

Author: jkupec Date: Sun Sep 28 22:17:52 2008 New Revision: 11192 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11192&view=rev Log: - use 'package' instead of 'resolvable' in user texts Modified: trunk/zypper/src/Zypper.cc Modified: trunk/zypper/src/Zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/Zypper.cc?rev=11192&r… ============================================================================== --- trunk/zypper/src/Zypper.cc (original) +++ trunk/zypper/src/Zypper.cc Sun Sep 28 22:17:52 2008 @@ -852,16 +852,16 @@ // and the second %s = "package" "install (in) [options] <capability|rpm_file_uri> ...\n" "\n" - "Install resolvables with specified capabilities or RPM files with" + "Install packages with specified capabilities or RPM files with" " specified location. A capability is" " NAME[OP<VERSION>], where OP is one of <, <=, =, >=, >.\n" "\n" " Command options:\n" - "-r, --repo <alias|#|URI> Install resolvables only from the specified repository.\n" - "-t, --type <type> Type of resolvable (%s).\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 resolvables by plain name, not by capability.\n" - "-C, --capability Select resolvables by capability.\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" @@ -901,15 +901,15 @@ // and the second %s = "package" "remove (rm) [options] <capability> ...\n" "\n" - "Remove resolvables with specified capabilities. A capability is" + "Remove packages with specified capabilities. A capability is" " NAME[OP<VERSION>], where OP is one of <, <=, =, >=, >.\n" "\n" " Command options:\n" - "-r, --repo <alias|#|URI> Operate only with resolvables from the specified repository.\n" + "-r, --repo <alias|#|URI> Operate only with packages from the specified repository.\n" "-t, --type <type> Type of resolvable (%s).\n" " Default: %s.\n" - "-n, --name Select resolvables by plain name, not by capability.\n" - "-C, --capability Select resolvables by capability.\n" + "-n, --name Select packages by plain name, not by capability.\n" + "-C, --capability Select packages by capability.\n" " --debug-solver Create solver test case for debugging.\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" @@ -1406,7 +1406,7 @@ "List all available updates.\n" "\n" " Command options:\n" - "-t, --type <type> Type of resolvable (%s).\n" + "-t, --type <type> Type of package (%s).\n" " Default: %s.\n" "-r, --repo <alias|#|URI> List only updates from the specified repository.\n" " --best-effort Do a 'best effort' approach to update. Updates\n" @@ -1455,7 +1455,7 @@ "\n" " Command options:\n" "\n" - "-t, --type <type> Type of resolvable (%s).\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" @@ -1752,7 +1752,7 @@ "\n" " Command options:\n" "-r, --repo <alias|#|URI> Work only with the specified repository.\n" - "-t, --type <type> Type of resolvable (%s).\n" + "-t, --type <type> Type of package (%s).\n" " Default: %s." ), "package, patch, pattern, product", "package"); @@ -1904,7 +1904,7 @@ "\n" " Command options:\n" "-r, --repo <alias|#|URI> Restrict the lock to the specified repository.\n" - "-t, --type <type> Type of resolvable (%s).\n" + "-t, --type <type> Type of package (%s).\n" " Default: %s.\n" ), "package, patch, pattern, product", "package"); @@ -2897,7 +2897,7 @@ string skind = copts.count("type")? copts["type"].front() : "package"; kind = string_to_kind (skind); if (kind == ResObject::Kind ()) { - out().error(boost::str(format(_("Unknown resolvable type: %s")) % skind)); + out().error(boost::str(format(_("Unknown package type: %s")) % skind)); setExitCode(ZYPPER_EXIT_ERR_INVALID_ARGS); return; } @@ -3142,7 +3142,7 @@ if (kind == ResObject::Kind()) { out().error(boost::str(format( - _("Unknown resolvable type '%s'.")) % *it)); + _("Unknown package type '%s'.")) % *it)); setExitCode(ZYPPER_EXIT_ERR_INVALID_ARGS); return; } @@ -3402,7 +3402,7 @@ if (kind == ResObject::Kind()) { out().error(boost::str(format( - _("Unknown resolvable type '%s'.")) % *it)); + _("Unknown package type '%s'.")) % *it)); setExitCode(ZYPPER_EXIT_ERR_INVALID_ARGS); return; } @@ -3486,7 +3486,7 @@ if (kind == ResObject::Kind()) { out().error(boost::str(format( - _("Unknown resolvable type '%s'.")) % *it)); + _("Unknown package type '%s'.")) % *it)); setExitCode(ZYPPER_EXIT_ERR_INVALID_ARGS); return; } @@ -3609,7 +3609,7 @@ kind = string_to_kind (skind); if (kind == ResObject::Kind ()) { out().error(boost::str(format( - _("Unknown resolvable type '%s'.")) % skind)); + _("Unknown package type '%s'.")) % skind)); setExitCode(ZYPPER_EXIT_ERR_INVALID_ARGS); return; } @@ -3677,7 +3677,7 @@ if (kind == ResObject::Kind()) { out().error(boost::str(format( - _("Unknown resolvable type '%s'.")) % *it)); + _("Unknown package type '%s'.")) % *it)); setExitCode(ZYPPER_EXIT_ERR_INVALID_ARGS); return; } -- 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] r11191 - in /trunk/zypper/src: Command.cc Command.h Zypper.cc update.cc
by jkupec＠svn.opensuse.org 28 Sep '08

28 Sep '08

Author: jkupec Date: Sun Sep 28 22:06:54 2008 New Revision: 11191 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11191&view=rev Log: - 'update' and 'list-updates' now defaults to '-t package' patch/list-patches commands added to install/list patches (bnc #395480) Modified: trunk/zypper/src/Command.cc trunk/zypper/src/Command.h trunk/zypper/src/Zypper.cc trunk/zypper/src/update.cc Modified: trunk/zypper/src/Command.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/Command.cc?rev=11191&… ============================================================================== --- trunk/zypper/src/Command.cc (original) +++ trunk/zypper/src/Command.cc Sun Sep 28 22:06:54 2008 @@ -38,16 +38,19 @@ const ZypperCommand ZypperCommand::INSTALL(ZypperCommand::INSTALL_e); const ZypperCommand ZypperCommand::REMOVE(ZypperCommand::REMOVE_e); -const ZypperCommand ZypperCommand::UPDATE(ZypperCommand::UPDATE_e); -const ZypperCommand ZypperCommand::DIST_UPGRADE(ZypperCommand::DIST_UPGRADE_e); const ZypperCommand ZypperCommand::SRC_INSTALL(ZypperCommand::SRC_INSTALL_e); const ZypperCommand ZypperCommand::VERIFY(ZypperCommand::VERIFY_e); const ZypperCommand ZypperCommand::INSTALL_NEW_RECOMMENDS(ZypperCommand::INSTALL_NEW_RECOMMENDS_e); -const ZypperCommand ZypperCommand::SEARCH(ZypperCommand::SEARCH_e); -const ZypperCommand ZypperCommand::INFO(ZypperCommand::INFO_e); +const ZypperCommand ZypperCommand::UPDATE(ZypperCommand::UPDATE_e); const ZypperCommand ZypperCommand::LIST_UPDATES(ZypperCommand::LIST_UPDATES_e); +const ZypperCommand ZypperCommand::PATCH(ZypperCommand::PATCH_e); +const ZypperCommand ZypperCommand::LIST_PATCHES(ZypperCommand::LIST_PATCHES_e); const ZypperCommand ZypperCommand::PATCH_CHECK(ZypperCommand::PATCH_CHECK_e); +const ZypperCommand ZypperCommand::DIST_UPGRADE(ZypperCommand::DIST_UPGRADE_e); + +const ZypperCommand ZypperCommand::SEARCH(ZypperCommand::SEARCH_e); +const ZypperCommand ZypperCommand::INFO(ZypperCommand::INFO_e); const ZypperCommand ZypperCommand::PACKAGES(ZypperCommand::PACKAGES_e); const ZypperCommand ZypperCommand::PATCHES(ZypperCommand::PATCHES_e); const ZypperCommand ZypperCommand::PATTERNS(ZypperCommand::PATTERNS_e); @@ -110,16 +113,19 @@ _table["install"] = _table["in"] = ZypperCommand::INSTALL_e; _table["remove"] = _table["rm"] = ZypperCommand::REMOVE_e; - _table["update"] = _table["up"] = ZypperCommand::UPDATE_e; - _table["dist-upgrade"] = _table["dup"] = ZypperCommand::DIST_UPGRADE_e; _table["source-install"] = _table["si"] = ZypperCommand::SRC_INSTALL_e; _table["verify"] = _table["ve"] = ZypperCommand::VERIFY_e; _table["install-new-recommends"] = _table["inr"] = ZypperCommand::INSTALL_NEW_RECOMMENDS_e; - _table["search"] = _table["se"] = ZypperCommand::SEARCH_e; - _table["info"] = _table["if"] = ZypperCommand::INFO_e; + _table["update"] = _table["up"] = ZypperCommand::UPDATE_e; _table["list-updates"] = _table["lu"] = ZypperCommand::LIST_UPDATES_e; + _table["patch"] = ZypperCommand::PATCH_e; + _table["list-patches"] = _table["lp"] = ZypperCommand::LIST_PATCHES_e; _table["patch-check"] = _table["pchk"] = ZypperCommand::PATCH_CHECK_e; + _table["dist-upgrade"] = _table["dup"] = ZypperCommand::DIST_UPGRADE_e; + + _table["search"] = _table["se"] = ZypperCommand::SEARCH_e; + _table["info"] = _table["if"] = ZypperCommand::INFO_e; _table["packages"] = _table["pa"] = _table["pkg"] = ZypperCommand::PACKAGES_e; _table["patches"] = _table["pch"] = ZypperCommand::PATCHES_e; _table["patterns"] = _table["pt"] = ZypperCommand::PATTERNS_e; Modified: trunk/zypper/src/Command.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/Command.h?rev=11191&r… ============================================================================== --- trunk/zypper/src/Command.h (original) +++ trunk/zypper/src/Command.h Sun Sep 28 22:06:54 2008 @@ -33,16 +33,19 @@ static const ZypperCommand INSTALL; static const ZypperCommand REMOVE; - static const ZypperCommand UPDATE; - static const ZypperCommand DIST_UPGRADE; static const ZypperCommand SRC_INSTALL; static const ZypperCommand VERIFY; static const ZypperCommand INSTALL_NEW_RECOMMENDS; + + static const ZypperCommand UPDATE; + static const ZypperCommand LIST_UPDATES; + static const ZypperCommand PATCH; + static const ZypperCommand LIST_PATCHES; + static const ZypperCommand PATCH_CHECK; + static const ZypperCommand DIST_UPGRADE; static const ZypperCommand SEARCH; static const ZypperCommand INFO; - static const ZypperCommand LIST_UPDATES; - static const ZypperCommand PATCH_CHECK; static const ZypperCommand PACKAGES; static const ZypperCommand PATCHES; static const ZypperCommand PATTERNS; @@ -102,16 +105,19 @@ INSTALL_e, REMOVE_e, - UPDATE_e, - DIST_UPGRADE_e, SRC_INSTALL_e, VERIFY_e, INSTALL_NEW_RECOMMENDS_e, - SEARCH_e, - INFO_e, + UPDATE_e, LIST_UPDATES_e, + PATCH_e, + LIST_PATCHES_e, PATCH_CHECK_e, + DIST_UPGRADE_e, + + SEARCH_e, + INFO_e, PACKAGES_e, PATCHES_e, PATTERNS_e, Modified: trunk/zypper/src/Zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/Zypper.cc?rev=11191&r… ============================================================================== --- trunk/zypper/src/Zypper.cc (original) +++ trunk/zypper/src/Zypper.cc Sun Sep 28 22:06:54 2008 @@ -207,20 +207,25 @@ "\tinstall, in\t\tInstall packages.\n" "\tremove, rm\t\tRemove packages.\n" "\tverify, ve\t\tVerify integrity of package dependencies.\n" - "\tupdate, up\t\tUpdate installed packages with newer versions.\n" - "\tdist-upgrade, dup\tPerform a distribution upgrade.\n" "\tsource-install, si\tInstall source packages and their build dependencies.\n" "\tinstall-new-recommends, inr Install newly added packages recommended by installed packages.\n" ); + static string help_update_commands = _("\tUpdate Management:\n" + "\tupdate, up\t\tUpdate installed packages with newer versions.\n" + "\tlist-updates, lu\tList available updates.\n" + "\tpatch\t\t\tInstall needed patches.\n" + "\tlist-updates, lu\tList needed patches.\n" + "\tdist-upgrade, dup\tPerform a distribution upgrade.\n" + "\tpatch-check, pchk\tCheck for patches.\n" + ); + static string help_query_commands = _("\tQuerying:\n" "\tsearch, se\t\tSearch for packages matching a pattern.\n" "\tinfo, if\t\tShow full information for specified packages.\n" "\tpatch-info\t\tShow full information for specified patches.\n" "\tpattern-info\t\tShow full information for specified patterns.\n" "\tproduct-info\t\tShow full information for specified products.\n" - "\tpatch-check, pchk\tCheck for patches.\n" - "\tlist-updates, lu\tList available updates.\n" "\tpatches, pch\t\tList all available patches.\n" "\tpackages, pa\t\tList all available packages.\n" "\tpatterns, pt\t\tList all available patterns.\n" @@ -255,6 +260,7 @@ zypper.out().info(help_repo_commands, Out::QUIET); zypper.out().info(help_service_commands, Out::QUIET); zypper.out().info(help_package_commands, Out::QUIET); + zypper.out().info(help_update_commands, Out::QUIET); zypper.out().info(help_query_commands, Out::QUIET); zypper.out().info(help_lock_commands, Out::QUIET); zypper.out().info(help_other_commands, Out::QUIET); @@ -693,6 +699,7 @@ case ZypperCommand::INSTALL_e: case ZypperCommand::REMOVE_e: case ZypperCommand::UPDATE_e: + case ZypperCommand::PATCH_e: { remove_selections(*this); break; @@ -1442,9 +1449,9 @@ _command_help = str::form(_( // TranslatorExplanation the first %s = "package, patch, pattern, product" // and the second %s = "patch" - "update (up) [options]\n" + "update (up) [options] ...\n" "\n" - "Update all installed resolvables with newer versions, where applicable.\n" + "Update all or specified installed packages with newer versions, if possible.\n" "\n" " Command options:\n" "\n" @@ -1452,7 +1459,8 @@ " 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 confirmation prompt.\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" @@ -1462,7 +1470,57 @@ "-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" - ), "package, patch, pattern, product", "patch"); + ), "package, patch, pattern, product", "package"); + break; + } + + case ZypperCommand::PATCH_e: + { + static struct option update_options[] = { + {"repo", required_argument, 0, 'r'}, + {"skip-interactive", no_argument, 0, 0}, + {"auto-agree-with-licenses", no_argument, 0, 'l'}, + {"debug-solver", no_argument, 0, 0}, + {"no-recommends", no_argument, 0, 0 }, + {"dry-run", no_argument, 0, 'D'}, + {"help", no_argument, 0, 'h'}, + {0, 0, 0, 0} + }; + specific_options = update_options; + _command_help = _( + "patch [options]\n" + "\n" + "Install all available needed patches.\n" + "\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" + ); + break; + } + + case ZypperCommand::LIST_PATCHES_e: + { + static struct option list_updates_options[] = { + {"repo", required_argument, 0, 'r'}, + {"help", no_argument, 0, 'h'}, + {0, 0, 0, 0} + }; + specific_options = list_updates_options; + _command_help = _( + "list-patches (lp) [options]\n" + "\n" + "List all available needed patches.\n" + "\n" + " Command options:\n" + "-r, --repo <alias|#|URI> List only patches from the specified repository.\n" + ); break; } @@ -3322,6 +3380,7 @@ // --------------------------( list updates )------------------------------- case ZypperCommand::LIST_UPDATES_e: + case ZypperCommand::LIST_PATCHES_e: { if (runningHelp()) { out().info(_command_help, Out::QUIET); return; } @@ -3350,20 +3409,22 @@ kinds.insert(kind); } } - else if (globalOpts().is_rug_compatible) - kinds.insert(ResKind::package); - else + else if (command() == ZypperCommand::LIST_PATCHES) kinds.insert(ResKind::patch); + else + kinds.insert(ResKind::package); bool best_effort = copts.count( "best-effort" ); - if (globalOpts().is_rug_compatible && best_effort) { - best_effort = false; - // 'rug' is the name of a program and must not be translated - // 'best-effort' is a program parameter and can not be translated - out().warning( - _("Running as 'rug', can't do 'best-effort' approach to update.")); + if (globalOpts().is_rug_compatible && best_effort) + { + best_effort = false; + // translators: Running as 'rug', cannot use 'best-effort' option. + out().info(str::form( + _("Running as '%s', cannot use '%s' option."), "rug", "best-effort"), + Out::HIGH); } + initRepoManager(); init_target(*this); init_repos(*this); @@ -3380,6 +3441,7 @@ // -----------------------------( update )---------------------------------- case ZypperCommand::UPDATE_e: + case ZypperCommand::PATCH_e: { if (runningHelp()) { out().info(_command_help, Out::QUIET); return; } @@ -3392,6 +3454,14 @@ return; } + // too many arguments + if (!_arguments.empty() && command() == ZypperCommand::PATCH) + { + report_too_many_arguments(_command_help); + setExitCode(ZYPPER_EXIT_ERR_INVALID_ARGS); + return; + } + if (_copts.count("download-only")) report_dummy_option(out(), "download-only"); if (_copts.count("category")) @@ -3423,19 +3493,19 @@ kinds.insert(kind); } } - else if (globalOpts().is_rug_compatible || !_arguments.empty() /* bnc #385990*/) - kinds.insert(ResKind::package); - else + else if (command() == ZypperCommand::PATCH) kinds.insert(ResKind::patch); + else + kinds.insert(ResKind::package); bool best_effort = copts.count( "best-effort" ); if (globalOpts().is_rug_compatible && best_effort) { best_effort = false; - out().warning(str::form( - // translators: Running as 'rug', can't do 'best-effort' approach to update. - _("Running as '%s', cannot do '%s' approach to update."), - "rug", "best-effort")); + out().info(str::form( + // translators: Running as 'rug', cannot use 'best-effort' option. + _("Running as '%s', cannot use '%s' option."), "rug", "best-effort"), + Out::HIGH); } init_target(*this); @@ -3446,9 +3516,9 @@ init_repos(*this, _arguments); else init_repos(*this); - if (exitCode() != ZYPPER_EXIT_OK) return; + load_resolvables(*this); resolve(*this); // needed to compute status of PPP Modified: trunk/zypper/src/update.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/update.cc?rev=11191&r… ============================================================================== --- trunk/zypper/src/update.cc (original) +++ trunk/zypper/src/update.cc Sun Sep 28 22:06:54 2008 @@ -611,6 +611,8 @@ void mark_updates(Zypper & zypper, const ResKindSet & kinds, bool skip_interactive, bool best_effort ) { + MIL << endl; + ResKindSet localkinds = kinds; if (zypper.arguments().empty() || zypper.globalOpts().is_rug_compatible) @@ -619,6 +621,7 @@ { if (*kindit == ResKind::package) { + MIL << "Computing package update..." << endl; // this will do a complete pacakge update as far as possible God->resolver()->doUpdate(); // no need to call Resolver::resolvePool() afterwards -- 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] r11190 - in /trunk/zypper/src: callbacks/media.h output/OutNormal.cc utils/prompt.cc utils/prompt.h
by jkupec＠svn.opensuse.org 28 Sep '08

28 Sep '08

Author: jkupec Date: Sun Sep 28 12:44:51 2008 New Revision: 11190 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11190&view=rev Log: - improved authentication dialog - fixed showing password as typed (bnc #400104) Modified: trunk/zypper/src/callbacks/media.h trunk/zypper/src/output/OutNormal.cc trunk/zypper/src/utils/prompt.cc trunk/zypper/src/utils/prompt.h Modified: trunk/zypper/src/callbacks/media.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/callbacks/media.h?rev… ============================================================================== --- trunk/zypper/src/callbacks/media.h (original) +++ trunk/zypper/src/callbacks/media.h Sun Sep 28 12:44:51 2008 @@ -217,20 +217,36 @@ dynamic_cast<zypp::media::CurlAuthData*> (&auth_data); if (auth_data_ptr) { -//! \todo move this to prompt help once it's done -// cout_vv << "available auth types: " -// << auth_data_ptr->authTypeAsString() << std::endl; - - Zypper::instance()->out().prompt( - PROMPT_AUTH_USERNAME, description, PromptOptions(_("User Name"), 0)); + + // user name + std::string username; - std::cin >> username; - auth_data_ptr->setUserName(username); + // expect the input from machine on stdin + if (Zypper::instance()->globalOpts().machine_readable) + { + Zypper::instance()->out().prompt( + PROMPT_AUTH_USERNAME, _("User Name"), PromptOptions(), description); + std::cin >> username; + } + // input from human using readline + else + { + std::cout << description << std::endl; + username = get_text(_("User Name") + std::string(": "), auth_data.username()); + } + auth_data_ptr->setUsername(username); + // password + Zypper::instance()->out().prompt( - PROMPT_AUTH_PASSWORD, description, PromptOptions(_("Password"), 0)); + PROMPT_AUTH_PASSWORD, _("Password"), PromptOptions()); + std::string password; - std::cin >> password; + // expect the input from machine on stdin + if (Zypper::instance()->globalOpts().machine_readable) + std::cin >> password; + else + password = get_password(); if (password.empty()) return false; auth_data_ptr->setPassword(password); Modified: trunk/zypper/src/output/OutNormal.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/OutNormal.cc?r… ============================================================================== --- trunk/zypper/src/output/OutNormal.cc (original) +++ trunk/zypper/src/output/OutNormal.cc Sun Sep 28 12:44:51 2008 @@ -237,7 +237,10 @@ cout << CLEARLN; else cout << startdesc << endl; - cout << prompt << " [" << poptions.optionString() << "]: " << std::flush; + cout << prompt; + if (!poptions.empty()) + cout << " [" << poptions.optionString() << "]"; + cout << ": " << std::flush; } void OutNormal::promptHelp(const PromptOptions & poptions) Modified: trunk/zypper/src/utils/prompt.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/utils/prompt.cc?rev=1… ============================================================================== --- trunk/zypper/src/utils/prompt.cc (original) +++ trunk/zypper/src/utils/prompt.cc Sun Sep 28 12:44:51 2008 @@ -2,6 +2,10 @@ #include <iostream> #include <sstream> #include <poll.h> +#include <readline/readline.h> +//#include <unistd.h> +#include <termios.h> + #include <boost/format.hpp> @@ -265,3 +269,91 @@ return reply_int; } + +// --------------------------------------------------------------------------- + +static const char * prefill = NULL; + +static int init_line(void) +{ + if (prefill) + { + rl_replace_line(prefill, 1); + rl_end_of_line(1,0); + rl_redisplay(); + } + return 1; +} + +string get_text(const string & prompt, const string & prefilled) +{ + // A static variable for holding the line. + static char * line_read = NULL; + + prefill = prefilled.c_str(); + + /* If the buffer has already been allocated, + return the memory to the free pool. */ + if (line_read) + { + free (line_read); + line_read = NULL; + } + + rl_pre_input_hook = init_line; + + /* Get a line from the user. */ + line_read = ::readline (prompt.c_str()); + + if (line_read) + return line_read; + return string(); +} + +static int silent_getch ( void ) +{ + int ch; + struct termios oldt, newt; + + tcgetattr ( STDIN_FILENO, &oldt ); + newt = oldt; + newt.c_lflag &= ~( ICANON | ECHO ); + tcsetattr ( STDIN_FILENO, TCSANOW, &newt ); + ch = getchar(); + tcsetattr ( STDIN_FILENO, TCSANOW, &oldt ); + + return ch; +} + +/** FIXME is there really not some nice standard library call for this??? + * is it possible to get this from readline? */ +/** \todo restore old terminal settings on interrupt */ +string get_password() +{ + int ch; + char pw[20]; + unsigned i = 0; + + while ((ch = silent_getch()) != EOF + && ch != '\n' + && ch != '\r' + && i < sizeof(pw) - 1) + { + if (i && (ch == '\b' || ch == 127 /* DEL */)) + { +// printf("\b \b"); // does not work for me :O( +// fflush(stdout); + pw[--i] = '\0'; + } + else if (isalnum(ch)) + { +// putchar('*'); + pw[i++] = (char)ch; + } + } + + pw[i] = '\0'; + cout << endl; + + return pw; +} Modified: trunk/zypper/src/utils/prompt.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/utils/prompt.h?rev=11… ============================================================================== --- trunk/zypper/src/utils/prompt.h (original) +++ trunk/zypper/src/utils/prompt.h Sun Sep 28 12:44:51 2008 @@ -31,6 +31,7 @@ void setOptions(const std::string & option_str, unsigned int default_opt); unsigned int defaultOpt() const { return _default; } const std::string optionString() const; + bool empty() const { return _options.empty(); } const std::string optionHelp(unsigned int opt) const { static std::string empty; return opt < _opt_help.size() ? _opt_help[opt] : empty; } @@ -77,6 +78,19 @@ PromptId pid, const PromptOptions & poptions); +/** + * Get text from user using readline without history. + * \param prompt prompt text or empty string + * \param prefilled prefilled text + */ +std::string get_text(const std::string & prompt, const std::string & prefilled = ""); + +/** + * Get text from user without showing the typed text on the terminal. + * Uses getchar(), not suitable for machines. + */ +std::string get_password(); + /* enum Error { NO_ERROR, -- 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] r11189 - /trunk/libzypp/zypp/media/MediaCurl.cc
by jkupec＠svn.opensuse.org 28 Sep '08

28 Sep '08

Author: jkupec Date: Sun Sep 28 12:42:44 2008 New Revision: 11189 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11189&view=rev Log: - preset username for auth callback from CM data Modified: trunk/libzypp/zypp/media/MediaCurl.cc Modified: trunk/libzypp/zypp/media/MediaCurl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaCurl.cc?… ============================================================================== --- trunk/libzypp/zypp/media/MediaCurl.cc (original) +++ trunk/libzypp/zypp/media/MediaCurl.cc Sun Sep 28 12:42:44 2008 @@ -1599,8 +1599,6 @@ // if not found, ask user else { - // reset credentials from CM (they're wrong, obviously) - cmcred.reset(); CurlAuthData_Ptr curlcred; curlcred.reset(new CurlAuthData()); @@ -1609,6 +1607,12 @@ // preset the username if present in current url if (!_url.getUsername().empty() && firstTry) curlcred->setUsername(_url.getUsername()); + // if CM has found some credentials, preset the username from there + else if (cmcred) + curlcred->setUsername(cmcred->username()); + + // indicate we have no good credentials from CM + cmcred.reset(); string prompt_msg = boost::str(boost::format( //!\todo add comma to the message for the next release -- 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] r11188 - in /trunk/libzypp: VERSION.cmake package/libzypp.changes
by jkupec＠svn.opensuse.org 27 Sep '08

27 Sep '08

Author: jkupec Date: Sat Sep 27 23:37:51 2008 New Revision: 11188 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11188&view=rev Log: - changes Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/package/libzypp.changes Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=11188&… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Sat Sep 27 23:37:51 2008 @@ -61,7 +61,7 @@ SET(LIBZYPP_MAJOR "5") SET(LIBZYPP_COMPATMINOR "13") SET(LIBZYPP_MINOR "13") -SET(LIBZYPP_PATCH "0") +SET(LIBZYPP_PATCH "1") # # LAST RELEASED: 5.13.0 (13) # (The number in parenthesis is LIBZYPP_COMPATMINOR) Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Sat Sep 27 23:37:51 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Sat Sep 27 23:36:19 CEST 2008 - jkupec(a)suse.cz + +- fixed endless loop when CredentialManager returns bad password +- CredentialManager now correctly updates password of existing + credentials +- revision 11187 + +------------------------------------------------------------------- Fri Sep 26 15:37:50 CEST 2008 - ma(a)suse.de - Fix computation of Product::flavor. -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0