Hello community, here is the log from the commit of package zypper checked in at Fri Aug 31 16:18:43 CEST 2007. -------- --- zypper/zypper.changes 2007-08-30 20:33:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/zypper/zypper.changes 2007-08-31 16:08:44.000000000 +0200 @@ -1,0 +2,18 @@ +Fri Aug 31 14:35:01 CEST 2007 - jkupec@suse.cz + +- fixed error message of zypper ar -r (#306667) +- r7055 + +------------------------------------------------------------------- +Fri Aug 31 14:07:11 CEST 2007 - kkaempf@suse.de + +- dont prompt for solutions if none are available. +- dont duplicate dependency problems in output. +- indent details by 2 blanks, resolver indents further details + by 4 blanks. +- provide additional details for problems (#306240) +- don't prompt user for every dependency (#304325) +- don't clutter the log with pool lists. +- r 7054 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypper.spec ++++++ --- /var/tmp/diff_new_pack.Gl2378/_old 2007-08-31 16:18:28.000000000 +0200 +++ /var/tmp/diff_new_pack.Gl2378/_new 2007-08-31 16:18:28.000000000 +0200 @@ -21,7 +21,7 @@ PreReq: permissions Summary: Command Line Package Management Using Libzypp Version: 0.8.18 -Release: 1 +Release: 2 Source: zypper-0.8.18.tar.bz2 Prefix: /usr URL: http://en.opensuse.org/Zypper @@ -97,6 +97,18 @@ %ghost %config(noreplace) %{_var}/log/zypper.log %changelog +* Fri Aug 31 2007 - jkupec@suse.cz +- fixed error message of zypper ar -r (#306667) +- r7055 +* Fri Aug 31 2007 - kkaempf@suse.de +- dont prompt for solutions if none are available. +- dont duplicate dependency problems in output. +- indent details by 2 blanks, resolver indents further details + by 4 blanks. +- provide additional details for problems (#306240) +- don't prompt user for every dependency (#304325) +- don't clutter the log with pool lists. +- r 7054 * Thu Aug 30 2007 - jkupec@suse.cz - suppressing excessive output of media errors - prompting for media change only for changeable media ++++++ zypper-0.8.18.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.8.18/package/zypper.changes new/zypper-0.8.18/package/zypper.changes --- old/zypper-0.8.18/package/zypper.changes 2007-08-30 20:33:57.000000000 +0200 +++ new/zypper-0.8.18/package/zypper.changes 2007-08-31 16:08:43.000000000 +0200 @@ -1,4 +1,22 @@ ------------------------------------------------------------------- +Fri Aug 31 14:35:01 CEST 2007 - jkupec@suse.cz + +- fixed error message of zypper ar -r (#306667) +- r7055 + +------------------------------------------------------------------- +Fri Aug 31 14:07:11 CEST 2007 - kkaempf@suse.de + +- dont prompt for solutions if none are available. +- dont duplicate dependency problems in output. +- indent details by 2 blanks, resolver indents further details + by 4 blanks. +- provide additional details for problems (#306240) +- don't prompt user for every dependency (#304325) +- don't clutter the log with pool lists. +- r 7054 + +------------------------------------------------------------------- Thu Aug 30 20:32:56 CEST 2007 - jkupec@suse.cz - suppressing excessive output of media errors diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.8.18/po/zypper.pot new/zypper-0.8.18/po/zypper.pot --- old/zypper-0.8.18/po/zypper.pot 2007-08-30 20:33:57.000000000 +0200 +++ new/zypper-0.8.18/po/zypper.pot 2007-08-31 16:08:42.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-29 11:36+0200\n" +"POT-Creation-Date: 2007-08-31 15:19+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -130,11 +130,11 @@ msgstr "" #. TranslatorExplanation These are reasons for various failures. -#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:41 +#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:42 msgid "Not found" msgstr "" -#: ../src/zypper-misc.cc:421 ../src/zypper-misc.cc:493 +#: ../src/zypper-misc.cc:421 msgid "Problem: " msgstr "" @@ -145,65 +145,65 @@ msgstr "" #. input prompt -#: ../src/zypper-misc.cc:446 +#: ../src/zypper-misc.cc:449 msgid "number, (r)etry or (c)ancel> " msgstr "" #. translators: corresponds to (r)etry -#: ../src/zypper-misc.cc:454 +#: ../src/zypper-misc.cc:457 msgid "r" msgstr "" #. translators: corresponds to (c)ancel -#: ../src/zypper-misc.cc:457 +#: ../src/zypper-misc.cc:460 msgid "c" msgstr "" -#: ../src/zypper-misc.cc:463 +#: ../src/zypper-misc.cc:466 #, c-format msgid "Applying solution %s" msgstr "" -#: ../src/zypper-misc.cc:486 +#: ../src/zypper-misc.cc:488 #, c-format msgid "%s Problems:" msgstr "" -#: ../src/zypper-misc.cc:489 +#: ../src/zypper-misc.cc:491 msgid "Specified capability not found" msgstr "" -#: ../src/zypper-misc.cc:622 ../src/zypper-misc.cc:624 +#: ../src/zypper-misc.cc:621 ../src/zypper-misc.cc:623 msgid "Nothing to do." msgstr "" -#: ../src/zypper-misc.cc:738 +#: ../src/zypper-misc.cc:737 #, c-format msgid "Overall download size: %s." msgstr "" #. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K -#: ../src/zypper-misc.cc:742 +#: ../src/zypper-misc.cc:741 #, c-format msgid "After the operation, additional %s will be used." msgstr "" #. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K -#: ../src/zypper-misc.cc:750 +#: ../src/zypper-misc.cc:749 #, c-format msgid "After the operation, %s will be freed." msgstr "" -#: ../src/zypper-misc.cc:797 +#: ../src/zypper-misc.cc:796 #, c-format msgid "%s items locked" msgstr "" -#: ../src/zypper-misc.cc:798 +#: ../src/zypper-misc.cc:797 msgid "Establishing status of aggregates" msgstr "" -#: ../src/zypper-misc.cc:806 +#: ../src/zypper-misc.cc:805 msgid "Resolving dependencies..." msgstr "" @@ -260,8 +260,8 @@ msgstr "" #: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998 -#: ../src/zypper-misc.cc:1152 ../src/zypper-sources.cc:311 -#: ../src/zypper-sources.cc:352 ../src/zypper-search.h:299 +#: ../src/zypper-misc.cc:1152 ../src/zypper-sources.cc:316 +#: ../src/zypper-sources.cc:357 ../src/zypper-search.h:299 msgid "Name" msgstr "" @@ -276,7 +276,7 @@ msgstr "" #: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998 -#: ../src/zypper-sources.cc:311 +#: ../src/zypper-sources.cc:316 msgid "Status" msgstr "" @@ -321,7 +321,15 @@ msgid "committing" msgstr "" -#: ../src/zypper-misc.cc:1393 +#: ../src/zypper-misc.cc:1390 +msgid "Problem downloading the package file from the repository:" +msgstr "" + +#: ../src/zypper-misc.cc:1391 ../src/zypper-sources.cc:89 +msgid "Please, see the above error message to for a hint." +msgstr "" + +#: ../src/zypper-misc.cc:1401 msgid "" "The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n" "\n" @@ -331,176 +339,173 @@ "- use another repository" msgstr "" -#: ../src/zypper-misc.cc:1413 +#: ../src/zypper-misc.cc:1421 msgid "One of installed patches requires reboot of your machine. Please, do it as soon as possible." msgstr "" -#: ../src/zypper-misc.cc:1416 +#: ../src/zypper-misc.cc:1424 msgid "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible." msgstr "" -#: ../src/zypper-misc.cc:1422 +#: ../src/zypper-misc.cc:1430 msgid "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations." msgstr "" -#: ../src/zypper-misc.cc:1448 +#: ../src/zypper-misc.cc:1456 #, c-format msgid "Automatically agreeing with %s %s license." msgstr "" -#: ../src/zypper-misc.cc:1459 +#: ../src/zypper-misc.cc:1467 #, c-format msgid "%s %s license:" msgstr "" -#: ../src/zypper-misc.cc:1463 +#: ../src/zypper-misc.cc:1471 msgid "In order to install this package, you must agree to terms of the above licencse. Continue?" msgstr "" -#: ../src/zypper-misc.cc:1474 +#: ../src/zypper-misc.cc:1482 msgid "Aborting installation due to the need for license(s) confirmation." msgstr "" #. TranslatorExplanation Don't translate the '--auto-agree-with-licenses', #. it is a command line option -#: ../src/zypper-misc.cc:1478 +#: ../src/zypper-misc.cc:1486 msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option." msgstr "" -#: ../src/zypper-misc.cc:1489 +#: ../src/zypper-misc.cc:1497 #, c-format msgid "Aborting installation due to user disagreement with %s %s license." msgstr "" -#: ../src/zypper-misc.cc:1559 +#: ../src/zypper-misc.cc:1567 #, c-format msgid "Installing source package %s-%s" msgstr "" -#: ../src/zypper-misc.cc:1567 +#: ../src/zypper-misc.cc:1575 #, c-format msgid "Source package %s-%s successfully installed." msgstr "" -#: ../src/zypper-misc.cc:1573 +#: ../src/zypper-misc.cc:1581 #, c-format msgid "Problem installing source package %s-%s:" msgstr "" -#: ../src/zypper-misc.cc:1581 +#: ../src/zypper-misc.cc:1589 #, c-format msgid "Source package '%s' not found." msgstr "" -#: ../src/zypper-sources.cc:48 +#: ../src/zypper-sources.cc:52 #, c-format msgid "Checking whether to refresh metadata for %s" msgstr "" -#: ../src/zypper-sources.cc:57 +#: ../src/zypper-sources.cc:61 #, c-format msgid "Refreshing '%s'" msgstr "" -#: ../src/zypper-sources.cc:59 +#: ../src/zypper-sources.cc:63 msgid "(forced)" msgstr "" -#: ../src/zypper-sources.cc:64 +#: ../src/zypper-sources.cc:68 #, c-format msgid "Repository '%s' is up to date." msgstr "" -#: ../src/zypper-sources.cc:76 +#: ../src/zypper-sources.cc:80 msgid "Forcing raw metadata refresh" msgstr "" -#: ../src/zypper-sources.cc:84 +#: ../src/zypper-sources.cc:88 #, c-format msgid "Problem downloading files from '%s'." msgstr "" -#: ../src/zypper-sources.cc:85 -msgid "Please, see the above error message to for a hint." -msgstr "" - -#: ../src/zypper-sources.cc:92 +#: ../src/zypper-sources.cc:96 #, c-format msgid "No URLs defined for '%s'." msgstr "" #. TranslatorExplanation the first %s is a .repo file path -#: ../src/zypper-sources.cc:96 +#: ../src/zypper-sources.cc:100 #, c-format msgid "Please, add one or more base URL (baseurl=URL) entries to %s for repository '%s'." msgstr "" -#: ../src/zypper-sources.cc:104 +#. ! \todo correct the message after 10.3 release +#: ../src/zypper-sources.cc:109 msgid "No alias defined this repository." msgstr "" -#: ../src/zypper-sources.cc:112 +#: ../src/zypper-sources.cc:117 #, c-format msgid "Repository '%s' is invalid." msgstr "" -#: ../src/zypper-sources.cc:113 +#: ../src/zypper-sources.cc:118 msgid "Please, check if the URLs defined for this repository are pointing to a valid repository." msgstr "" -#: ../src/zypper-sources.cc:121 +#: ../src/zypper-sources.cc:126 #, c-format msgid "Error downloading metadata for '%s':" msgstr "" -#: ../src/zypper-sources.cc:148 +#: ../src/zypper-sources.cc:153 msgid "Forcing building of repository cache" msgstr "" -#: ../src/zypper-sources.cc:161 +#: ../src/zypper-sources.cc:166 #, c-format msgid "Error parsing metadata for '%s':" msgstr "" #. TranslatorExplanation Don't translate the URL unless it is translated, too -#: ../src/zypper-sources.cc:163 +#: ../src/zypper-sources.cc:168 msgid "This may be caused by invalid metadata in the repository, or by a bug in the metadata parser. In the latter case, or if in doubt, please, file a bug report by folowing instructions at http://en.opensuse.org/Zypper#Troubleshooting" msgstr "" -#: ../src/zypper-sources.cc:177 +#: ../src/zypper-sources.cc:182 #, c-format msgid "Repository metadata for '%s' not found in local cache." msgstr "" -#: ../src/zypper-sources.cc:185 +#: ../src/zypper-sources.cc:190 msgid "Error building the cache database:" msgstr "" -#: ../src/zypper-sources.cc:217 +#: ../src/zypper-sources.cc:222 #, c-format msgid "Repository '%s' not found." msgstr "" -#: ../src/zypper-sources.cc:223 +#: ../src/zypper-sources.cc:228 #, c-format msgid "Error reading repository description file for '%s'." msgstr "" -#: ../src/zypper-sources.cc:225 +#: ../src/zypper-sources.cc:230 msgid "Reason: " msgstr "" -#: ../src/zypper-sources.cc:252 +#: ../src/zypper-sources.cc:257 #, c-format msgid "Disabling repository '%s' because of the above error." msgstr "" -#: ../src/zypper-sources.cc:270 +#: ../src/zypper-sources.cc:275 #, c-format msgid "Repository '%s' is out-of-date. You can run 'zypper refresh' as root to update it." msgstr "" -#: ../src/zypper-sources.cc:311 ../src/zypper-sources.cc:352 +#: ../src/zypper-sources.cc:316 ../src/zypper-sources.cc:357 #: ../src/zypper-search.h:297 msgid "Type" msgstr "" @@ -508,235 +513,257 @@ #. status #. rug's status (active, pending => active, disabled <= enabled, disabled) #. this is probably the closest possible compatibility arrangement -#: ../src/zypper-sources.cc:328 +#: ../src/zypper-sources.cc:333 msgid "Active" msgstr "" -#: ../src/zypper-sources.cc:328 +#: ../src/zypper-sources.cc:333 msgid "Disabled" msgstr "" #. TranslatorExplanation used as e.g. "Enabled: Yes" -#: ../src/zypper-sources.cc:352 ../src/zypper-sources.cc:722 +#: ../src/zypper-sources.cc:357 ../src/zypper-sources.cc:730 msgid "Enabled" msgstr "" -#: ../src/zypper-sources.cc:352 +#: ../src/zypper-sources.cc:357 msgid "Refresh" msgstr "" -#: ../src/zypper-sources.cc:352 +#: ../src/zypper-sources.cc:357 msgid "Alias" msgstr "" #. enabled? #. autorefresh? -#: ../src/zypper-sources.cc:368 ../src/zypper-sources.cc:370 -#: ../src/zypper-sources.cc:722 ../src/zypper-sources.cc:724 +#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375 +#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732 #: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166 #: ../src/zypper-info.cc:168 msgid "Yes" msgstr "" -#: ../src/zypper-sources.cc:368 ../src/zypper-sources.cc:370 -#: ../src/zypper-sources.cc:722 ../src/zypper-sources.cc:724 +#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375 +#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732 #: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166 #: ../src/zypper-info.cc:168 msgid "No" msgstr "" -#: ../src/zypper-sources.cc:386 +#: ../src/zypper-sources.cc:391 msgid "No repositories defined. Use the 'zypper addrepo' command to add one or more repositories." msgstr "" -#: ../src/zypper-sources.cc:419 ../src/zypper-sources.cc:490 +#: ../src/zypper-sources.cc:424 ../src/zypper-sources.cc:495 msgid "Error reading repositories:" msgstr "" -#: ../src/zypper-sources.cc:441 +#: ../src/zypper-sources.cc:446 #, c-format msgid "Can't open %s for writing. Maybe you don't have write permissions?" msgstr "" -#: ../src/zypper-sources.cc:449 +#: ../src/zypper-sources.cc:454 #, c-format msgid "Repositories have been successfully exported to %s." msgstr "" -#: ../src/zypper-sources.cc:546 +#: ../src/zypper-sources.cc:551 #, c-format msgid "Skipping disabled repository '%s'" msgstr "" -#: ../src/zypper-sources.cc:582 +#: ../src/zypper-sources.cc:587 #, c-format msgid "Skipping repository '%s' because of the above error." msgstr "" -#: ../src/zypper-sources.cc:595 +#: ../src/zypper-sources.cc:600 #, c-format msgid "Repository '%s' not found by its alias or number." msgstr "" -#: ../src/zypper-sources.cc:600 +#: ../src/zypper-sources.cc:605 msgid "Use 'zypper repos' to get the list of defined repositories." msgstr "" -#: ../src/zypper-sources.cc:607 +#: ../src/zypper-sources.cc:612 msgid "Specified repositories are not enabled or defined." msgstr "" -#: ../src/zypper-sources.cc:609 +#: ../src/zypper-sources.cc:614 msgid "There are no enabled repositories defined." msgstr "" -#: ../src/zypper-sources.cc:612 +#: ../src/zypper-sources.cc:617 msgid "Use 'zypper addrepo' or 'zypper modifyrepo' commands to add or enable repositories." msgstr "" -#: ../src/zypper-sources.cc:616 +#: ../src/zypper-sources.cc:621 msgid "Could not refresh the repositories because of errors." msgstr "" -#: ../src/zypper-sources.cc:618 +#: ../src/zypper-sources.cc:623 msgid "Some of the repositories have not been refreshed because of an error." msgstr "" -#: ../src/zypper-sources.cc:620 +#: ../src/zypper-sources.cc:625 msgid "Specified repositories have been refreshed." msgstr "" -#: ../src/zypper-sources.cc:622 +#: ../src/zypper-sources.cc:627 msgid "All repositories have been refreshed." msgstr "" -#: ../src/zypper-sources.cc:664 +#: ../src/zypper-sources.cc:667 msgid "This is a changeable read-only media (CD/DVD), disabling autorefresh." msgstr "" -#: ../src/zypper-sources.cc:677 +#: ../src/zypper-sources.cc:685 #, c-format msgid "Repository named '%s' already exists. Please, use another alias." msgstr "" -#: ../src/zypper-sources.cc:685 +#: ../src/zypper-sources.cc:693 msgid "Can't find a valid repository at given location:" msgstr "" -#: ../src/zypper-sources.cc:686 +#: ../src/zypper-sources.cc:694 msgid "Could not determine the type of the repository. Please, check if the defined URLs (see below) point to a valid repository:" msgstr "" -#: ../src/zypper-sources.cc:697 +#: ../src/zypper-sources.cc:705 msgid "Problem transferring repository data from specified URL:" msgstr "" -#: ../src/zypper-sources.cc:698 +#: ../src/zypper-sources.cc:706 msgid "Please, check whether the specified URL is accessible." msgstr "" -#: ../src/zypper-sources.cc:705 +#: ../src/zypper-sources.cc:713 msgid "Unknown problem when adding repository:" msgstr "" -#: ../src/zypper-sources.cc:709 +#: ../src/zypper-sources.cc:717 #, c-format msgid "Repository '%s' successfully added" msgstr "" #. TranslatorExplanation used as e.g. "Autorefresh: Yes" -#: ../src/zypper-sources.cc:724 +#: ../src/zypper-sources.cc:732 msgid "Autorefresh" msgstr "" -#: ../src/zypper-sources.cc:732 +#: ../src/zypper-sources.cc:740 #, c-format msgid "Reading data from '%s' media" msgstr "" -#: ../src/zypper-sources.cc:738 +#: ../src/zypper-sources.cc:746 #, c-format msgid "Problem reading data from '%s' media" msgstr "" -#: ../src/zypper-sources.cc:739 +#: ../src/zypper-sources.cc:747 msgid "Please, check if your installation media is valid and readable." msgstr "" -#: ../src/zypper-sources.cc:833 +#: ../src/zypper-sources.cc:795 +msgid "Problem accessing the file at the specified URL" +msgstr "" + +#: ../src/zypper-sources.cc:796 +msgid "Please check if the URL is valid and accessible." +msgstr "" + +#: ../src/zypper-sources.cc:803 +msgid "Problem parsing the file at the specified URL" +msgstr "" + +#. TranslatorExplanation don't translate the URL if the URL itself is not translated. +#. Also don't translate the '.repo' string. +#: ../src/zypper-sources.cc:806 +msgid "Is it a .repo file? See http://en.opensuse.org/Standards/RepoInfo for details." +msgstr "" + +#: ../src/zypper-sources.cc:813 +msgid "Problem encountered while trying to read the file at the specified URL" +msgstr "" + +#: ../src/zypper-sources.cc:870 #, c-format msgid "Repository %s has been removed." msgstr "" -#: ../src/zypper-sources.cc:885 +#: ../src/zypper-sources.cc:922 #, c-format msgid "Repository %s renamed to %s" msgstr "" -#: ../src/zypper-sources.cc:890 ../src/zypper-sources.cc:967 +#: ../src/zypper-sources.cc:927 ../src/zypper-sources.cc:1004 #, c-format msgid "Repository %s not found." msgstr "" -#: ../src/zypper-sources.cc:895 ../src/zypper-sources.cc:972 +#: ../src/zypper-sources.cc:932 ../src/zypper-sources.cc:1009 msgid "Error while modifying the repository:" msgstr "" -#: ../src/zypper-sources.cc:897 ../src/zypper-sources.cc:974 +#: ../src/zypper-sources.cc:934 ../src/zypper-sources.cc:1011 #, c-format msgid "Leaving repository %s unchanged." msgstr "" -#: ../src/zypper-sources.cc:911 +#: ../src/zypper-sources.cc:948 #, c-format msgid "%s used together with %s, which contradict each other. This property will be left unchanged." msgstr "" -#: ../src/zypper-sources.cc:962 +#: ../src/zypper-sources.cc:999 #, c-format msgid "Repository %s has been sucessfully modified." msgstr "" -#: ../src/zypper-sources.cc:1010 +#: ../src/zypper-sources.cc:1047 #, c-format msgid "Retrieving repository '%s' data..." msgstr "" -#: ../src/zypper-sources.cc:1017 +#: ../src/zypper-sources.cc:1054 #, c-format msgid "Repository '%s' not cached. Caching..." msgstr "" -#: ../src/zypper-sources.cc:1024 ../src/zypper-sources.cc:1043 +#: ../src/zypper-sources.cc:1061 ../src/zypper-sources.cc:1080 #, c-format msgid "Problem loading data from '%s'" msgstr "" -#: ../src/zypper-sources.cc:1025 ../src/zypper-sources.cc:1045 +#: ../src/zypper-sources.cc:1062 ../src/zypper-sources.cc:1082 #, c-format msgid "Resolvables from '%s' not loaded because of error." msgstr "" -#: ../src/zypper-sources.cc:1032 +#: ../src/zypper-sources.cc:1069 #, c-format msgid "(%d resolvables found)" msgstr "" -#: ../src/zypper-sources.cc:1044 +#: ../src/zypper-sources.cc:1081 msgid "Try 'zypper refresh', or even remove /var/cache/zypp/zypp.db before doing so." msgstr "" -#: ../src/zypper-sources.cc:1056 +#: ../src/zypper-sources.cc:1093 msgid "Reading RPM database..." msgstr "" -#: ../src/zypper-sources.cc:1063 +#: ../src/zypper-sources.cc:1100 #, c-format msgid "(%s resolvables)" msgstr "" #. list name, exact match -#: ../src/zypper-sources.cc:1151 +#: ../src/zypper-sources.cc:1188 msgid "" "ZENworks Management Daemon is running.\n" "WARNING: this command will not synchronize changes.\n" @@ -1310,13 +1337,13 @@ msgid "You already are running zypper's shell." msgstr "" -#: ../src/zypper-utils.cc:44 +#: ../src/zypper-utils.cc:47 msgid "Please file a bug report about this." msgstr "" #. TranslatorExplanation remember not to translate the URL #. unless you translate the actual page :) -#: ../src/zypper-utils.cc:47 +#: ../src/zypper-utils.cc:50 msgid "See http://en.opensuse.org/Zypper#Troubleshooting for instructions." msgstr "" @@ -1325,20 +1352,24 @@ msgid "Unknown command '%s'" msgstr "" -#: ../src/zypper-callbacks.h:41 +#: ../src/zypper-callbacks.h:42 msgid "I/O error" msgstr "" -#: ../src/zypper-callbacks.h:41 +#: ../src/zypper-callbacks.h:42 msgid "Invalid object" msgstr "" -#: ../src/zypper-media-callbacks.h:47 +#: ../src/zypper-callbacks.h:50 +msgid "Error" +msgstr "" + +#: ../src/zypper-media-callbacks.h:56 #, c-format msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation." msgstr "" -#: ../src/zypper-media-callbacks.h:63 ../src/zypper-media-callbacks.h:69 +#: ../src/zypper-media-callbacks.h:76 ../src/zypper-media-callbacks.h:82 msgid "Downloading: " msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.8.18/src/zypper-misc.cc new/zypper-0.8.18/src/zypper-misc.cc --- old/zypper-0.8.18/src/zypper-misc.cc 2007-08-30 20:33:57.000000000 +0200 +++ new/zypper-0.8.18/src/zypper-misc.cc 2007-08-31 16:08:42.000000000 +0200 @@ -13,7 +13,6 @@ #include <zypp/RepoManager.h> #include <zypp/RepoInfo.h> -#include <zypp/repo/RepoException.h> #include <zypp/CapFactory.h> @@ -422,7 +421,7 @@ stm << _("Problem: ") << prob.description () << endl; det = prob.details (); if (!det.empty ()) - stm << " " << det << endl; + stm << " " << det << endl; int n; ProblemSolutionList solutions = prob.solutions (); @@ -443,6 +442,9 @@ int reply; do { + // without solutions, its useless to prompt + if (solutions.empty()) + return false; // input prompt cerr << _("number, (r)etry or (c)ancel> ") << flush; string reply_s = str::getline (cin, zypp::str::TRIM); @@ -482,17 +484,21 @@ e = rproblems.end (), i; ProblemSolutionList todo; - bool no_problem = b == e; - if (!no_problem) { + if (!rproblems.empty()) { stm << format (_("%s Problems:")) % rproblems.size() << endl; } else { stm << _("Specified capability not found") << endl; return false; } - for (i = b; i != e; ++i) { - stm << _("Problem: ") << (*i)->description () << endl; + // for many problems, list them shortly first + if (rproblems.size() > 1) + { + for (i = b; i != e; ++i) { + stm << _("Problem: ") << (*i)->description () << endl; + } } + // now list all problems with solution proposals for (i = b; i != e; ++i) { stm << endl; tribool stopnow = show_problem (*(*i), todo); @@ -805,6 +811,7 @@ { establish (); cout_v << _("Resolving dependencies...") << endl; + God->resolver()->setForceResolve( true ); return God->resolver()->resolvePool(); } @@ -861,7 +868,7 @@ || it->status().transacts() // or transacts || !it->status().isUndetermined()) // or established status { - _DEBUG( count << ": " << *it ); + _XDEBUG( count << ": " << *it ); } } _XDEBUG( "---------------------------------------" ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.8.18/src/zypper-sources.cc new/zypper-0.8.18/src/zypper-sources.cc --- old/zypper-0.8.18/src/zypper-sources.cc 2007-08-30 20:33:57.000000000 +0200 +++ new/zypper-0.8.18/src/zypper-sources.cc 2007-08-31 16:08:42.000000000 +0200 @@ -784,8 +784,37 @@ //! \todo handle local .repo files, validate the URL Url url(repo_file_url); RepoManager manager; - list<RepoInfo> repos = readRepoFile(url); + list<RepoInfo> repos; + // read the repo file + try { repos = readRepoFile(url); } + catch (const media::MediaException & e) + { + ZYPP_CAUGHT(e); + report_problem(e, + _("Problem accessing the file at the specified URL") + string(":"), + _("Please check if the URL is valid and accessible.")); + return ZYPPER_EXIT_ERR_ZYPP; + } + catch (const parser::ParseException & e) + { + ZYPP_CAUGHT(e); + report_problem(e, + _("Problem parsing the file at the specified URL") + string(":"), + // TranslatorExplanation don't translate the URL if the URL itself is not translated. + // Also don't translate the '.repo' string. + _("Is it a .repo file? See http://en.opensuse.org/Standards/RepoInfo for details.")); + return ZYPPER_EXIT_ERR_ZYPP; + } + catch (const Exception & e) + { + ZYPP_CAUGHT(e); + report_problem(e, + _("Problem encountered while trying to read the file at the specified URL") + string(":")); + return ZYPPER_EXIT_ERR_ZYPP; + } + + // add repos for (list<RepoInfo>::const_iterator it = repos.begin(); it != repos.end(); ++it) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org