Bug#584554: meld: fails on modified CVS files

[Bálint Réczey]

forwarded 584554 https://bugzilla.gnome.org/show_bug.cgi?id=597718
thanks

Hi,

The very same patch has been applied upstream [1].
The problem also affects svn, git, etc. repositories.

Thanks,
Balint

[1]:http://git.gnome.org/browse/meld/commit/?id=aa9a506099627e1d62acbe6e7c09c217d86feef5

2010/6/4 Andreas Hoenen <andreas at hoenen-terstappen.de>:
> Package: meld
> Version: 1.3.1-1
> Severity: important
> Tags: patch
>
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> With release 1.3.1-1, meld fails on CVS files that have been modified locally,
> which worked properly in release 1.3.0-2.  The exception thrown is:
>
> $ cvs status file1
> ===================================================================
> File: file1             Status: Locally Modified
>
>   Working revision:    1.1     2010-05-29 16:02:17 +0200
>   Repository revision: 1.1     /home/ah/work/vcs_backup/cvs/repos/a/b/c/file1,v
>   Commit Identifier:   STUxZ50VmFTJhGAu
>   Sticky Tag:          (none)
>   Sticky Date:         (none)
>   Sticky Options:      (none)
>
> $ meld file1
> Traceback (most recent call last):
>  File "/usr/lib/meld/task.py", line 130, in iteration
>    ret = task()
>  File "/usr/lib/meld/vcview.py", line 353, in run_diff_iter
>    diff = difffunc()
>  File "/usr/lib/meld/vcview.py", line 419, in _command_iter
>    r = readfunc()
>  File "/usr/lib/meld/misc.py", line 209, in __call__
>    self.proc = subprocess.Popen(command, cwd=workdir, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
>  File "/usr/lib/python2.5/subprocess.py", line 594, in __init__
>    errread, errwrite)
>  File "/usr/lib/python2.5/subprocess.py", line 1153, in _execute_child
>    raise child_exception
> OSError: [Errno 2] No such file or directory: ''
>
> The problem is that variable workdir gets determined as the empty string instead
> of None at various locations, which subprocess.Popen() can't handle.  The
> obvious workaround patch with mapping '' to None is attached.
>
> Setting severity to important analoguous to meld BTS report #545359, as for
> those (like me) that use meld for CVS version control the program is completely
> broken.
>