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

Set explicit patch target #4044

Merged
merged 1 commit into from
Aug 21, 2019
Merged

Set explicit patch target #4044

merged 1 commit into from
Aug 21, 2019

Conversation

ofek
Copy link
Contributor

@ofek ofek commented Aug 20, 2019

What does this PR do?

Like

# Patch applies to only one file: set it explicitly as a target, no need for -p
if windows?
patch :source => "create-regex-at-runtime.patch", :target => "#{python_2_embedded}/Lib/site-packages/yaml/reader.py"
else
patch :source => "create-regex-at-runtime.patch", :target => "#{install_dir}/embedded/lib/python2.7/site-packages/yaml/reader.py"
end

Motivation

          [Builder: pip2] I | 2019-08-19T21:26:36-04:00 | Build pip2: 0.3438s
The following shell command exited with status 3:
    $ bash -c 'patch -p1 -i ../../../../dev/go/src/github.com/DataDog/datadog-agent/omnibus/config/patches/pip2/remove-python27-deprecation-warning.patch'
Output:
    patching file src/pip/_internal/cli/base_command.py
Error:
    Assertion failed: hunk, file ../patch-2.5.9-src/patch.c, line 354

@ofek ofek added [deprecated] team/agent-core Deprecated. Use metrics-logs / shared-components labels instead.. changelog/no-changelog component/config labels Aug 20, 2019
@ofek ofek added this to the 6.14.0 milestone Aug 20, 2019
@ofek ofek requested a review from a team as a code owner August 20, 2019 12:39
Copy link
Contributor

@albertvaka albertvaka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@truthbk truthbk merged commit 3ccdded into master Aug 21, 2019
@truthbk truthbk deleted the ofek-patch-2 branch August 21, 2019 15:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog/no-changelog component/config [deprecated] team/agent-core Deprecated. Use metrics-logs / shared-components labels instead..
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants