Package: tailor
Version: 0.9.20-1
Severity: minor

I have a cvs repo that has in ancient past been manipulated with rcs
commands and there are some locks left on, so cvs rlog reports:

----------------------------
revision 1.48   locked by: la;
date: 1997-12-13 00:00:00 +0000;  author: la;  state: Exp;  lines: +4 -1
Imported.
----------------------------

Note that there is a tab character between the version and the "locked
by" string. Now, when I try to run tailor to import this to darcs, it halts 
with an error trace ending with:

  File "/usr/lib/python2.4/site-packages/vcpx/cvs.py", line 513, in 
__updateState
    state[e.name] = normalize_cvs_rev(e.new_revision)
  File "/usr/lib/python2.4/site-packages/vcpx/cvs.py", line 29, in 
normalize_cvs_rev
    r = [int(n) for n in rev.split('.')]
ValueError: invalid literal for int(): 48 locked

It turns out that in the function in question there is an attempt to
handle this case (cvs.py:25):

    # handle locked files by taking only the first part of the
    # revision string to handle gracefully lines like "1.1 locked"
    rev = rev.split(' ')[0]

However, the separator character doesn't match the tab so this fails. 
Changing the ' ' to '\t' makes tailor work a bit further, but then it
dies with:

16:07:42 [I] /home/la/scratch/tmp/2006/03/30 $ cvs -d /home/la/today/cvsrepo -q 
update -d -r "1.48\tlocked" ani/ani0.txt
cvs [update aborted]: Numeric tag 1.48  locked contains characters other than 
digits and '.'

So the revision parsing has failed at some other point, too.

It can be argued that the CVS repo is broken and tailor is not really
required to work in such situations, but since these kinds of repos
nevertheless do occur, it would be nice to see this fixed.

-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.15-la5
Locale: LANG=C, LC_CTYPE=fi_FI.ISO-8859-1 (charmap=ISO-8859-1)

Versions of packages tailor depends on:
ii  python2.4                     2.4.2-2    An interactive high-level object-o

tailor recommends no packages.

-- no debconf information


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to