Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove pre-devscripts 2.10.70 compat code #86

Closed
wants to merge 1 commit into from
Closed

Remove pre-devscripts 2.10.70 compat code #86

wants to merge 1 commit into from

Conversation

Unit193
Copy link
Contributor

@Unit193 Unit193 commented Dec 18, 2021

Remove pre-devscripts 2.10.70 compat code, no longer matches current output anyway.

This also allows uscan to adhere to the users configuration.

@agx
Copy link
Owner

agx commented Dec 18, 2021

Thanks! I've added to nits inline. Can you make the commit message a bit more catchy (I had to look up what this was about in the first place). E.g. like

Remove pre-devscripts 2.10.70 compat code

We can rely on the <target> element being present in the xml.

We can rely on the <target> element being present in dehs output.

The output it looks for from uscan no longer matches anyway.

This will allow for gbp import-orig --uscan to adhere to uscan configuration
of not using symlinks, if the user has such defined.
@Unit193
Copy link
Contributor Author

Unit193 commented Dec 18, 2021

Oh yes, that's a bit cryptic if one doesn't look at the actual changes. It's not too interesting of a change really, but a little explaining will help. Hopefully you like what I just pushed, if not I'm not really attached to what's written anyway.

@agx
Copy link
Owner

agx commented Dec 19, 2021

@Unit193 thanks. Your commit still tries to squeeze a behaviour change (dropping --symlink with a cleanup so I split that part out.

I'm fine to apply the symlink bit as well but please see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=914314 - did you test that scenario? If so let me know and I'll push that out as well (keeping your authorship).

Alternative would be to pass --symlink only when --tarball-dir is in effect too.

@agx agx closed this Dec 19, 2021
@Unit193
Copy link
Contributor Author

Unit193 commented Dec 21, 2021

I figured they were related, my main goal was to remove --symlink so that I could finally make use of the --uscan option. Importing seemed to work fine but I didn't really have any exotic configuration. I'd be more than willing to test anything that'll help get rid of --symlink though.

@agx
Copy link
Owner

agx commented Dec 21, 2021

I figured they were related, my main goal was to remove --symlink so that I could finally make use of the --uscan option.

That's why we really want that as a separate commit. Did you check --tarball-dir works as expected with your patch (I haven't yet).

@Unit193
Copy link
Contributor Author

Unit193 commented Dec 30, 2021

I haven't, but is something else you get from DEHS out of uscan. Maybe that could be utilized at some point.

@agx
Copy link
Owner

agx commented May 26, 2022

Checking --tarball-dir and maybe even adding a test for that would be great.

@Unit193
Copy link
Contributor Author

Unit193 commented May 28, 2022

I'm not very well versed in python so beyond basic changes, and writing tests, I'm out of luck. For the time being I have a trigger that strips --symlink out of /usr/lib/python3/dist-packages/gbp/deb/uscan.py, so it works. Thanks for following up!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants