May 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r10294 - /trunk/zypper/doc/zypper.8
by jkupec＠svn.opensuse.org 31 May '08

31 May '08

Author: jkupec Date: Sat May 31 02:21:22 2008 New Revision: 10294 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10294&view=rev Log: - s/URL/URI, s/resolvable/package + some other cleanup Modified: trunk/zypper/doc/zypper.8 Modified: trunk/zypper/doc/zypper.8 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper.8?rev=10294&r1… ============================================================================== --- trunk/zypper/doc/zypper.8 (original) +++ trunk/zypper/doc/zypper.8 Sat May 31 02:21:22 2008 @@ -8,7 +8,7 @@ .LP zypper is a command\-line interface to ZYpp system management library. It can be used to install, update, remove software, manage repositories, perform -various searches, and more. +various queries, and more. .SH "COMMANDS" .LP @@ -24,13 +24,18 @@ .TP .B shell (sh) Starts a shell for entering multiple commands in one session. -End it by "exit", "quit", or Ctrl-D. +Exit the shell using "exit", "quit", or Ctrl-D. + +The shell support is not complete +so expect bugs there. However, there's no urgent need to use the shell +since libzypp became so fast (opensSUSE 11.0), but still, you're welcome +to experiment with it. .SS Package Management Commands .LP zypper works with several types of resource objects, called -.BR resolvables . +.BR resolvables. A resolvable is a package, patch, pattern, or a product. .LP .B package @@ -44,19 +49,21 @@ .br .B product \- group of packages, which are necessary to install a product - +.LP +Throughout this manual we will refer to resolvables simply as \fIpackages\fR +and to resolvable types as \fIpackages types\fR. .TP .B info (if) <name> ... -Displays full info for the specified packages or other resolvables. +Displays full info for the specified packages. .TP -.I \-r, \-\-repo <alias|#|URL> -Work only with the repository specified by the alias, number or URL. This +.I \-r, \-\-repo <alias|#|URI> +Work only with the repository specified by the alias, number or URI. This option can be used multiple times. .TP .I \-t, \-\-type <type> -Type of resolvable (default: package). Currently supported resolvable types for +Type of package (default: package). Currently supported package types for the info command are: package, patch, pattern, product. .TP @@ -103,21 +110,22 @@ .B $ zypper install -- -boring-game great-game great-game-manual .TP -\fI\-r, \-\-repo\fR <alias|#|URL> -Install resolvables only from the repository specified by the alias, number or URL. +\fI\-r, \-\-repo\fR <alias|#|URI> +Install packages only from the repository specified by the alias, number or URI. This option can be used multiple times. .TP -\fI\-t, \-\-type\fR <resolvable_type> -Type of resolvable (default: package) +\fI\-t, \-\-type\fR <type> +Type of package (default: package). See the beginning of this subsection for the list +of available package types. .TP .I \-n, \-\-name -Select resolvables by their name (default). +Select packages by their name, don't try to select by capabilities. .TP .I \-f, \-\-force Install even if the item is already installed (reinstall) .TP .I \-C, \-\-capability -Select resolvables by capabilities. +Select packages by capabilities. .TP .I \-l, \-\-auto\-agree\-with\-licenses Automatically say 'yes' to third party license confirmation prompt. By using this option, you choose to agree with licenses of all third-party software this command will install. This option is particularly useful for administators installing the same set of packages on multiple machines (by an automated process) and have the licenses confirmed before. @@ -188,11 +196,12 @@ .B list-updates (lu) [options] List available updates. .TP -\fI\-t, --type\fR <resolvable_type> -Type of resolvable (default: patch) +\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|#|URL> -List only updates from the repository specified by the alias, number or URL. +\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 @@ -202,24 +211,25 @@ .B remove (rm) [options] <name> ... .TP .B remove (rm) [options] --capability <capability> ... -Remove packages or other resolvables. +Remove (uninstall) packages. -The resolvables can be selected by their name or by a capability they provide. +The packages can be selected by their name or by a capability they provide. For details see the install command .TP -\fI\-r, \-\-repo\fR <alias|#|URL> -Operate only with resolvables from repository specified by alias, number or URL. +\fI\-r, \-\-repo\fR <alias|#|URI> +Operate only with packages from repository specified by alias, number or URI. This option can be used multiple times. .TP -\fI\-t, -\-type\fR <resolvable_type> -Type of resolvable (default: package) +\fI\-t, -\-type\fR <type> +Type of package (default: package). See the beginning of this subsection for the list +of available package types. .TP .I \-n, \-\-name -Select resolvables by their name (default). +Select packages by their name (default). .TP .I \-C, \-\-capability -Select resolvables by capabilities. +Select packages by capabilities. .TP .I \-\-debug\-solver Create solver test case for debugging. See the install command for details. @@ -251,11 +261,12 @@ package\fR which is also the default in rug compatibility mode. .TP -\fI\-t, -\-type\fR <resolvable_type> -Type of resolvable (default: patch) +\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|#|URL> -Limit updates to repository specified by alias, number or URL. +\fI\-r, \-\-repo\fR <alias|#|URI> +Limit updates to repository specified by alias, number or URI. This option can be used multiple times. .TP .I \-\-skip\-interactive @@ -287,8 +298,8 @@ and product updates, etc. .TP -\fI\-r, \-\-repo\fR <alias|#|URL> -Limit updates to repository specified by alias, number or URL. +\fI\-r, \-\-repo\fR <alias|#|URI> +Limit updates to repository specified by alias, number or URI. This option can be used multiple times. .TP .I \-l, \-\-auto\-agree\-with\-licenses @@ -303,9 +314,9 @@ .TP \fBsearch\fR (\fBse\fR) [\fIoptions\fR] [\fBquerystring\fR] ... -Search for resolvables matching given strings. * (any substring) and ? (any character) wildcards can also be used within search strings. +Search for packages matching given strings. * (any substring) and ? (any character) wildcards can also be used within search strings. .IP -Results of search are printed in a table with following columns: S (status), Catalog, Type (type of resolvable), Name, Version, Arch (architecture). Status column can contain following values: i - installed, v - another version installed, or an empty space for neither of the former cases. +Results of search are printed in a table with following columns: S (status), Catalog, Type (type of package), Name, Version, Arch (architecture). Status column can contain following values: i - installed, v - another version installed, or an empty space for neither of the former cases. .IP In \fBrug compatibility mode\fR the --type option defaults to \fBpackage\fR. Furthermore, Instead of the Type column, rug's Bundle column is printed, however, with no contents. .IP @@ -325,7 +336,7 @@ Matches for search strings may only be whole words. .TP \fI \-\-match-exact\fR -Searches for an exact name of the resolvable. +Searches for an exact name of the package. .TP .I \-d, \-\-search\-descriptions Search also in summaries and descriptions. @@ -334,24 +345,24 @@ Perform case-sensitive search. .TP .I \-i, \-\-installed\-only -Show only resolvables that are already installed. +Show only packages that are already installed. .TP .I \-u, \-\-uninstalled\-only -Show only resolvables that are not currently installed. +Show only packages that are not currently installed. .TP .I \-t, -\-type <type> -Search only for resolvables of specified type. See the beginning of the subsection for the list of available resolvable types. +Search only for packages of specified type. See the beginning of the subsection for the list of available package types. Multiple \-t option are allowed. .TP -.I \-r, \-\-repo <alias|#|URL> -Search only in the repository specified by the alias, number or URL. +.I \-r, \-\-repo <alias|#|URI> +Search only in the repository specified by the alias, number or URI. Multiple \-r options are allowed. .TP \fI \-\-sort\-by\-name\fR -Sort resolvables by name (default). +Sort packages by name (default). .TP \fI \-\-sort\-by\-repo\fR -Sort resolvables by catalog, not by name. +Sort packages by catalog, not by name. .SS Patch Management @@ -363,8 +374,8 @@ See also the EXIT CODES section for details on exit status of 0, 100, and 101 returned by this command. .TP -.I \-r, \-\-repo <alias|#|URL> -Check for patches only in the repository specified by the alias, number or URL. +.I \-r, \-\-repo <alias|#|URI> +Check for patches only in the repository specified by the alias, number or URI. This option can be used multiple times. .TP @@ -372,8 +383,8 @@ List patches. Lists all patches that are available, including installed and not applicable ones. .TP -.I \-r, \-\-repo <alias|#|URL> -Check for patches only in the repository specified by the alias, number or URL. +.I \-r, \-\-repo <alias|#|URI> +Check for patches only in the repository specified by the alias, number or URI. This option can be used multiple times. .SS Repository Management @@ -400,10 +411,10 @@ See also METADATA REFRESH POLICY section for more details. .TP -\fI\-r, \-\-repo\fR <FILE.repo> +\fI\-r, \-\-repo\fR <file.repo> Read URI and alias from specified .repo file .TP -\fI\-t, \-\-type\fR <TYPE> +\fI\-t, \-\-type\fR <type> Type of repository (yast2, rpm-md, or plaindir). There are several aliases defined for these types: \fByast2\fR - susetags, yast, YaST, YaST2, YAST; @@ -454,12 +465,12 @@ the repositories will be written to the standard output. .TP -.B renamerepo (nr) <alias|#|URL> <new-alias> -Assign new alias to the repository specified by alias, number or URL. +.B renamerepo (nr) <alias|#|URI> <new-alias> +Assign new alias to the repository specified by alias, number or URI. .TP -.B modifyrepo (mr) <options> <alias|#|URL> -Modify properties of the repository specified by alias, number or URL. +.B modifyrepo (mr) <options> <alias|#|URI> +Modify properties of the repository specified by alias, number or URI. .TP \fI\-e, \-\-enable\fR Enable the repository. @@ -574,8 +585,8 @@ .TP .I \-\-disable\-repositories Do not read meta-data from repositories. This option will prevent loading of -resolvables from repositories, thus making zypper work only with the installed -resolvables (if \-\-disable\-system\-resolvables was not specified). +packages from repositories, thus making zypper work only with the installed +packages (if \-\-disable\-system\-resolvables was not specified). .TP .I \-\-no\-refresh Do not auto-refresh repositories (ignore the auto-refresh setting). Useful to save @@ -600,7 +611,7 @@ .LP Zypper works with the metadata (information extracted from the RPM packages and other data) stored within repositories. The following refresh (metadata update) policy has been established in order to ensure zypper is working with up-to-date metadata. .LP -Refreshing a repository means downloading metadata of resolvables from media (if needed), storing it in local cache (typically under /var/cache/zypp/raw/<alias> directory) and preparsing the metadata into .solv files (/var/cache/zypp/*.solv). +Refreshing a repository means downloading metadata of packages from media (if needed), storing it in local cache (typically under /var/cache/zypp/raw/<alias> directory) and preparsing the metadata into .solv files (/var/cache/zypp/*.solv). .LP The metadata get refreshed either automatically or on user request. An \fBautomatic refresh\fR takes place right before reading metadata from the database if the \fBauto-refresh is enabled\fR for the repository and the metada is reported as being out of date. If the \fBauto-refresh is disabled\fR, the repository will only be refreshed on user request. You can request a refresh by calling \fBzypper refresh\fR (see the documentation of the refresh command for details). .LP @@ -608,10 +619,6 @@ .LP To delay the up-to-date check (and thus the automatic refresh) for a certain number of minutes, edit the value of the repo.refresh.delay attribute of ZYpp config file (/etc/zypp/zypp.conf). This means, zypper will not even try to download and check the index files, and you will be able to use zypper for operations like search or info without internet access or root privileges. -.SH "LOCKS" -.LP -see locks(5) - .SH "FILES" .TP .B /etc/zypp/repos.d @@ -683,7 +690,7 @@ .TP 104 - ZYPPER_EXIT_INF_CAP_NOT_FOUND Returned by the \fBinstall\fR and the \fBremove\fR command in case any of the -arguments does not match any of the available (or installed) resolvable names +arguments does not match any of the available (or installed) package names or other capabilities. 105 - ZYPPER_EXIT_ON_SIGNAL Returned upon exiting after receiving a SIGINT or SIGTERM. @@ -799,7 +806,7 @@ zypper search (se) .TP \fI \-\-sort\-by\-catalog\fR -Sort resolvables by catalog, not by name. This option is an alias to zypper's +Sort packages by catalog, not by name. This option is an alias to zypper's \-\-sort\-by\-repo option. .SS Patch Management Commands @@ -851,4 +858,4 @@ .SH "SEE ALSO" .LP -rug(1), YaST2(8) +rug(1), YaST2(8), locks(5) -- 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] r10293 - /trunk/sat-solver/tools/repo_rpmdb.c
by mlschroe＠svn.opensuse.org 30 May '08

30 May '08

Author: mlschroe Date: Fri May 30 20:10:35 2008 New Revision: 10293 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10293&view=rev Log: - do not add self-provides for src rpms Modified: trunk/sat-solver/tools/repo_rpmdb.c Modified: trunk/sat-solver/tools/repo_rpmdb.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_rpmdb.c?re… ============================================================================== --- trunk/sat-solver/tools/repo_rpmdb.c (original) +++ trunk/sat-solver/tools/repo_rpmdb.c Fri May 30 20:10:35 2008 @@ -823,7 +823,8 @@ s->provides = makedeps(pool, repo, rpmhead, TAG_PROVIDENAME, TAG_PROVIDEVERSION, TAG_PROVIDEFLAGS, 0); s->provides = addfileprovides(pool, repo, repodata, s, rpmhead, s->provides); - s->provides = repo_addid_dep(repo, s->provides, rel2id(pool, s->name, s->evr, REL_EQ, 1), 0); + if (s->arch != ARCH_SRC && s->arch != ARCH_NOSRC) + s->provides = repo_addid_dep(repo, s->provides, rel2id(pool, s->name, s->evr, REL_EQ, 1), 0); s->requires = makedeps(pool, repo, rpmhead, TAG_REQUIRENAME, TAG_REQUIREVERSION, TAG_REQUIREFLAGS, 0); s->conflicts = makedeps(pool, repo, rpmhead, TAG_CONFLICTNAME, TAG_CONFLICTVERSION, TAG_CONFLICTFLAGS, 0); s->obsoletes = makedeps(pool, repo, rpmhead, TAG_OBSOLETENAME, TAG_OBSOLETEVERSION, TAG_OBSOLETEFLAGS, 0); -- 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] r10292 - /trunk/sat-solver/tools/repo_susetags.c
by mlschroe＠svn.opensuse.org 30 May '08

30 May '08

Author: mlschroe Date: Fri May 30 19:58:05 2008 New Revision: 10292 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10292&view=rev Log: - make finish_solvable() static Modified: trunk/sat-solver/tools/repo_susetags.c Modified: trunk/sat-solver/tools/repo_susetags.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_susetags.c… ============================================================================== --- trunk/sat-solver/tools/repo_susetags.c (original) +++ trunk/sat-solver/tools/repo_susetags.c Fri May 30 19:58:05 2008 @@ -378,7 +378,7 @@ * All keys have 3 characters and end in ':' */ -void +static void finish_solvable(struct parsedata *pd, Solvable *s, int handle) { Pool *pool = pd->repo->pool; -- 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] r10291 - /trunk/sat-solver/src/solver.c
by mlschroe＠svn.opensuse.org 30 May '08

30 May '08

Author: mlschroe Date: Fri May 30 19:52:56 2008 New Revision: 10291 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10291&view=rev Log: - make enableweakrules() static Modified: trunk/sat-solver/src/solver.c Modified: trunk/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=1029… ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Fri May 30 19:52:56 2008 @@ -838,7 +838,7 @@ * */ -void +static void enableweakrules(Solver *solv) { int i; -- 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] r10290 - in /trunk/sat-solver/src: dirpool.c dirpool.h
by mlschroe＠svn.opensuse.org 30 May '08

30 May '08

Author: mlschroe Date: Fri May 30 19:45:51 2008 New Revision: 10290 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10290&view=rev Log: - cleanup (oops) Modified: trunk/sat-solver/src/dirpool.c trunk/sat-solver/src/dirpool.h Modified: trunk/sat-solver/src/dirpool.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/dirpool.c?rev=102… ============================================================================== --- trunk/sat-solver/src/dirpool.c (original) +++ trunk/sat-solver/src/dirpool.c Fri May 30 19:45:51 2008 @@ -10,15 +10,10 @@ #include "pool.h" #include "util.h" +#include "dirpool.h" #define DIR_BLOCK 127 -typedef struct _Dirpool { - Id *dirs; - int ndirs; - Id *dirtraverse; -} Dirpool; - void dirpool_create(Dirpool *dp) { Modified: trunk/sat-solver/src/dirpool.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/dirpool.h?rev=102… ============================================================================== --- trunk/sat-solver/src/dirpool.h (original) +++ trunk/sat-solver/src/dirpool.h Fri May 30 19:45:51 2008 @@ -11,8 +11,6 @@ #include "pooltypes.h" #include "util.h" -#define DIR_BLOCK 127 - typedef struct _Dirpool { Id *dirs; int ndirs; -- 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] r10289 - /trunk/zypper/package/zypper.changes
by jkupec＠svn.opensuse.org 30 May '08

30 May '08

Author: jkupec Date: Fri May 30 18:55:10 2008 New Revision: 10289 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10289&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 Fri May 30 18:55:10 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri May 30 18:30:11 CEST 2008 - jkupec(a)suse.cz + +- zypper up <foo> to defaults to -t package (bnc #385990) +- r10288 + +------------------------------------------------------------------- Fri May 30 15:38:00 CEST 2008 - jreidinger(a)suse.cz - show help messages when show license in pager (bnc #394394) -- 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] r10288 - /trunk/zypper/src/zypper.cc
by jkupec＠svn.opensuse.org 30 May '08

30 May '08

Author: jkupec Date: Fri May 30 18:30:05 2008 New Revision: 10288 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10288&view=rev Log: - zypper up <foo> to defaults to -t package (bnc #385990) 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=10288&r… ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Fri May 30 18:30:05 2008 @@ -664,7 +664,7 @@ { case ZypperCommand::INSTALL_e: case ZypperCommand::REMOVE_e: - //case Zyppercommand::UPDATE_e: TODO once the update will take arguments + case ZypperCommand::UPDATE_e: { remove_selections(*this); break; @@ -2957,10 +2957,10 @@ kinds.insert(kind); } } - else if (globalOpts().is_rug_compatible) - kinds.insert(ResTraits<Package>::kind); + else if (globalOpts().is_rug_compatible || !_arguments.empty() /* bnc #385990*/) + kinds.insert(ResKind::package); else - kinds.insert(ResTraits<Patch>::kind); + kinds.insert(ResKind::patch); bool best_effort = copts.count( "best-effort" ); if (globalOpts().is_rug_compatible && best_effort) -- 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] r10287 - /trunk/zypper/src/zypper-misc.cc
by jkupec＠svn.opensuse.org 30 May '08

30 May '08

Author: jkupec Date: Fri May 30 18:17:42 2008 New Revision: 10287 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10287&view=rev Log: - some license display corrections Modified: trunk/zypper/src/zypper-misc.cc Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=10… ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Fri May 30 18:17:42 2008 @@ -136,27 +136,26 @@ return true; } -string helpPagerExit(const string &pager) +string pager_help_exit(const string &pager) { string endfour = pager.substr(pager.size()-4,4); if (endfour == "less") { - return _("Press 'q' to exit."); + return str::form(_("Press '%c' to exit the pager."), 'q'); } return string(); } -string helpPagerNavigation(const string &pager) +string pager_help_navigation(const string &pager) { string endfour = pager.substr(pager.size()-4,4); if (endfour == "less") { - return _("Use arrows to scroll by line or pgnUp/Down to scroll by screens." - " Also Home/End work."); + return _("Use arrows or pgUp/pgDown keys to scroll the text by lines or pages."); } else if (endfour == "more") { - return _("Use Enter to go to next line and space for scroll whole screen."); + return _("Use the Enter or Space key to scroll the text by lines or pages."); } return string(); } @@ -171,30 +170,35 @@ filesystem::TmpFile tfile; string tpath = tfile.path().absolutename().c_str(); ofstream os(tpath.c_str()); - string help = helpPagerNavigation(pager); + + string help = pager_help_navigation(pager); if (!help.empty()) - os << help << endl << endl; + os << "(" << help << ")" << endl << endl; os << text; - help = helpPagerExit(pager); + + help = pager_help_exit(pager); if (!help.empty()) - os << endl << endl << help; + os << endl << endl << "(" << help << ")"; os.close(); + ostringstream cmdline; cmdline << pager <<" "<<tpath; - switch(fork()){ - case -1: - WAR << "fork failed" << endl; - return false; - - case 0: - execlp("sh","sh","-c",cmdline.str().c_str(),(char *)0); - WAR << "exec failed with " << strerror(errno) << endl; - exit(1); //cannot return false here, due to here is another process - //so only kill itself + switch(fork()) + { + case -1: + WAR << "fork failed" << endl; + return false; + + case 0: + execlp("sh","sh","-c",cmdline.str().c_str(),(char *)0); + WAR << "exec failed with " << strerror(errno) << endl; + exit(1); // cannot return false here, because here is another process + // so only kill myself + //! \todo FIXME proper exit code, message? - default: - wait(0); //wait until pager end to disallow possibly terminal collision + default: + wait(0); //wait until pager end to disallow possibly terminal collision } return true; @@ -2567,23 +2571,35 @@ continue; } - // license text ostringstream s; - s << _("In order to install this package, you must agree" - " to terms of the license.") << endl; - s << format(_("%s %s license:")) % it->resolvable()->name() - % kind_to_string_localized(it->resolvable()->kind(), 1); + string kindstr = + it->resolvable()->kind() != ResKind::package ? + " (" + kind_to_string_localized(it->resolvable()->kind(), 1) + ")" : + string(); + + // introduction + s << str::form( + // translators: the first %s is the name of the package, the second + // is " (package-type)" if other than "package" (patch/product/pattern) + _("In order to install '%s'%s, you must agree" + " to terms of the following license agreement:"), + it->resolvable()->name().c_str(), kindstr.c_str()); + s << endl << endl; + + // license text const string& licenseText = it->resolvable()->licenseToConfirm(); if (licenseText.find("DT:Rich")==licenseText.npos) s << licenseText; else s << processRichText(licenseText); - if (!show_in_pager(s.str())) //pager fail, show normal + + // show in pager unless we are read by a machine or the pager fails + if (zypper.globalOpts().machine_readable || !show_in_pager(s.str())) zypper.out().info(s.str(), Out::QUIET); // lincense prompt - string question = _("In order to install this package, you must agree" - " to terms of the above license. Continue?"); + string question = _("Do you agree with the terms of the license?"); + //! \todo add 'v' option to view the license again, add prompt help if (!read_bool_answer(PROMPT_YN_LICENSE_AGREE, question, zypper.cmdOpts().license_auto_agree)) { confirmed = false; @@ -2607,6 +2623,7 @@ { zypper.out().info(boost::str(format( // translators: e.g. "... with flash package license." + //! \todo fix this to allow proper translation _("Aborting installation due to user disagreement with %s %s license.")) % it->resolvable()->name() % kind_to_string_localized(it->resolvable()->kind(), 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] r10286 - /trunk/sat-solver/src/solver.c
by mlschroe＠svn.opensuse.org 30 May '08

30 May '08

Author: mlschroe Date: Fri May 30 18:17:22 2008 New Revision: 10286 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10286&view=rev Log: - calculate recommendation list also if ignorealreadyrecommended is set, as some recommendations would be missing otherwise Modified: trunk/sat-solver/src/solver.c Modified: trunk/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=1028… ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Fri May 30 18:17:22 2008 @@ -4250,7 +4250,7 @@ /* if redoq.count == 0 we already found all recommended in the * solver run */ - if (redoq.count || solv->dontinstallrecommended || !solv->dontshowinstalledrecommended) + if (redoq.count || solv->dontinstallrecommended || !solv->dontshowinstalledrecommended || solv->ignorealreadyrecommended) { Id rec, *recp, p, *pp; -- 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] r10285 - /trunk/zypper/package/zypper.changes
by jreidinger＠svn.opensuse.org 30 May '08

30 May '08

Author: jreidinger Date: Fri May 30 15:42:34 2008 New Revision: 10285 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10285&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 Fri May 30 15:42:34 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri May 30 15:38:00 CEST 2008 - jreidinger(a)suse.cz + +- show help messages when show license in pager (bnc #394394) +- r10284 + +------------------------------------------------------------------- Mon May 26 14:31:57 CEST 2008 - jkupec(a)suse.cz - fixed layout of tables when the text contains special characters -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0