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

added TRUFFLE_TEST distribution #107

Merged
merged 1 commit into from
Mar 9, 2016
Merged

added TRUFFLE_TEST distribution #107

merged 1 commit into from
Mar 9, 2016

Conversation

dougxc
Copy link
Member

@dougxc dougxc commented Mar 7, 2016

No description provided.

@dougxc dougxc force-pushed the add-TRUFFLE_TEST-dist branch from 9a3230c to a381c80 Compare March 7, 2016 19:30
@dougxc
Copy link
Member Author

dougxc commented Mar 8, 2016

/cc @rschatz

@rschatz
Copy link
Member

rschatz commented Mar 9, 2016

lgtm

for prop in properties[enum]:
lines.append(newEnum + prop)

content = '\n'.join(lines)
Copy link
Member

Choose a reason for hiding this comment

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

Please use os.linesep instead of '\n'

Copy link
Member

Choose a reason for hiding this comment

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

Really? That means the content of the jar file will be different depending on the platform where it was built. Isn't the jar file supposed to be platform independent?

(but probably it doesn't make any difference, the code that reads it should be robust for different line endings anyway...)

Copy link
Member Author

Choose a reason for hiding this comment

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

Properties.store0 uses the platform dependent line separator. On the other hand, when loading a properties file, Java handles both. In any case, I will implement your request Christian.

@dougxc dougxc force-pushed the add-TRUFFLE_TEST-dist branch from a381c80 to d4d4ff2 Compare March 9, 2016 13:36
@chumer chumer added the accept label Mar 9, 2016
dougxc added a commit that referenced this pull request Mar 9, 2016
@dougxc dougxc merged commit 4b0efa4 into master Mar 9, 2016
@dougxc dougxc deleted the add-TRUFFLE_TEST-dist branch March 9, 2016 14:34
if metainfFile:
properties = self.settings.setdefault(metainfFile, {})
for line in contents.strip().split(os.linesep):
if not line.startswith('#'):
Copy link
Member

Choose a reason for hiding this comment

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

I think we shouldn't rely on the file to have windows line endings on windows.

Copy link
Member Author

Choose a reason for hiding this comment

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

Good catch - will fix.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants