diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-09-11 18:38:06 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-09-11 18:38:06 -0700 |
| commit | 324628c70352d3aad4c32c51ce254964e5b19554 (patch) | |
| tree | 22893506febe10da180249c95345bb592db3bf3f | |
| parent | 20b0fdd6910d094b829a16c54a97f8d2900e00de (diff) | |
| download | portage-324628c70352d3aad4c32c51ce254964e5b19554.tar.gz portage-324628c70352d3aad4c32c51ce254964e5b19554.tar.bz2 portage-324628c70352d3aad4c32c51ce254964e5b19554.zip | |
config: set USERLAND if unset
| -rw-r--r-- | pym/portage/package/ebuild/config.py | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index 8cca0ef25..bf8889481 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -8,6 +8,7 @@ __all__ = [ import copy from itertools import chain import logging +import platform import re import sys import warnings @@ -687,6 +688,18 @@ class config(object): self["CBUILD"] = self["CHOST"] self.backup_changes("CBUILD") + if "USERLAND" not in self: + # Set default USERLAND so that our test cases can assume that + # it's always set. This allows isolated-functions.sh to avoid + # calling uname -s when sourced. + system = platform.system() + if system is not None and \ + (system.endswith("BSD") or system == "DragonFly"): + self["USERLAND"] = "BSD" + else: + self["USERLAND"] = "GNU" + self.backup_changes("USERLAND") + self["PORTAGE_BIN_PATH"] = PORTAGE_BIN_PATH self.backup_changes("PORTAGE_BIN_PATH") self["PORTAGE_PYM_PATH"] = PORTAGE_PYM_PATH |