← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/ui/__init__.py

  • Committer: John Arbash Meinel
  • Date: 2010-02-10 17:52:08 UTC
  • mfrom: (5021 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5023.
  • Revision ID: john@arbash-meinel.com-20100210175208-bubuwav4uqigu291
Merge bzr.dev 5021 to resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/ui/__init__.py
183
183
        if not self._task_stack:
184
184
            warnings.warn("%r finished but nothing is active"
185
185
                % (task,))
186
 
        elif task != self._task_stack[-1]:
187
 
            warnings.warn("%r is not the active task %r"
188
 
                % (task, self._task_stack[-1]))
 
186
        if task in self._task_stack:
 
187
            self._task_stack.remove(task)
189
188
        else:
190
 
            del self._task_stack[-1]
 
189
            warnings.warn("%r is not in active stack %r"
 
190
                % (task, self._task_stack))
191
191
        if not self._task_stack:
192
192
            self._progress_all_finished()
193
193