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.

Sign up for GitHub

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

fix: Fixed patterns applying #30

Merged
merged 2 commits into from
Jun 16, 2020
Merged

fix: Fixed patterns applying #30

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a3131c
package.py - Fixed patterns applying without specified commands
ahlinc Jun 16, 2020
f3aff6d
package.py - allow heredoc commands, don't apply patterns for explici…
ahlinc Jun 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,12 @@ def pip_requirements_step(path, prefix=None, required=False):
hash(requirements)

def commands_step(path, commands):
if not commands:
return

if isinstance(commands, str):
commands = map(str.strip, commands.splitlines())

if path:
path = os.path.normpath(path)
batch = []
Expand Down Expand Up @@ -737,15 +743,16 @@ def execute(self, build_plan, zip_stream, query):
source_path, prefix = action[1:]
if sh_work_dir:
if source_path != sh_work_dir:
source_path = sh_work_dir
if not os.path.isfile(source_path):
source_path = sh_work_dir
if os.path.isdir(source_path):
if pf:
self._zip_write_with_filter(zs, pf, source_path, prefix,
timestamp=ts)
else:
if os.path.isdir(source_path):
zs.write_dirs(source_path, prefix=prefix, timestamp=ts)
else:
zs.write_file(source_path, prefix=prefix, timestamp=ts)
zs.write_dirs(source_path, prefix=prefix, timestamp=ts)
else:
zs.write_file(source_path, prefix=prefix, timestamp=ts)
elif cmd == 'pip':
runtime, pip_requirements, prefix = action[1:]
with install_pip_requirements(query, pip_requirements) as rd:
Expand Down