|
Bugzilla – Full Text Bug Listing |
| Summary: | zypper miscounts when skipping packages | ||
|---|---|---|---|
| Product: | [openSUSE] openSUSE 11.0 | Reporter: | Stephan Binner <stbinner> |
| Component: | YaST2 | Assignee: | Jan Kupec <jkupec> |
| Status: | RESOLVED FIXED | QA Contact: | Jiri Srain <jsrain> |
| Severity: | Normal | ||
| Priority: | P5 - None | ||
| Version: | RC 1 | ||
| Target Milestone: | --- | ||
| Hardware: | Other | ||
| OS: | Other | ||
| Whiteboard: | |||
| Found By: | Development | Services Priority: | |
| Business Priority: | Blocker: | --- | |
| Marketing QA Status: | --- | IT Deployment: | --- |
|
Description
Stephan Binner
2008-06-04 11:27:37 UTC
grrrr.. such a stupid mistake. Coolo, this is harmless, can i submit?
$ svn diff src/zypper-repo-callbacks.h
Index: src/zypper-repo-callbacks.h
===================================================================
--- src/zypper-repo-callbacks.h (revision 10340)
+++ src/zypper-repo-callbacks.h (working copy)
@@ -184,7 +184,7 @@
virtual Action problem( zypp::Resolvable::constPtr resolvable_ptr, Error /*error*/, const std::string & description )
{
Zypper::instance()->out().error(description);
- ++Zypper::instance()->runtimeData().commit_pkg_current;
+ --Zypper::instance()->runtimeData().commit_pkg_current;
DBG << "error report" << endl;
return (Action) read_action_ari(PROMPT_ARI_RPM_DOWNLOAD_PROBLEM, ABORT);
}
Well, in case of ignore it should not decrease the count. But that's harmless, too:
$ svn diff src/zypper-repo-callbacks.h
Index: src/zypper-repo-callbacks.h
===================================================================
--- src/zypper-repo-callbacks.h (revision 10340)
+++ src/zypper-repo-callbacks.h (working copy)
@@ -184,9 +184,12 @@
virtual Action problem( zypp::Resolvable::constPtr resolvable_ptr, Error /*error*/, const std::string & description )
{
Zypper::instance()->out().error(description);
- ++Zypper::instance()->runtimeData().commit_pkg_current;
DBG << "error report" << endl;
- return (Action) read_action_ari(PROMPT_ARI_RPM_DOWNLOAD_PROBLEM, ABORT);
+
+ Action action = (Action) read_action_ari(PROMPT_ARI_RPM_DOWNLOAD_PROBLEM, ABORT);
+ if (action == DownloadResolvableReport::RETRY)
+ --Zypper::instance()->runtimeData().commit_pkg_current;
+ return action;
}
I don't want to review normal bugs. OK, 11.1 only. In svn, to be in zypper 0.12.0. submitted |