Fix an issue when you run shed_diff --shed_target local

[gwenandres]

Hi,

We are a developer team in Roscoff in France.

We have detected a bug when you run planemo shed_diff --shed_target local.
The directories, which are compared, have the same name local for both files from the localtoolshed and files from the working tested directory.

BEFORE

$ planemo shed_diff -t local
Diffing repository package_fastme_1_0_0 
wget -q --recursive -O - 'http://localhost:9009/repository/download?repository_id=d9abeb98649a6a7e&changeset_revision=default&file_type=gz' | tar -xzf - -C /tmp/tool_shed_diff_bQBFCC/_local_ --strip-components 1
mkdir "/tmp/tool_shed_diff_bQBFCC/_local_"; tar -xzf "/tmp/tmpLl2Gh5" -C "/tmp/tool_shed_diff_bQBFCC/_local_"; rm -rf /tmp/tmpLl2Gh5
mkdir: cannot create directory `/tmp/tool_shed_diff_bQBFCC/_local_': File exists
[...]
  File "/usr/local/galaxy/galaxy/.venv/lib/python2.7/site-packages/planemo/shed/diff.py", line 11, in diff_and_remove
    assert label_a != label_b

We propose a fix changing the working tested directory name: workingdir instead of local

AFTER

$ planemo shed_diff -t local
Diffing repository package_fastme_1_0_0 
wget -q --recursive -O - 'http://localhost:9009/repository/download?repository_id=d9abeb98649a6a7e&changeset_revision=default&file_type=gz' | tar -xzf - -C /tmp/tool_shed_diff_Jh4HoN/_local_ --strip-components 1
mkdir "/tmp/tool_shed_diff_Jh4HoN/_workingdir_"; tar -xzf "/tmp/tmpGHqMci" -C "/tmp/tool_shed_diff_Jh4HoN/_workingdir_"; rm -rf /tmp/tmpGHqMci
cd "/tmp/tool_shed_diff_Jh4HoN"; diff -r _workingdir_ _local_ >> '/tmp/tmpiX8fW2'

If you have any questions about this fix don't hesitate to contact us.

Cheers

Gwendoline Andres and Gildas Le Corguillé - ABiMS Roscoff - CNRS/UPMC - France

[jmchilton]

Fantastic, thanks for the fix!

[gwenandres]

Great !

Thanks a lot

2015-11-18 16:36 GMT+01:00 John Chilton [email protected]:

Merged #375 #375.

—
Reply to this email directly or view it on GitHub
#375 (comment).