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

Inherit scm from superclass #5185

Merged
merged 3 commits into from May 21, 2019

Conversation

Projects
None yet
2 participants
@lasote
Copy link
Contributor

commented May 20, 2019

Changelog: Bugfix: Using scm declared in a superclass failed exporting the recipe with the error ERROR: The conanfile.py defines more than one class level 'scm' attribute.
Docs: omit

Closes #5181

@lasote lasote added this to the 1.16 milestone May 20, 2019

@lasote lasote requested a review from jgsogo May 20, 2019


if len(to_replace) == 0:
# SCM exists, but not found in the conanfile, probably inherited from superclass
return

This comment has been minimized.

Copy link
@jgsogo

jgsogo May 20, 2019

Member

Here we need to actually add the scm_data to this conanfile.py file. There is nothing to replace, but we need to add the dictionary to the class.

This comment has been minimized.

Copy link
@lasote

lasote May 20, 2019

Author Contributor

you are right.

@jgsogo
Copy link
Member

left a comment

Have a look at the comments, but it is looking good 👍

Show resolved Hide resolved conans/test/unittests/client/cmd/export_test.py
Show resolved Hide resolved conans/client/cmd/export.py
Show resolved Hide resolved conans/client/cmd/export.py
@jgsogo

jgsogo approved these changes May 21, 2019

Copy link
Member

left a comment

Ok, go with it!

@lasote

This comment has been minimized.

Copy link
Contributor Author

commented May 21, 2019

Thanks for the quick reviews!

@lasote lasote merged commit a33f809 into conan-io:develop May 21, 2019

2 checks passed

continuous-integration/jenkins/pr-head This commit looks good
Details
license/cla Contributor License Agreement is signed.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.