--- a/layman/config.py +++ b/layman/config.py @@ -90,9 +90,9 @@ class BareConfig(object): self.root = root self._defaults = { - 'configdir': path([self.root, EPREFIX,'/etc/layman']), + 'configdir': path([EPREFIX,'/etc/layman']), 'config' : '%(configdir)s/layman.cfg', - 'storage' : path([self.root, EPREFIX,'/var/lib/layman']), + 'storage' : path([EPREFIX,'/var/lib/layman']), 'cache' : '%(storage)s/cache', 'local_list': '%(storage)s/overlays.xml', 'installed': '%(storage)s/installed.xml', @@ -104,7 +104,7 @@ class BareConfig(object): 'require_repoconfig': 'Yes', 'clean_archive': 'yes', 'make_conf' : '%(storage)s/make.conf', - 'repos_conf': path([self.root, EPREFIX,'/etc/portage/repos.conf/layman.conf']), + 'repos_conf': path([EPREFIX,'/etc/portage/repos.conf/layman.conf']), 'conf_module': ['make_conf', 'repos_conf'], 'nocheck' : 'yes', 'http_proxy' : '', @@ -118,18 +118,18 @@ class BareConfig(object): 'overlays' : 'https://api.gentoo.org/overlays/repositories.xml', 'overlay_defs': '%(configdir)s/overlays', - 'bzr_command': path([self.root, EPREFIX,'/usr/bin/bzr']), - 'cvs_command': path([self.root, EPREFIX,'/usr/bin/cvs']), - 'darcs_command': path([self.root, EPREFIX,'/usr/bin/darcs']), - 'git_command': path([self.root, EPREFIX,'/usr/bin/git']), - 'g-common_command': path([self.root, EPREFIX,'/usr/bin/g-common']), - 'g-sorcery_command': path([self.root, EPREFIX,'/usr/bin/g-sorcery']), - 'mercurial_command': path([self.root, EPREFIX,'/usr/bin/hg']), + 'bzr_command': path([EPREFIX,'/usr/bin/bzr']), + 'cvs_command': path([EPREFIX,'/usr/bin/cvs']), + 'darcs_command': path([EPREFIX,'/usr/bin/darcs']), + 'git_command': path([EPREFIX,'/usr/bin/git']), + 'g-common_command': path([EPREFIX,'/usr/bin/g-common']), + 'g-sorcery_command': path([EPREFIX,'/usr/bin/g-sorcery']), + 'mercurial_command': path([EPREFIX,'/usr/bin/hg']), # left blank due to squashfs only needing to mount the image. 'squashfs_command': '', - 'rsync_command': path([self.root, EPREFIX,'/usr/bin/rsync']), - 'svn_command': path([self.root, EPREFIX,'/usr/bin/svn']), - 'tar_command': path([self.root, EPREFIX,'/bin/tar']), + 'rsync_command': path([EPREFIX,'/usr/bin/rsync']), + 'svn_command': path([EPREFIX,'/usr/bin/svn']), + 'tar_command': path([EPREFIX,'/bin/tar']), 't/f_options': ['check_official', 'clean_archive', 'nocheck', 'require_repoconfig'], 'bzr_addopts' : '', 'bzr_syncopts' : '',