Hello,

I tried to import an old quilt series that was over a svn repository into the
new git based one as a stgit patch stack, and encountered a bug in:

"stg import -s".

I had created some of the patches with "-p 0" argument to quilt to ease other
maintainers patch integration workflow. Those zero-strip-level patches were not
importing properly into stgit:

Traceback (most recent call last):
  File "stgit/stgit/main.py", line 185, in _main
    ret = command.func(parser, options, args)
  File "stgit/stgit/commands/imprt.py", line 347, in func
    __import_series(filename, options)
  File "stgit/stgit/commands/imprt.py", line 249, in __import_series
    __import_file(patchfile, options, patch)
  File "stgit/stgit/commands/imprt.py", line 201, in __import_file
    (f, pname) = __get_handle_and_name(filename)
  File "stgit/stgit/commands/imprt.py", line 194, in __get_handle_and_name
    return (open(filename), filename)
IOError: [Errno 2] No such file or directory: 
'stgit/t/trash/t4200-import-s.sh/patches/patch-p0.diff -p0'
stg import: [Errno 2] No such file or directory:
            'stgit/t/trash/t4200-import-s.sh/patches/patch-p0.diff
            -p0'

You can pull these two patches from :

repo : https://github.com/vincele/stgit.git
branch : master

The first patch add a test for a quilt series import with such patches, that is
failing. It also test for various whitespace before comments, which is working,
but currently not tested.

The second patch fix the failure, it has other safety guards around the same
subject, as quilt can have various "-p" options given to it, but only "-p0"
can be in the series file.

Please tell me if something is wrong with those patches.

Tchuss

-- 
Vincent Legoll

_______________________________________________
stgit-users mailing list
[email protected]
https://mail.gna.org/listinfo/stgit-users

Reply via email to