November 2007 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r8001 - in /trunk/zypper/src: zypper.cc zypper.h
by jkupec＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: jkupec Date: Fri Nov 30 18:31:54 2007 New Revision: 8001 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8001&view=rev Log: - shellCleanup() added Modified: trunk/zypper/src/zypper.cc trunk/zypper/src/zypper.h Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=8001&r1… ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Fri Nov 30 18:31:54 2007 @@ -402,9 +402,6 @@ read_history (histfile.c_str ()); while (true) { - // reset globals - setRunningHelp(false); - // read a line string line = readline_getline (); cerr_vv << "Got: " << line << endl; @@ -439,8 +436,7 @@ print_unknown_command_hint(); } - if (exiting()) - return; + shellCleanup(); } if (!histfile.empty ()) @@ -450,6 +446,36 @@ setRunningShell(false); } +void Zypper::shellCleanup() +{ + // clear any previous arguments + _arguments.clear(); + // clear command options + if (!_copts.empty()) + { + _copts.clear(); + _cmdopts = CommandOptions(); + } + // clear the command + _command = ZypperCommand::NONE; + // clear command help text + _command_help.clear(); + // reset help flag + setRunningHelp(false); + // reset the exitting flag + exit(false); + // ... and the exit code does not matter in the shell + + // gData + gData.current_repo = RepoInfo(); + + // TODO: + // gData.repos re-read after repo operations or modify/remove these very repoinfos + // gData.repo_resolvables re-read only after certain repo operations (all?) + // gData.target_resolvables re-read only after installation/removal/update + // call target commit refresh pool after installation/removal/update (#328855) +} + /// process one command from the OS shell or the zypper shell // catch unexpected exceptions and tell the user to report a bug (#224216) Modified: trunk/zypper/src/zypper.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.h?rev=8001&r1=… ============================================================================== --- trunk/zypper/src/zypper.h (original) +++ trunk/zypper/src/zypper.h Fri Nov 30 18:31:54 2007 @@ -104,6 +104,7 @@ void processGlobalOptions(); void processCommandOptions(); void commandShell(); + void shellCleanup(); void safeDoCommand(); void doCommand(); -- 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] r8000 - /trunk/zypper/src/zypper.cc
by jkupec＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: jkupec Date: Fri Nov 30 17:47:16 2007 New Revision: 8000 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8000&view=rev Log: - using break to quit shell 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=8000&r1… ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Fri Nov 30 17:47:16 2007 @@ -401,8 +401,7 @@ if (!histfile.empty ()) read_history (histfile.c_str ()); - bool loop = true; - while (loop) { + while (true) { // reset globals setRunningHelp(false); @@ -420,26 +419,24 @@ if (command_str == "\004") // ^D { - loop = false; cout << endl; // print newline after ^D + break; } - else + + try { - try - { - setCommand(ZypperCommand(command_str)); - if (command() == ZypperCommand::SHELL_QUIT) - loop = false; - else if (command() == ZypperCommand::SHELL) - cout << _("You already are running zypper's shell.") << endl; - else - safeDoCommand(); - } - catch (Exception & e) - { - cerr << e.msg() << endl; - print_unknown_command_hint(); - } + setCommand(ZypperCommand(command_str)); + if (command() == ZypperCommand::SHELL_QUIT) + break; + else if (command() == ZypperCommand::SHELL) + cout << _("You already are running zypper's shell.") << endl; + else + safeDoCommand(); + } + catch (Exception & e) + { + cerr << e.msg() << endl; + print_unknown_command_hint(); } if (exiting()) -- 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] r7999 - /trunk/libzypp/package/libzypp.changes
by schubi2＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: schubi2 Date: Fri Nov 30 17:41:55 2007 New Revision: 7999 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7999&view=rev Log: revision changed Modified: trunk/libzypp/package/libzypp.changes 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 Fri Nov 30 17:41:55 2007 @@ -4,7 +4,7 @@ - Enable SAT solver via environment variable ZYPP_SAT_SOLVER. e.g.: ZYPP_SAT_SOLVER=1 zypper install foo - version 4.1.4 -- revision 7990 +- revision 7998 ------------------------------------------------------------------- Wed Nov 28 15:12:33 CET 2007 - aschnell(a)suse.de -- 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] r7998 - /trunk/libzypp/zypp/sat/SATResolver.cc
by schubi2＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: schubi2 Date: Fri Nov 30 17:40:04 2007 New Revision: 7998 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7998&view=rev Log: bugfix in a delete request Modified: trunk/libzypp/zypp/sat/SATResolver.cc Modified: trunk/libzypp/zypp/sat/SATResolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SATResolver.cc?… ============================================================================== --- trunk/libzypp/zypp/sat/SATResolver.cc (original) +++ trunk/libzypp/zypp/sat/SATResolver.cc Fri Nov 30 17:40:04 2007 @@ -39,6 +39,7 @@ #include "satsolver/poolarch.h" #include "satsolver/evr.h" #include "satsolver/poolvendor.h" +#include "satsolver/policy.h" } ///////////////////////////////////////////////////////////////////////// @@ -399,9 +400,9 @@ } for (PoolItemList::const_iterator iter = _items_to_remove.begin(); iter != _items_to_remove.end(); iter++) { - Id id = iter->satSolvable().id(); - MIL << "Delete " << *iter << " with the SAT-Pool ID: " << id << endl; - queue_push( &(jobQueue), SOLVER_ERASE_SOLVABLE ); + Id id = str2id( _SATPool, (*iter)->name().c_str(), 0 ); + MIL << "Delete " << *iter << " with the string ID: " << id << endl; + queue_push( &(jobQueue), SOLVER_ERASE_SOLVABLE_NAME ); queue_push( &(jobQueue), id); } @@ -559,7 +560,7 @@ s = pool->solvables + what; PoolItem_Ref poolItem = _pool.find (sat::Solvable(what)); if (poolItem) { - if (what >= solv->installed->start && what < solv->installed->start + solv->installed->nsolvables) { + if (solv->installed && s->repo == solv->installed) { problemSolution->addSingleAction (poolItem, REMOVE); string description = str::form (_("do not keep %s installed"), solvable2str(pool, s) ); MIL << description << endl; @@ -580,7 +581,7 @@ s = pool->solvables + what; PoolItem_Ref poolItem = _pool.find (sat::Solvable(what)); if (poolItem) { - if (what >= solv->installed->start && what < solv->installed->start + solv->installed->nsolvables) { + if (solv->installed && s->repo == solv->installed) { problemSolution->addSingleAction (poolItem, KEEP); string description = str::form (_("do not deinstall %s"), solvable2str(pool, s)); MIL << description << endl; @@ -639,22 +640,21 @@ problemSolution->addSingleAction (itemTo, INSTALL); problemSolution->addSingleAction (itemFrom, REMOVE); - if (evrcmp(pool, sd->evr, s->evr) < 0) + if (evrcmp(pool, s->evr, sd->evr) > 0) { string description = str::form (_("allow downgrade of %s to %s"), solvable2str(pool, s), solvable2str(pool, sd)); MIL << description << endl; problemSolution->setDescription (description); gotone = 1; } - if (!solv->allowarchchange && s->name == sd->name )//&& archchanges(pool, sd, s)) + if (!solv->allowarchchange && s->name == sd->name && s->arch != sd->arch && policy_illegal_archchange(pool, s, sd)) { string description = str::form (_("allow architecture change of %s to %s"), solvable2str(pool, s), solvable2str(pool, sd)); MIL << description << endl; problemSolution->setDescription (description); gotone = 1; } - if (!solv->allowvendorchange && s->name == sd->name && s->vendor != sd->vendor && pool_vendor2mask(pool, s->vendor) - && (pool_vendor2mask(pool, s->vendor) & pool_vendor2mask(pool, sd->vendor)) == 0) + if (!solv->allowvendorchange && s->name == sd->name && s->vendor != sd->vendor && policy_illegal_vendorchange(pool, s, sd)) { string description = str::form (_("allow vendor change of [%s]%s to [%s]%s") , id2str(pool, s->vendor) , solvable2str(pool, s), string(sd->vendor ? id2str(pool, sd->vendor) : " (no vendor) ").c_str(), solvable2str(pool, sd)); -- 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] r7997 - /trunk/sat-solver/testsuite/deptestomatic.c
by schubi2＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: schubi2 Date: Fri Nov 30 17:07:48 2007 New Revision: 7997 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7997&view=rev Log: fixes for new c-compiler Modified: trunk/sat-solver/testsuite/deptestomatic.c Modified: trunk/sat-solver/testsuite/deptestomatic.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/deptestomat… ============================================================================== --- trunk/sat-solver/testsuite/deptestomatic.c (original) +++ trunk/sat-solver/testsuite/deptestomatic.c Fri Nov 30 17:07:48 2007 @@ -668,7 +668,7 @@ } strcpy(locale, "language:"); - strncat(locale, name, MAXNAMELEN); + strncat(locale, name, MAXNAMELEN-sizeof("language:")); id = str2id(pool, locale, 1); /* check if we already have that one */ @@ -782,8 +782,7 @@ if (file) { char path[PATH_MAX]; - strncpy(path, pd->directory, sizeof(path)); - strncat(path, file, sizeof(path)); + snprintf(path, sizeof(path), "%s%s", pd->directory, file); if (!name) name = file; @@ -829,8 +828,7 @@ if (file) { char path[PATH_MAX]; - strncpy(path, pd->directory, sizeof(path)); - strncat(path, file, sizeof(path)); + snprintf(path, sizeof(path), "%s%s", pd->directory, file); Repo *repo = add_repo( pd, "system", path ); if (repo) pd->system = repo; @@ -976,8 +974,7 @@ if (dir) { char path[PATH_MAX]; - strncpy(path, pd->directory, sizeof(path)); - strncat(path, dir, sizeof(path)); + snprintf(path, sizeof(path), "%s%s", pd->directory, dir); pd->hardwareinfo = strdup(path); printf("Setting hardwareinfo to %s\n", path); } -- 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] r7996 - /trunk/zypper/src/zypper-media-callbacks.h
by jkupec＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: jkupec Date: Fri Nov 30 16:37:54 2007 New Revision: 7996 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7996&view=rev Log: - translator comment put in the proper place Modified: trunk/zypper/src/zypper-media-callbacks.h Modified: trunk/zypper/src/zypper-media-callbacks.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-media-callback… ============================================================================== --- trunk/zypper/src/zypper-media-callbacks.h (original) +++ trunk/zypper/src/zypper-media-callbacks.h Fri Nov 30 16:37:54 2007 @@ -49,11 +49,11 @@ cerr << endl; // may be in the middle of RepoReport or ProgressReport cerr << description << endl; - // TranslatorExplanation translate letters 'y' and 'n' to whathever is appropriate for your language. - // Try to check what answers does zypper accept (it always accepts y/n at least) - // You can also have a look at the regular expressions used to check the answer here: - // /usr/lib/locale/<your_locale>/LC_MESSAGES/SYS_LC_MESSAGES std::string request = boost::str(boost::format( + // TranslatorExplanation translate letters 'y' and 'n' to whathever is appropriate for your language. + // Try to check what answers does zypper accept (it always accepts y/n at least) + // You can also have a look at the regular expressions used to check the answer here: + // /usr/lib/locale/<your_locale>/LC_MESSAGES/SYS_LC_MESSAGES _("Please insert medium [%s] #%d and type 'y' to continue or 'n' to cancel the operation.")) % gData.current_repo.name() % mediumNr); if (read_bool_answer(request, false)) -- 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] r7995 - /trunk/zypper/package/zypper.changes
by jkupec＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: jkupec Date: Fri Nov 30 16:29:38 2007 New Revision: 7995 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7995&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 Nov 30 16:29:38 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Nov 30 16:29:00 CET 2007 - jkupec(a)suse.cz + +- avoiding unwanted translation of zypper keywords (#343335) +- r7994 + +------------------------------------------------------------------- Fri Nov 30 13:06:31 CET 2007 - jkupec(a)suse.cz - fixed some unsufficient permission exceptions for non-root -- 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] r7994 - /trunk/zypper/src/zypper.cc
by jkupec＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: jkupec Date: Fri Nov 30 16:28:53 2007 New Revision: 7994 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7994&view=rev Log: - avoiding unwanted translation of zypper keywords (#343335) 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=7994&r1… ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Fri Nov 30 16:28:53 2007 @@ -574,10 +574,9 @@ {0, 0, 0, 0} }; specific_options = install_options; - _command_help = _( - // TranslatorExplanation don't translate the resolvable types - // (package, patch, pattern, product) or at least leave also their - // originals, since they are expected untranslated on the command line + _command_help = boost::str(format(_( + // TranslatorExplanation the first %s = "package, patch, pattern, product" + // and the second %s = "package" "install (in) [options] <capability> ...\n" "\n" "Install resolvables with specified capabilities. A capability is" @@ -585,7 +584,8 @@ "\n" " Command options:\n" "-r, --repo <alias> Install resolvables only from repository specified by alias.\n" - "-t, --type <type> Type of resolvable (package, patch, pattern, product) (default: package)\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" "-f, --force Install even if the item is already installed (reinstall)\n" @@ -593,7 +593,7 @@ " See 'man zypper' for more details.\n" " --debug-solver Create solver test case for debugging\n" "-R, --force-resolution Force the solver to find a solution (even agressive)\n" - ); + )) % "package, patch, pattern, product" % "package"); break; } @@ -615,9 +615,9 @@ {0, 0, 0, 0} }; specific_options = remove_options; - _command_help = _( - // TranslatorExplanation don't translate the resolvable types - // (see the install command comment) + _command_help = boost::str(format(_( + // TranslatorExplanation the first %s = "package, patch, pattern, product" + // and the second %s = "package" "remove (rm) [options] <capability> ...\n" "\n" "Remove resolvables with specified capabilities. A capability is" @@ -625,12 +625,13 @@ "\n" " Command options:\n" "-r, --repo <alias> Operate only with resolvables from repository specified by alias.\n" - "-t, --type <type> Type of resolvable (package, patch, pattern, product) (default: package)\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" " --debug-solver Create solver test case for debugging\n" "-R, --force-resolution Force the solver to find a solution (even agressive)\n" - ); + )) % "package, patch, pattern, product" % "package"); break; } @@ -662,19 +663,18 @@ {0, 0, 0, 0} }; specific_options = service_add_options; - // TranslatorExplanation don't translate the repo types (well, the plaindir) - // since they must be used in their original shape - _command_help = _( + _command_help = boost::str(format(_( + // TranslatorExplanation the %s = "yast2, rpm-md, plaindir" "addrepo (ar) [options] <URI> <alias>\n" "\n" "Add repository specified by URI to the system and assing the specified alias to it.\n" "\n" " Command options:\n" "-r, --repo <FILE.repo> Read the URL and alias from a file (even remote)\n" - "-t, --type <TYPE> Type of repository (yast2, rpm-md, or plaindir)\n" + "-t, --type <TYPE> Type of repository (%s)\n" "-d, --disabled Add the repository as disabled\n" "-n, --no-refresh Add the repository with auto-refresh disabled\n" - ); + )) % "yast2, rpm-md, plaindir"); break; } @@ -800,21 +800,22 @@ {0, 0, 0, 0} }; specific_options = list_updates_options; - _command_help = _( - // TranslatorExplanation don't translate the resolvable types - // (see the install command comment) + _command_help = boost::str(format(_( + // TranslatorExplanation the first %s = "package, patch, pattern, product" + // and the second %s = "patch" "list-updates [options]\n" "\n" "List all available updates\n" "\n" " Command options:\n" - "-t, --type <type> Type of resolvable (package, patch, pattern, product) (default: patch)\n" + "-t, --type <type> Type of resolvable (%s)\n" + " Default: %s\n" "-r, --repo <alias> List only updates from the repository specified by the alias.\n" " --best-effort Do a 'best effort' approach to update, updates to a lower than latest-and-greatest version are also acceptable.\n" - ); + )) % "package, patch, pattern, product" % "patch"); break; } - + case ZypperCommand::UPDATE_e: { static struct option update_options[] = { -- 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] r7993 - /trunk/zypper/po/POTFILES.in
by jkupec＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: jkupec Date: Fri Nov 30 16:27:44 2007 New Revision: 7993 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7993&view=rev Log: - update Modified: trunk/zypper/po/POTFILES.in Modified: trunk/zypper/po/POTFILES.in URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/POTFILES.in?rev=7993&r… ============================================================================== --- trunk/zypper/po/POTFILES.in (original) +++ trunk/zypper/po/POTFILES.in Fri Nov 30 16:27:44 2007 @@ -1,7 +1,9 @@ # List of source files which contain translatable strings. +../src/zypper-main.cc +../src/zypper-main.h ../src/zypper-keyring-callbacks.h ../src/zypper-misc.cc -../src/zypper-sources.cc +../src/zypper-repos.cc ../src/zypper.h ../src/zypp-checkpatches.cc ../src/zypper-callbacks.cc @@ -10,7 +12,7 @@ ../src/zypper-search.cc ../src/zypper.cc ../src/zypper-tabulator.h -../src/zypper-sources.h +../src/zypper-repos.h ../src/AliveCursor.h ../src/zypper-info.h ../src/zypper-misc.h @@ -22,7 +24,7 @@ ../src/zypp-checkpatches-wrapper.c ../src/zypper-utils.h ../src/zypper-media-callbacks.h -../src/zypper-source-callbacks.h +../src/zypper-repo-callbacks.h ../src/zypper-updates.cc ../src/zypper-command.h ../src/zypper-rpm-callbacks.h -- 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] r7992 - in /trunk/sat-solver: VERSION.cmake package/libsatsolver.changes
by schubi2＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: schubi2 Date: Fri Nov 30 16:02:15 2007 New Revision: 7992 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7992&view=rev Log: update for libzypp integration Modified: trunk/sat-solver/VERSION.cmake trunk/sat-solver/package/libsatsolver.changes Modified: trunk/sat-solver/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/VERSION.cmake?rev=799… ============================================================================== --- trunk/sat-solver/VERSION.cmake (original) +++ trunk/sat-solver/VERSION.cmake Fri Nov 30 16:02:15 2007 @@ -46,5 +46,5 @@ SET(LIBSATSOLVER_MAJOR "0") SET(LIBSATSOLVER_MINOR "0") -SET(LIBSATSOLVER_PATCH "5") +SET(LIBSATSOLVER_PATCH "6") Modified: trunk/sat-solver/package/libsatsolver.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.… ============================================================================== --- trunk/sat-solver/package/libsatsolver.changes (original) +++ trunk/sat-solver/package/libsatsolver.changes Fri Nov 30 16:02:15 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Nov 30 16:01:39 CET 2007 - schubi(a)suse.de + +- update for libzypp integration + +------------------------------------------------------------------- Fri Nov 16 12:17:13 CET 2007 - coolo(a)suse.de - update to SVN again to make libzypp compilable again -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0