diff options
| author |  David Leverton <levertond@googlemail.com>
| 2008-02-22 15:19:24 +0000 |
|---|---|---|
| committer | David Leverton <levertond@googlemail.com>
| 2008-02-22 15:19:24 +0000 |
| commit | 3d7a7ba05779d9875cf0bae1848b23fc778b4605 (patch) | |
| tree | e44d06e51939f52c311e874301aa3a3d6b2661ce /paludis/repositories | |
| parent | e1e4bf93b7e2653d5638711c93be2932647bb22e (diff) | |
| download | paludis-3d7a7ba05779d9875cf0bae1848b23fc778b4605.tar.gz paludis-3d7a7ba05779d9875cf0bae1848b23fc778b4605.tar.xz | |
Clean up ${ROOT} trailing slash handling.
Diffstat (limited to 'paludis/repositories')
| -rw-r--r-- | paludis/repositories/e/e_installed_repository.cc | 4 | ||||
| -rwxr-xr-x | paludis/repositories/e/ebuild/ebuild.bash | 2 | ||||
| -rw-r--r-- | paludis/repositories/e/exndbam_repository.cc | 2 | ||||
| -rw-r--r-- | paludis/repositories/e/vdb_repository.cc | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/paludis/repositories/e/e_installed_repository.cc b/paludis/repositories/e/e_installed_repository.cc index 8fedae814..bd69d435f 100644 --- a/paludis/repositories/e/e_installed_repository.cc +++ b/paludis/repositories/e/e_installed_repository.cc @@ -447,7 +447,7 @@ EInstalledRepository::perform_config(const tr1::shared_ptr<const ERepositoryID> .builddir(_imp->params.builddir), EbuildConfigCommandParams::create() - .root(stringify(_imp->params.root) + "/") + .root(stringify(_imp->params.root)) .load_environment(load_env.get())); config_cmd(); @@ -530,7 +530,7 @@ EInstalledRepository::perform_info(const tr1::shared_ptr<const ERepositoryID> & .builddir(_imp->params.builddir), EbuildInfoCommandParams::create() - .root(stringify(_imp->params.root) + "/") + .root(stringify(_imp->params.root)) .use("") .use_expand("") .expand_vars(make_shared_ptr(new Map<std::string, std::string>)) diff --git a/paludis/repositories/e/ebuild/ebuild.bash b/paludis/repositories/e/ebuild/ebuild.bash index c81cf73c2..edef80336 100755 --- a/paludis/repositories/e/ebuild/ebuild.bash +++ b/paludis/repositories/e/ebuild/ebuild.bash @@ -52,7 +52,7 @@ fi shopt -s expand_aliases shopt -s extglob -export ROOT="${ROOT//+(\/)//}" +export ROOT="${ROOT%+(/)}/" export EBUILD_PROGRAM_NAME="$0" diff --git a/paludis/repositories/e/exndbam_repository.cc b/paludis/repositories/e/exndbam_repository.cc index 7d62b1bcb..2332678b4 100644 --- a/paludis/repositories/e/exndbam_repository.cc +++ b/paludis/repositories/e/exndbam_repository.cc @@ -441,7 +441,7 @@ ExndbamRepository::perform_uninstall(const tr1::shared_ptr<const ERepositoryID> .builddir(_imp->params.builddir)); EbuildUninstallCommandParams uninstall_params(EbuildUninstallCommandParams::create() - .root(stringify(_imp->params.root) + "/") + .root(stringify(_imp->params.root)) .disable_cfgpro(o[k::no_config_protect()]) .unmerge_only(false) .loadsaveenv_dir(ver_dir) diff --git a/paludis/repositories/e/vdb_repository.cc b/paludis/repositories/e/vdb_repository.cc index f51a0d1b2..db451de51 100644 --- a/paludis/repositories/e/vdb_repository.cc +++ b/paludis/repositories/e/vdb_repository.cc @@ -425,7 +425,7 @@ VDBRepository::perform_uninstall(const tr1::shared_ptr<const ERepositoryID> & id .builddir(_imp->params.builddir)); EbuildUninstallCommandParams uninstall_params(EbuildUninstallCommandParams::create() - .root(stringify(_imp->params.root) + "/") + .root(stringify(_imp->params.root)) .disable_cfgpro(o[k::no_config_protect()]) .unmerge_only(false) .loadsaveenv_dir(pkg_dir) |