~jameinel/bzr-svn/ppa

« back to all changes in this revision

Viewing changes to transport.py

  • Committer: John Arbash Meinel
  • Date: 2008-09-24 19:18:10 UTC
  • mfrom: (309.2.8 debian)
  • Revision ID: john@arbash-meinel.com-20080924191810-or5n7nvups5hecdk
Merge in Jelmer's latest

Show diffs side-by-side

added added

removed removed

Lines of Context:
125
125
            elif "«" in msg:
126
126
                new_url = msg[msg.index("»")+2:msg.index("«")]
127
127
            else:
128
 
                new_url = None
 
128
                raise AssertionError("Unable to parse error message: %s" % msg)
129
129
            raise RedirectRequested(source=url, target=new_url, 
130
130
                                    is_permanent=True)
131
131
        raise
291
291
            def run(self):
292
292
                assert not self.busy, "already running"
293
293
                self.busy = True
294
 
                def rcvr(*args):
295
 
                    self.pending.append(args)
 
294
                def rcvr(orig_paths, revision, revprops, has_children=None):
 
295
                    self.pending.append((orig_paths, revision, revprops, has_children))
296
296
                    self.semaphore.release()
297
297
                try:
298
298
                    try: