##// END OF EJS Templates
bundle2: relax the condition to update transaction.hookargs...
Yuya Nishihara -
r33809:b3a41f4d default
parent child Browse files
Show More
@@ -304,15 +304,15 b' class bundleoperation(object):'
304 304 def gettransaction(self):
305 305 transaction = self._gettransaction()
306 306
307 if self.hookargs is not None:
307 if self.hookargs:
308 308 # the ones added to the transaction supercede those added
309 309 # to the operation.
310 310 self.hookargs.update(transaction.hookargs)
311 311 transaction.hookargs = self.hookargs
312 312
313 # mark the hookargs as flushed. further attempts to add to
314 # hookargs will result in an abort.
315 self.hookargs = None
313 # mark the hookargs as flushed. further attempts to add to
314 # hookargs will result in an abort.
315 self.hookargs = None
316 316
317 317 return transaction
318 318
General Comments 0
You need to be logged in to leave comments. Login now