1
0
mirror of https://github.com/facebook/proxygen.git synced 2025-08-10 05:22:59 +03:00

attempt to make docker build find our libnl file

Summary: trying to make travis find the libnl patch. this should work

Reviewed By: saifhhasan

Differential Revision: D6262615

fbshipit-source-id: 431786ed20622b0b6d85df095f9a65a93a514f5c
This commit is contained in:
John Strizich
2017-11-07 17:34:28 -08:00
committed by Facebook Github Bot
parent 508b1d6945
commit 50c4978bd0

View File

@@ -104,6 +104,9 @@ class FBCodeBuilder(object):
self.options_used.add(name)
return value
def has_option(self, name):
return name in self._options_do_not_access
def add_option(self, name, value):
if name in self._options_do_not_access:
raise RuntimeError('Option {0} already set'.format(name))
@@ -264,9 +267,13 @@ class FBCodeBuilder(object):
base_dir = self.option('projects_dir')
git_patch = self.option('{0}:git_patch'.format(project), '')
patch_file = path_join(
base_dir,
'../shipit_projects' if self.has_option('shipit_project_dir') else '',
git_patch
)
maybe_apply_patch = [
self.run(ShellQuoted('git apply {patch}').format(
patch=path_join(base_dir, git_patch))),
self.run(ShellQuoted('git apply {p}').format(p=patch_file)),
] if git_patch else []
local_repo_dir = self.option('{0}:local_repo_dir'.format(project), '')