Show More
@@ -334,7 +334,7 b' def _processpart(op, part):' | |||||
334 | raise error.UnsupportedPartError(parttype=key, |
|
334 | raise error.UnsupportedPartError(parttype=key, | |
335 | params=unknownparams) |
|
335 | params=unknownparams) | |
336 | except error.UnsupportedPartError, exc: |
|
336 | except error.UnsupportedPartError, exc: | |
337 |
if |
|
337 | if part.mandatory: # mandatory parts | |
338 | raise |
|
338 | raise | |
339 | op.ui.debug('ignoring unsupported advisory part %s\n' % exc) |
|
339 | op.ui.debug('ignoring unsupported advisory part %s\n' % exc) | |
340 | return # skip to part processing |
|
340 | return # skip to part processing | |
@@ -786,6 +786,7 b' class unbundlepart(unpackermixin):' | |||||
786 | self.mandatorykeys = () |
|
786 | self.mandatorykeys = () | |
787 | self._payloadstream = None |
|
787 | self._payloadstream = None | |
788 | self._readheader() |
|
788 | self._readheader() | |
|
789 | self._mandatory = None | |||
789 |
|
790 | |||
790 | def _fromheader(self, size): |
|
791 | def _fromheader(self, size): | |
791 | """return the next <size> byte from the header""" |
|
792 | """return the next <size> byte from the header""" | |
@@ -818,6 +819,9 b' class unbundlepart(unpackermixin):' | |||||
818 | self.ui.debug('part type: "%s"\n' % self.type) |
|
819 | self.ui.debug('part type: "%s"\n' % self.type) | |
819 | self.id = self._unpackheader(_fpartid)[0] |
|
820 | self.id = self._unpackheader(_fpartid)[0] | |
820 | self.ui.debug('part id: "%s"\n' % self.id) |
|
821 | self.ui.debug('part id: "%s"\n' % self.id) | |
|
822 | # extract mandatory bit from type | |||
|
823 | self.mandatory = (self.type != self.type.lower()) | |||
|
824 | self.type = self.type.lower() | |||
821 | ## reading parameters |
|
825 | ## reading parameters | |
822 | # param count |
|
826 | # param count | |
823 | mancount, advcount = self._unpackheader(_fpartparamcount) |
|
827 | mancount, advcount = self._unpackheader(_fpartparamcount) |
General Comments 0
You need to be logged in to leave comments.
Login now