commit: 2c8af75d7929f4db1e606056cc11dbc4a0668370
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 17:46:23 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 17:46:23 2017 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=2c8af75d
travis: make configured values reflect build-env
.travis.yml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 467bc3cb7..c0157332d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,16 +21,16 @@ script:
- printf "[build_ext]\nportage-ext-modules=true" >> setup.cfg
- find . -type f -exec
sed -e "s|@PORTAGE_EPREFIX@||"
- -e "s|@PORTAGE_MV@|/bin/mv|"
- -e "s|@PORTAGE_BASH@|/bin/bash|"
+ -e "s|@PORTAGE_MV@|$(type -P mv)|"
+ -e "s|@PORTAGE_BASH@|$(type -P bash)|"
-e "s|@PREFIX_PORTAGE_PYTHON@|$(type -P python)|"
-e "s|@DEFAULT_PATH@|/usr/bin:/bin|"
-e "s|@EXTRA_PATH@|/usr/sbin:/sbin|"
- -e "s|@portagegroup@|portage|"
- -e "s|@portageuser@|portage|"
- -e "s|@rootuser@|root|"
- -e "s|@rootuid@|0|"
- -e "s|@rootgid@|0|"
+ -e "s|@portagegroup@|$(id -gn)|"
+ -e "s|@portageuser@|$(id -un)|"
+ -e "s|@rootuser@|$(id -un)|"
+ -e "s|@rootuid@|$(id -u)|"
+ -e "s|@rootgid@|$(id -g)|"
-e "s|@sysconfdir@|/etc|"
-i '{}' +
- ./setup.py test
