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

--new-pr can't be empty #1846

Merged
merged 4 commits into from
Aug 4, 2016
Merged

Conversation

Caylo
Copy link
Contributor

@Caylo Caylo commented Jul 13, 2016

fixes #1687

@boegel boegel added this to the v2.9.0 milestone Jul 13, 2016
@@ -618,6 +618,8 @@ def _easyconfigs_pr_common(paths, start_branch=None, pr_branch=None, target_acco
print_msg(git_repo.git.diff(cached=True) + '\n', log=_log, prefix=False)

diff_stat = git_repo.git.diff(cached=True, stat=True)
if not diff_stat:
raise EasyBuildError("No changed files found. Refused to make empty pull request.")
Copy link
Member

Choose a reason for hiding this comment

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

clarify error message, somehow mention that you were comparing with current develop branch (but keep it short, people don't actually read long errors ;-))

# get file from develop branch
full_url = URL_SEPARATOR.join([GITHUB_RAW, GITHUB_EB_MAIN, GITHUB_EASYCONFIGS_REPO,
'develop/easybuild/easyconfigs/z/zlib/zlib-1.2.8.eb'])
ec = download_file('zlib-1.2.8.eb', full_url, path=os.path.join(self.test_prefix, 'zlib-1.2.8.eb'), forced=True)
Copy link
Member

Choose a reason for hiding this comment

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

derive 'zlib-1.2.8.eb' from full_url?

ec_fn = os.path.basename(full_url)
ec = download_file(ec_fn, full_url, path=os.path.join(self.test_prefix, ec_fn), forced=True)

the forced is probably not needed (self.test_prefix will be an empty dir)

@boegel
Copy link
Member

boegel commented Aug 4, 2016

lgtm, thanks @Caylo!

@boegel boegel merged commit da49512 into easybuilders:develop Aug 4, 2016
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