search

GeoscienceAustralia / agdc

Repository for Australian Geoscience Data Cube (AGDC) code
BSD 3-Clause "New" or "Revised" License
29 stars 24 forks source link

Replaced unportable HOSTNAME env reference #3

Closed joshvote closed 10 years ago

joshvote commented 10 years ago

See https://govdex.gov.au/jira/browse/AGDCJIRA-44

matthew-hoyles commented 10 years ago

Seems reasonable to me. The getenv('HOSTNAME') is just a default for non-PBS jobs, so if socket.gethostname() is more portable (which seems likely) this is fine. I have tried this out (the alternate ways of getting the hostname) on the NCI machines and the result is the same.

To merge this into develop I suggest: 1) switch your working dirctory to the develop branch with 'git checkout develop' 2) make sure develop is up to date with 'git pull' 3) merge in your change with 'git merge --no-ff ADGCJIRA-44-hostname' (the --no-ff forces a merge commit even though this is a fast-forward) 4) push the change to github with 'git push origin HEAD'