diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-09-05 00:07:11 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-09-05 00:07:11 -0700 |
| commit | 4a0bdc5f9205a9c03ba2a13f34b960d524f98177 (patch) | |
| tree | 8a5dbcd0fdd6964d6f4fb6f6b1e9cf3753725de3 /pym | |
| parent | 738ee08c420b5b9229b48595b7acd9e4dd470e74 (diff) | |
| download | portage-4a0bdc5f9205a9c03ba2a13f34b960d524f98177.tar.gz portage-4a0bdc5f9205a9c03ba2a13f34b960d524f98177.tar.bz2 portage-4a0bdc5f9205a9c03ba2a13f34b960d524f98177.zip | |
Remove redundant initial os.sep argument to os.path.join() calls
involving EROOT.
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/_emerge/actions.py | 2 | ||||
| -rw-r--r-- | pym/portage/_sets/files.py | 4 | ||||
| -rw-r--r-- | pym/portage/glsa.py | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 9e73d98a6..18052dcda 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -2790,7 +2790,7 @@ def load_emerge_config(trees=None): settings = trees[myroot]["vartree"].settings break - mtimedbfile = os.path.join(os.path.sep, settings['EROOT'], portage.CACHE_PATH, "mtimedb") + mtimedbfile = os.path.join(settings['EROOT'], portage.CACHE_PATH, "mtimedb") mtimedb = portage.MtimeDB(mtimedbfile) portage.output._init(config_root=settings['PORTAGE_CONFIGROOT']) QueryCommand._db = trees diff --git a/pym/portage/_sets/files.py b/pym/portage/_sets/files.py index 21993316b..995fda67b 100644 --- a/pym/portage/_sets/files.py +++ b/pym/portage/_sets/files.py @@ -213,11 +213,11 @@ class WorldSelectedSet(EditablePackageSet): # most attributes exist twice as atoms and non-atoms are stored in # separate files self._lock = None - self._filename = os.path.join(os.sep, eroot, WORLD_FILE) + self._filename = os.path.join(eroot, WORLD_FILE) self.loader = ItemFileLoader(self._filename, self._validate) self._mtime = None - self._filename2 = os.path.join(os.sep, eroot, WORLD_SETS_FILE) + self._filename2 = os.path.join(eroot, WORLD_SETS_FILE) self.loader2 = ItemFileLoader(self._filename2, self._validate2) self._mtime2 = None diff --git a/pym/portage/glsa.py b/pym/portage/glsa.py index b88a07662..6267b2cc0 100644 --- a/pym/portage/glsa.py +++ b/pym/portage/glsa.py @@ -36,7 +36,7 @@ def get_applied_glsas(settings): @rtype: list @return: list of glsa IDs """ - return grabfile(os.path.join(os.sep, settings["EROOT"], CACHE_PATH, "glsa")) + return grabfile(os.path.join(settings["EROOT"], CACHE_PATH, "glsa")) # TODO: use the textwrap module instead @@ -666,7 +666,7 @@ class Glsa: """ if not self.isApplied(): checkfile = codecs.open( - _unicode_encode(os.path.join(os.sep, self.config["EROOT"], + _unicode_encode(os.path.join(self.config["EROOT"], CACHE_PATH, "glsa"), encoding=_encodings['fs'], errors='strict'), mode='a+', encoding=_encodings['content'], errors='strict') |