"KeyError: '2'" in CVS loader

https://sentry.softwareheritage.org/share/issue/870ccde32097416ebecfc843469645ff/

KeyError: '2'
  File "swh/loader/core/loader.py", line 335, in load
    self.prepare()
  File "swh/loader/cvs/loader.py", line 461, in prepare
    cvs.walk(self.cvs_module_name)
  File "swh/loader/cvs/cvs2gitdump/cvs2gitdump.py", line 378, in walk
    self.parse_file(root + os.sep + f)
  File "swh/loader/cvs/cvs2gitdump/cvs2gitdump.py", line 393, in parse_file
    if len(r) == 2 and branches[r[0]] == 'HEAD':

Loading failure, updating to `failed` status

Locals:

branches	

{1: 'HEAD', 1.1.1: 'VENDOR'}

k	

'release-2001-12-31'

path	

'/tmp/swh.loader.cvs.t1aeo691-871164/tiny-tools/rc/Attic/emacs-rc-tinyload.el,v'

r	

['2', '0']

rcsfile	

<rcsparse.rcsfile object at 0x7f3b2d9bc0f0>

rtags	

{}

self	

<swh.loader.cvs.cvs2gitdump.cvs2gitdump.CvsConv object at 0x7f3b2d9cc0f0>

v_	

'2.0'

Happened while loading rsync://a.cvs.sourceforge.net/cvsroot/tiny-tools/tiny-tools/

---

We also have this issue that seems related or the same: https://sentry.softwareheritage.org/share/issue/409a2e147c6d44ec9977b6ea9fa2e3a8/

KeyError: '2'
  File "swh/loader/core/loader.py", line 335, in load
    self.prepare()
  File "swh/loader/cvs/loader.py", line 461, in prepare
    cvs.walk(self.cvs_module_name)
  File "swh/loader/cvs/cvs2gitdump/cvs2gitdump.py", line 378, in walk
    self.parse_file(root + os.sep + f)
  File "swh/loader/cvs/cvs2gitdump/cvs2gitdump.py", line 448, in parse_file
    raise e
  File "swh/loader/cvs/cvs2gitdump/cvs2gitdump.py", line 444, in parse_file
    branches[b], v[2], v[1], rcsfile.getlog(v[0]), v[6],

Locals:

branches	

{1: 'HEAD', 1.1.1: 'VENDOR'}

k	

'2.0'

novendor	

True

path	

'/tmp/swh.loader.cvs.jkahwy03-851915/uuu/src/cells/thread/strontium/strontium.asm,v'

r	

['2', '0']

rcsfile	

<rcsparse.rcsfile object at 0x7f33f533b030>

revs	

[['1.1', ['1.1', 986326833, 'instinc', 'Exp', [], None, None]], ['1.2', ['1.2', 986365476, 'instinc', 'Exp', [], '1.1', None]], ['1.3', ['1.3', 986365518, 'instinc', 'Exp', [], '1.2', None]], ['1.4', ['1.4', 986433136, 'instinc', 'Exp', [], '1.3', None]], ['1.5', ['1.5', 986433898, 'instinc', 'Exp', [], '1.4', None]], ['1.6', ['1.6', 986579283, 'instinc', 'Exp', [], '1.5', None]], ['1.7', ['1.7', 986586511, 'instinc', 'Exp', [], '1.6', None]], ['1.8', ['1.8', 986595342, 'instinc', 'Exp', [], '1.7', None]], ['1.9', ['1.9', 986595774, 'instinc', 'Exp', [], '1.8', None]], ['1.10', ['1.10', 986605526, 'instinc', 'Exp', [], '1.9', None]]]

rtags	

{1.22: ['frustration_0_1']}

self	

<swh.loader.cvs.cvs2gitdump.cvs2gitdump.CvsConv object at 0x7f33f5338d68>

v_	

'1.22'

On origin rsync://a.cvs.sourceforge.net/cvsroot/uuu/uuu/

---

Migrated from T4043 (view on Phabricator)