aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-10-25 05:36:25 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-10-25 05:36:25 +0000
commit35cdfd86535bfe0b8b51e7be48b636c94210b602 (patch)
tree5508c30945279ed61b35d29fd68bfb2d7a0a1992
parentd6b33b481e6a204deea07256defd7bd28758b608 (diff)
downloadpaludis-35cdfd86535bfe0b8b51e7be48b636c94210b602.tar.gz
paludis-35cdfd86535bfe0b8b51e7be48b636c94210b602.tar.xz
Shorter filenames, to shut automake up.
-rw-r--r--paludis/repositories/unpackaged/Makefile.am46
-rw-r--r--paludis/repositories/unpackaged/installed_id.cc (renamed from paludis/repositories/unpackaged/installed_unpackaged_id.cc)4
-rw-r--r--paludis/repositories/unpackaged/installed_id.hh (renamed from paludis/repositories/unpackaged/installed_unpackaged_id.hh)0
-rw-r--r--paludis/repositories/unpackaged/installed_repository.cc (renamed from paludis/repositories/unpackaged/installed_unpackaged_repository.cc)6
-rw-r--r--paludis/repositories/unpackaged/installed_repository.hh (renamed from paludis/repositories/unpackaged/installed_unpackaged_repository.hh)2
-rw-r--r--paludis/repositories/unpackaged/installed_repository.sr (renamed from paludis/repositories/unpackaged/installed_unpackaged_repository.sr)0
-rw-r--r--paludis/repositories/unpackaged/installed_repository_TEST.cc (renamed from paludis/repositories/unpackaged/installed_unpackaged_repository_TEST.cc)124
-rwxr-xr-xpaludis/repositories/unpackaged/installed_repository_TEST_cleanup.sh9
-rwxr-xr-xpaludis/repositories/unpackaged/installed_repository_TEST_setup.sh (renamed from paludis/repositories/unpackaged/installed_unpackaged_repository_TEST_setup.sh)4
-rwxr-xr-xpaludis/repositories/unpackaged/installed_unpackaged_repository_TEST_cleanup.sh9
-rw-r--r--paludis/repositories/unpackaged/registration.cc2
-rw-r--r--paludis/repositories/unpackaged/unpackaged_repository_TEST.cc2
12 files changed, 104 insertions, 104 deletions
diff --git a/paludis/repositories/unpackaged/Makefile.am b/paludis/repositories/unpackaged/Makefile.am
index 9031264..aa5aae8 100644
--- a/paludis/repositories/unpackaged/Makefile.am
+++ b/paludis/repositories/unpackaged/Makefile.am
@@ -5,7 +5,7 @@ DISTCLEANFILES = \
ndbam_merger-sr.hh ndbam_merger-sr.cc \
ndbam_unmerger-sr.hh ndbam_unmerger-sr.cc \
unpackaged_repository-sr.hh unpackaged_repository-sr.cc \
- installed_unpackaged_repository-sr.hh installed_unpackaged_repository-sr.cc
+ installed_repository-sr.hh installed_repository-sr.cc
MAINTAINERCLEANFILES = Makefile.in
@@ -34,9 +34,9 @@ paludis_repositories_unpackaged_include_HEADERS = \
unpackaged_id.hh \
unpackaged_repository.hh \
unpackaged_repository-sr.hh \
- installed_unpackaged_repository.hh \
- installed_unpackaged_repository-sr.hh \
- installed_unpackaged_id.hh
+ installed_repository.hh \
+ installed_repository-sr.hh \
+ installed_id.hh
libpaludisunpackagedrepository_la_SOURCES = \
exceptions.cc \
@@ -45,8 +45,8 @@ libpaludisunpackagedrepository_la_SOURCES = \
ndbam_unmerger.cc \
unpackaged_id.cc \
unpackaged_repository.cc \
- installed_unpackaged_repository.cc \
- installed_unpackaged_id.cc \
+ installed_repository.cc \
+ installed_id.cc \
registration.cc \
$(paludis_repositories_unpackaged_include_HEADERS)
@@ -66,9 +66,9 @@ unpackaged_repository_TEST_LDADD = \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
-installed_unpackaged_repository_TEST_SOURCES = installed_unpackaged_repository_TEST.cc
+installed_repository_TEST_SOURCES = installed_repository_TEST.cc
-installed_unpackaged_repository_TEST_LDADD = \
+installed_repository_TEST_LDADD = \
libpaludisunpackagedrepository.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/util/test_extras.o \
@@ -93,26 +93,26 @@ EXTRA_DIST = \
unpackaged_repository.sr \
unpackaged_repository-sr.hh \
unpackaged_repository-sr.cc \
- installed_unpackaged_repository_TEST.cc \
- installed_unpackaged_repository_TEST_setup.sh \
- installed_unpackaged_repository_TEST_cleanup.sh \
- installed_unpackaged_repository.sr \
- installed_unpackaged_repository-sr.hh \
- installed_unpackaged_repository-sr.cc \
- installed_unpackaged_id.cc
+ installed_repository_TEST.cc \
+ installed_repository_TEST_setup.sh \
+ installed_repository_TEST_cleanup.sh \
+ installed_repository.sr \
+ installed_repository-sr.hh \
+ installed_repository-sr.cc \
+ installed_id.cc
BUILT_SOURCES = \
ndbam-sr.hh ndbam-sr.cc \
ndbam_merger-sr.hh ndbam_merger-sr.cc \
ndbam_unmerger-sr.hh ndbam_unmerger-sr.cc \
unpackaged_repository-sr.hh unpackaged_repository-sr.cc \
- installed_unpackaged_repository-sr.hh installed_unpackaged_repository-sr.cc
+ installed_repository-sr.hh installed_repository-sr.cc
check_SCRIPTS = \
unpackaged_repository_TEST_setup.sh \
unpackaged_repository_TEST_cleanup.sh \
- installed_unpackaged_repository_TEST_setup.sh \
- installed_unpackaged_repository_TEST_cleanup.sh
+ installed_repository_TEST_setup.sh \
+ installed_repository_TEST_cleanup.sh
TESTS_ENVIRONMENT = env \
TEST_OUTPUT_WRAPPER="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/outputwrapper`" \
@@ -130,7 +130,7 @@ TESTS_ENVIRONMENT = env \
TESTS = \
unpackaged_repository_TEST \
- installed_unpackaged_repository_TEST
+ installed_repository_TEST
check_PROGRAMS = $(TESTS)
@@ -161,11 +161,11 @@ unpackaged_repository-sr.hh : unpackaged_repository.sr $(top_srcdir)/misc/make_s
unpackaged_repository-sr.cc : unpackaged_repository.sr $(top_srcdir)/misc/make_sr.bash
if ! $(top_srcdir)/misc/make_sr.bash --source $(srcdir)/unpackaged_repository.sr > $@ ; then rm -f $@ ; exit 1 ; fi
-installed_unpackaged_repository-sr.hh : installed_unpackaged_repository.sr $(top_srcdir)/misc/make_sr.bash
- if ! $(top_srcdir)/misc/make_sr.bash --header $(srcdir)/installed_unpackaged_repository.sr > $@ ; then rm -f $@ ; exit 1 ; fi
+installed_repository-sr.hh : installed_repository.sr $(top_srcdir)/misc/make_sr.bash
+ if ! $(top_srcdir)/misc/make_sr.bash --header $(srcdir)/installed_repository.sr > $@ ; then rm -f $@ ; exit 1 ; fi
-installed_unpackaged_repository-sr.cc : installed_unpackaged_repository.sr $(top_srcdir)/misc/make_sr.bash
- if ! $(top_srcdir)/misc/make_sr.bash --source $(srcdir)/installed_unpackaged_repository.sr > $@ ; then rm -f $@ ; exit 1 ; fi
+installed_repository-sr.cc : installed_repository.sr $(top_srcdir)/misc/make_sr.bash
+ if ! $(top_srcdir)/misc/make_sr.bash --source $(srcdir)/installed_repository.sr > $@ ; then rm -f $@ ; exit 1 ; fi
distcheck-deps-local : $(DISTCHECK_DEPS)
diff --git a/paludis/repositories/unpackaged/installed_unpackaged_id.cc b/paludis/repositories/unpackaged/installed_id.cc
index 19bdce7..612f1cd 100644
--- a/paludis/repositories/unpackaged/installed_unpackaged_id.cc
+++ b/paludis/repositories/unpackaged/installed_id.cc
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/repositories/unpackaged/installed_unpackaged_id.hh>
-#include <paludis/repositories/unpackaged/installed_unpackaged_repository.hh>
+#include <paludis/repositories/unpackaged/installed_id.hh>
+#include <paludis/repositories/unpackaged/installed_repository.hh>
#include <paludis/repositories/unpackaged/ndbam.hh>
#include <paludis/repositories/unpackaged/ndbam_unmerger.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
diff --git a/paludis/repositories/unpackaged/installed_unpackaged_id.hh b/paludis/repositories/unpackaged/installed_id.hh
index 959ddf4..959ddf4 100644
--- a/paludis/repositories/unpackaged/installed_unpackaged_id.hh
+++ b/paludis/repositories/unpackaged/installed_id.hh
diff --git a/paludis/repositories/unpackaged/installed_unpackaged_repository.cc b/paludis/repositories/unpackaged/installed_repository.cc
index 0cd44cb..0389b44 100644
--- a/paludis/repositories/unpackaged/installed_unpackaged_repository.cc
+++ b/paludis/repositories/unpackaged/installed_repository.cc
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/repositories/unpackaged/installed_unpackaged_repository.hh>
-#include <paludis/repositories/unpackaged/installed_unpackaged_id.hh>
+#include <paludis/repositories/unpackaged/installed_repository.hh>
+#include <paludis/repositories/unpackaged/installed_id.hh>
#include <paludis/repositories/unpackaged/ndbam.hh>
#include <paludis/repositories/unpackaged/ndbam_merger.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
@@ -42,7 +42,7 @@
using namespace paludis;
using namespace paludis::unpackaged_repositories;
-#include <paludis/repositories/unpackaged/installed_unpackaged_repository-sr.cc>
+#include <paludis/repositories/unpackaged/installed_repository-sr.cc>
namespace
{
diff --git a/paludis/repositories/unpackaged/installed_unpackaged_repository.hh b/paludis/repositories/unpackaged/installed_repository.hh
index 9b15ee5..9fc4c25 100644
--- a/paludis/repositories/unpackaged/installed_unpackaged_repository.hh
+++ b/paludis/repositories/unpackaged/installed_repository.hh
@@ -28,7 +28,7 @@ namespace paludis
{
namespace unpackaged_repositories
{
-#include <paludis/repositories/unpackaged/installed_unpackaged_repository-sr.hh>
+#include <paludis/repositories/unpackaged/installed_repository-sr.hh>
}
class PALUDIS_VISIBLE InstalledUnpackagedRepository :
diff --git a/paludis/repositories/unpackaged/installed_unpackaged_repository.sr b/paludis/repositories/unpackaged/installed_repository.sr
index 246cecc..246cecc 100644
--- a/paludis/repositories/unpackaged/installed_unpackaged_repository.sr
+++ b/paludis/repositories/unpackaged/installed_repository.sr
diff --git a/paludis/repositories/unpackaged/installed_unpackaged_repository_TEST.cc b/paludis/repositories/unpackaged/installed_repository_TEST.cc
index b66d9a9..e78826a 100644
--- a/paludis/repositories/unpackaged/installed_unpackaged_repository_TEST.cc
+++ b/paludis/repositories/unpackaged/installed_repository_TEST.cc
@@ -18,7 +18,7 @@
*/
#include <paludis/repositories/unpackaged/unpackaged_repository.hh>
-#include <paludis/repositories/unpackaged/installed_unpackaged_repository.hh>
+#include <paludis/repositories/unpackaged/installed_repository.hh>
#include <paludis/environments/test/test_environment.hh>
#include <paludis/package_database.hh>
#include <paludis/query.hh>
@@ -91,8 +91,8 @@ namespace test_cases
RepositoryName("installed-unpackaged"),
unpackaged_repositories::InstalledUnpackagedRepositoryParams::create()
.environment(&env)
- .location(FSEntry("installed_unpackaged_repository_TEST_dir/repo1"))
- .root(FSEntry("installed_unpackaged_repository_TEST_dir/root"))
+ .location(FSEntry("installed_repository_TEST_dir/repo1"))
+ .root(FSEntry("installed_repository_TEST_dir/root"))
));
env.package_database()->add_repository(1, repo);
@@ -114,8 +114,8 @@ namespace test_cases
RepositoryName("installed-unpackaged"),
unpackaged_repositories::InstalledUnpackagedRepositoryParams::create()
.environment(&env)
- .location(FSEntry("installed_unpackaged_repository_TEST_dir/repo1"))
- .root(FSEntry("installed_unpackaged_repository_TEST_dir/root"))
+ .location(FSEntry("installed_repository_TEST_dir/repo1"))
+ .root(FSEntry("installed_repository_TEST_dir/root"))
));
env.package_database()->add_repository(1, repo);
@@ -129,7 +129,7 @@ namespace test_cases
TEST_CHECK_EQUAL(id1->repository()->name(), RepositoryName("installed-unpackaged"));
TEST_CHECK(id1->fs_location_key());
TEST_CHECK_EQUAL(id1->fs_location_key()->value(),
- FSEntry::cwd() / "installed_unpackaged_repository_TEST_dir/repo1/data/giant-space-weasel/1:0:foo/");
+ FSEntry::cwd() / "installed_repository_TEST_dir/repo1/data/giant-space-weasel/1:0:foo/");
TEST_CHECK(id1->contents_key());
ContentsDumper d1;
@@ -147,7 +147,7 @@ namespace test_cases
TEST_CHECK_EQUAL(id2->repository()->name(), RepositoryName("installed-unpackaged"));
TEST_CHECK(id2->fs_location_key());
TEST_CHECK_EQUAL(id2->fs_location_key()->value(),
- FSEntry::cwd() / "installed_unpackaged_repository_TEST_dir/repo1/data/giant-space-weasel/2:1:bar/");
+ FSEntry::cwd() / "installed_repository_TEST_dir/repo1/data/giant-space-weasel/2:1:bar/");
TEST_CHECK(id2->contents_key());
ContentsDumper d2;
@@ -168,8 +168,8 @@ namespace test_cases
RepositoryName("installed-unpackaged"),
unpackaged_repositories::InstalledUnpackagedRepositoryParams::create()
.environment(&env)
- .location(FSEntry("installed_unpackaged_repository_TEST_dir/repo1"))
- .root(FSEntry("installed_unpackaged_repository_TEST_dir/root"))
+ .location(FSEntry("installed_repository_TEST_dir/repo1"))
+ .root(FSEntry("installed_repository_TEST_dir/root"))
));
env.package_database()->add_repository(1, repo);
@@ -198,8 +198,8 @@ namespace test_cases
RepositoryName("installed-unpackaged"),
unpackaged_repositories::InstalledUnpackagedRepositoryParams::create()
.environment(&env)
- .location(FSEntry("installed_unpackaged_repository_TEST_dir/repo1"))
- .root(FSEntry("installed_unpackaged_repository_TEST_dir/root"))
+ .location(FSEntry("installed_repository_TEST_dir/repo1"))
+ .root(FSEntry("installed_repository_TEST_dir/root"))
));
env.package_database()->add_repository(1, repo);
@@ -235,8 +235,8 @@ namespace test_cases
RepositoryName("installed-unpackaged"),
unpackaged_repositories::InstalledUnpackagedRepositoryParams::create()
.environment(&env)
- .location(FSEntry("installed_unpackaged_repository_TEST_dir/repo2"))
- .root(FSEntry("installed_unpackaged_repository_TEST_dir/root2"))
+ .location(FSEntry("installed_repository_TEST_dir/repo2"))
+ .root(FSEntry("installed_repository_TEST_dir/root2"))
));
env.package_database()->add_repository(1, repo);
@@ -245,11 +245,11 @@ namespace test_cases
TEST_CHECK_EQUAL(join(indirect_iterator(pre_ids->begin()), indirect_iterator(pre_ids->end()), " "),
"cat-one/foo-1.2.3:fred::installed-unpackaged");
- TEST_CHECK(FSEntry("installed_unpackaged_repository_TEST_dir/root2/first").is_regular_file());
- TEST_CHECK(FSEntry("installed_unpackaged_repository_TEST_dir/root2/second").is_regular_file());
+ TEST_CHECK(FSEntry("installed_repository_TEST_dir/root2/first").is_regular_file());
+ TEST_CHECK(FSEntry("installed_repository_TEST_dir/root2/second").is_regular_file());
- TEST_CHECK(FSEntry("installed_unpackaged_repository_TEST_dir/repo2/indices/categories/cat-one/foo").is_symbolic_link());
- TEST_CHECK(FSEntry("installed_unpackaged_repository_TEST_dir/repo2/indices/packages/foo/cat-one").is_symbolic_link());
+ TEST_CHECK(FSEntry("installed_repository_TEST_dir/repo2/indices/categories/cat-one/foo").is_symbolic_link());
+ TEST_CHECK(FSEntry("installed_repository_TEST_dir/repo2/indices/packages/foo/cat-one").is_symbolic_link());
const tr1::shared_ptr<const PackageID> id(
*env.package_database()->query(query::All(), qo_require_exactly_one)->begin());
@@ -259,11 +259,11 @@ namespace test_cases
);
id->perform_action(action);
- TEST_CHECK(! FSEntry("installed_unpackaged_repository_TEST_dir/root2/first").exists());
- TEST_CHECK(FSEntry("installed_unpackaged_repository_TEST_dir/root2/second").is_regular_file());
+ TEST_CHECK(! FSEntry("installed_repository_TEST_dir/root2/first").exists());
+ TEST_CHECK(FSEntry("installed_repository_TEST_dir/root2/second").is_regular_file());
- TEST_CHECK(! FSEntry("installed_unpackaged_repository_TEST_dir/repo2/indices/categories/cat-one/foo").is_symbolic_link());
- TEST_CHECK(! FSEntry("installed_unpackaged_repository_TEST_dir/repo2/indices/packages/foo/cat-one").is_symbolic_link());
+ TEST_CHECK(! FSEntry("installed_repository_TEST_dir/repo2/indices/categories/cat-one/foo").is_symbolic_link());
+ TEST_CHECK(! FSEntry("installed_repository_TEST_dir/repo2/indices/packages/foo/cat-one").is_symbolic_link());
repo->invalidate();
@@ -290,8 +290,8 @@ namespace test_cases
RepositoryName("installed-unpackaged"),
unpackaged_repositories::InstalledUnpackagedRepositoryParams::create()
.environment(&env)
- .location(FSEntry("installed_unpackaged_repository_TEST_dir/repo3"))
- .root(FSEntry("installed_unpackaged_repository_TEST_dir/root3"))
+ .location(FSEntry("installed_repository_TEST_dir/repo3"))
+ .root(FSEntry("installed_repository_TEST_dir/root3"))
));
env.package_database()->add_repository(1, repo);
@@ -300,8 +300,8 @@ namespace test_cases
TEST_CHECK_EQUAL(join(indirect_iterator(pre_ids->begin()), indirect_iterator(pre_ids->end()), " "),
"cat-one/foo-1.2.3:fred::installed-unpackaged cat-one/foo-3.2.1:barney::installed-unpackaged");
- TEST_CHECK(FSEntry("installed_unpackaged_repository_TEST_dir/repo3/indices/categories/cat-one/foo").is_symbolic_link());
- TEST_CHECK(FSEntry("installed_unpackaged_repository_TEST_dir/repo3/indices/packages/foo/cat-one").is_symbolic_link());
+ TEST_CHECK(FSEntry("installed_repository_TEST_dir/repo3/indices/categories/cat-one/foo").is_symbolic_link());
+ TEST_CHECK(FSEntry("installed_repository_TEST_dir/repo3/indices/packages/foo/cat-one").is_symbolic_link());
const tr1::shared_ptr<const PackageID> id(
*env.package_database()->query(query::Matches(PackageDepSpec("cat-one/foo:fred", pds_pm_unspecific)),
@@ -312,8 +312,8 @@ namespace test_cases
);
id->perform_action(action);
- TEST_CHECK(FSEntry("installed_unpackaged_repository_TEST_dir/repo3/indices/categories/cat-one/foo").is_symbolic_link());
- TEST_CHECK(FSEntry("installed_unpackaged_repository_TEST_dir/repo3/indices/packages/foo/cat-one").is_symbolic_link());
+ TEST_CHECK(FSEntry("installed_repository_TEST_dir/repo3/indices/categories/cat-one/foo").is_symbolic_link());
+ TEST_CHECK(FSEntry("installed_repository_TEST_dir/repo3/indices/packages/foo/cat-one").is_symbolic_link());
repo->invalidate();
@@ -343,8 +343,8 @@ namespace test_cases
RepositoryName("installed-unpackaged"),
unpackaged_repositories::InstalledUnpackagedRepositoryParams::create()
.environment(&env)
- .location(FSEntry("installed_unpackaged_repository_TEST_dir/repo4"))
- .root(FSEntry("installed_unpackaged_repository_TEST_dir/root4"))
+ .location(FSEntry("installed_repository_TEST_dir/repo4"))
+ .root(FSEntry("installed_repository_TEST_dir/root4"))
));
env.package_database()->add_repository(1, repo);
@@ -352,7 +352,7 @@ namespace test_cases
env.package_database()->query(query::All(), qo_order_by_version));
TEST_CHECK_EQUAL(join(indirect_iterator(pre_ids->begin()), indirect_iterator(pre_ids->end()), " "), "");
- TEST_CHECK(! FSEntry("installed_unpackaged_repository_TEST_dir/root4/dir").exists());
+ TEST_CHECK(! FSEntry("installed_repository_TEST_dir/root4/dir").exists());
}
{
@@ -363,8 +363,8 @@ namespace test_cases
RepositoryName("installed-unpackaged"),
unpackaged_repositories::InstalledUnpackagedRepositoryParams::create()
.environment(&env)
- .location(FSEntry("installed_unpackaged_repository_TEST_dir/repo4"))
- .root(FSEntry("installed_unpackaged_repository_TEST_dir/root4"))
+ .location(FSEntry("installed_repository_TEST_dir/repo4"))
+ .root(FSEntry("installed_repository_TEST_dir/root4"))
));
env.package_database()->add_repository(0, repo);
@@ -375,7 +375,7 @@ namespace test_cases
.name(QualifiedPackageName("cat/pkg4a"))
.version(VersionSpec("1.0"))
.slot(SlotName("foo"))
- .location(FSEntry("installed_unpackaged_repository_TEST_dir/src4a"))
+ .location(FSEntry("installed_repository_TEST_dir/src4a"))
));
env.package_database()->add_repository(1, source_repo);
@@ -385,7 +385,7 @@ namespace test_cases
TEST_CHECK_EQUAL(join(indirect_iterator(pre_ids->begin()), indirect_iterator(pre_ids->end()), " "), "");
}
- TEST_CHECK(! FSEntry("installed_unpackaged_repository_TEST_dir/root4/dir").exists());
+ TEST_CHECK(! FSEntry("installed_repository_TEST_dir/root4/dir").exists());
InstallAction action(InstallActionOptions::create()
.destination(repo)
@@ -395,8 +395,8 @@ namespace test_cases
(*env.package_database()->query(query::Repository(RepositoryName("unpackaged")),
qo_require_exactly_one)->begin())->perform_action(action);
- TEST_CHECK(FSEntry("installed_unpackaged_repository_TEST_dir/root4/dir").is_directory());
- TEST_CHECK(FSEntry("installed_unpackaged_repository_TEST_dir/root4/dir/4a").is_regular_file());
+ TEST_CHECK(FSEntry("installed_repository_TEST_dir/root4/dir").is_directory());
+ TEST_CHECK(FSEntry("installed_repository_TEST_dir/root4/dir/4a").is_regular_file());
repo->invalidate();
{
@@ -415,8 +415,8 @@ namespace test_cases
RepositoryName("installed-unpackaged"),
unpackaged_repositories::InstalledUnpackagedRepositoryParams::create()
.environment(&env)
- .location(FSEntry("installed_unpackaged_repository_TEST_dir/repo4"))
- .root(FSEntry("installed_unpackaged_repository_TEST_dir/root4"))
+ .location(FSEntry("installed_repository_TEST_dir/repo4"))
+ .root(FSEntry("installed_repository_TEST_dir/root4"))
));
env.package_database()->add_repository(0, repo);
@@ -427,7 +427,7 @@ namespace test_cases
.name(QualifiedPackageName("cat/pkg4b"))
.version(VersionSpec("1.0"))
.slot(SlotName("foo"))
- .location(FSEntry("installed_unpackaged_repository_TEST_dir/src4b1"))
+ .location(FSEntry("installed_repository_TEST_dir/src4b1"))
));
env.package_database()->add_repository(1, source_repo);
@@ -446,11 +446,11 @@ namespace test_cases
(*env.package_database()->query(query::Repository(RepositoryName("unpackaged")),
qo_require_exactly_one)->begin())->perform_action(action);
- TEST_CHECK(FSEntry("installed_unpackaged_repository_TEST_dir/root4/dir").is_directory());
- TEST_CHECK(FSEntry("installed_unpackaged_repository_TEST_dir/root4/dir/4a").is_regular_file());
- TEST_CHECK(FSEntry("installed_unpackaged_repository_TEST_dir/root4/dir/4b").is_regular_file());
- TEST_CHECK(FSEntry("installed_unpackaged_repository_TEST_dir/root4/dir/4b1").is_regular_file());
- TEST_CHECK(! FSEntry("installed_unpackaged_repository_TEST_dir/root4/dir/4b2").is_regular_file());
+ TEST_CHECK(FSEntry("installed_repository_TEST_dir/root4/dir").is_directory());
+ TEST_CHECK(FSEntry("installed_repository_TEST_dir/root4/dir/4a").is_regular_file());
+ TEST_CHECK(FSEntry("installed_repository_TEST_dir/root4/dir/4b").is_regular_file());
+ TEST_CHECK(FSEntry("installed_repository_TEST_dir/root4/dir/4b1").is_regular_file());
+ TEST_CHECK(! FSEntry("installed_repository_TEST_dir/root4/dir/4b2").is_regular_file());
repo->invalidate();
{
@@ -469,8 +469,8 @@ namespace test_cases
RepositoryName("installed-unpackaged"),
unpackaged_repositories::InstalledUnpackagedRepositoryParams::create()
.environment(&env)
- .location(FSEntry("installed_unpackaged_repository_TEST_dir/repo4"))
- .root(FSEntry("installed_unpackaged_repository_TEST_dir/root4"))
+ .location(FSEntry("installed_repository_TEST_dir/repo4"))
+ .root(FSEntry("installed_repository_TEST_dir/root4"))
));
env.package_database()->add_repository(0, repo);
@@ -481,7 +481,7 @@ namespace test_cases
.name(QualifiedPackageName("cat/pkg4b"))
.version(VersionSpec("1.0"))
.slot(SlotName("foo"))
- .location(FSEntry("installed_unpackaged_repository_TEST_dir/src4b2"))
+ .location(FSEntry("installed_repository_TEST_dir/src4b2"))
));
env.package_database()->add_repository(1, source_repo);
@@ -500,11 +500,11 @@ namespace test_cases
(*env.package_database()->query(query::Repository(RepositoryName("unpackaged")),
qo_require_exactly_one)->begin())->perform_action(action);
- TEST_CHECK(FSEntry("installed_unpackaged_repository_TEST_dir/root4/dir").is_directory());
- TEST_CHECK(FSEntry("installed_unpackaged_repository_TEST_dir/root4/dir/4a").is_regular_file());
- TEST_CHECK(FSEntry("installed_unpackaged_repository_TEST_dir/root4/dir/4b").is_regular_file());
- TEST_CHECK(! FSEntry("installed_unpackaged_repository_TEST_dir/root4/dir/4b1").is_regular_file());
- TEST_CHECK(FSEntry("installed_unpackaged_repository_TEST_dir/root4/dir/4b2").is_regular_file());
+ TEST_CHECK(FSEntry("installed_repository_TEST_dir/root4/dir").is_directory());
+ TEST_CHECK(FSEntry("installed_repository_TEST_dir/root4/dir/4a").is_regular_file());
+ TEST_CHECK(FSEntry("installed_repository_TEST_dir/root4/dir/4b").is_regular_file());
+ TEST_CHECK(! FSEntry("installed_repository_TEST_dir/root4/dir/4b1").is_regular_file());
+ TEST_CHECK(FSEntry("installed_repository_TEST_dir/root4/dir/4b2").is_regular_file());
repo->invalidate();
{
@@ -523,8 +523,8 @@ namespace test_cases
RepositoryName("installed-unpackaged"),
unpackaged_repositories::InstalledUnpackagedRepositoryParams::create()
.environment(&env)
- .location(FSEntry("installed_unpackaged_repository_TEST_dir/repo4"))
- .root(FSEntry("installed_unpackaged_repository_TEST_dir/root4"))
+ .location(FSEntry("installed_repository_TEST_dir/repo4"))
+ .root(FSEntry("installed_repository_TEST_dir/root4"))
));
env.package_database()->add_repository(0, repo);
@@ -540,11 +540,11 @@ namespace test_cases
(*env.package_database()->query(query::Matches(PackageDepSpec("cat/pkg4a", pds_pm_unspecific)),
qo_require_exactly_one)->begin())->perform_action(action);
- TEST_CHECK(FSEntry("installed_unpackaged_repository_TEST_dir/root4/dir").is_directory());
- TEST_CHECK(! FSEntry("installed_unpackaged_repository_TEST_dir/root4/dir/4a").is_regular_file());
- TEST_CHECK(FSEntry("installed_unpackaged_repository_TEST_dir/root4/dir/4b").is_regular_file());
- TEST_CHECK(! FSEntry("installed_unpackaged_repository_TEST_dir/root4/dir/4b1").is_regular_file());
- TEST_CHECK(FSEntry("installed_unpackaged_repository_TEST_dir/root4/dir/4b2").is_regular_file());
+ TEST_CHECK(FSEntry("installed_repository_TEST_dir/root4/dir").is_directory());
+ TEST_CHECK(! FSEntry("installed_repository_TEST_dir/root4/dir/4a").is_regular_file());
+ TEST_CHECK(FSEntry("installed_repository_TEST_dir/root4/dir/4b").is_regular_file());
+ TEST_CHECK(! FSEntry("installed_repository_TEST_dir/root4/dir/4b1").is_regular_file());
+ TEST_CHECK(FSEntry("installed_repository_TEST_dir/root4/dir/4b2").is_regular_file());
repo->invalidate();
{
@@ -563,8 +563,8 @@ namespace test_cases
RepositoryName("installed-unpackaged"),
unpackaged_repositories::InstalledUnpackagedRepositoryParams::create()
.environment(&env)
- .location(FSEntry("installed_unpackaged_repository_TEST_dir/repo4"))
- .root(FSEntry("installed_unpackaged_repository_TEST_dir/root4"))
+ .location(FSEntry("installed_repository_TEST_dir/repo4"))
+ .root(FSEntry("installed_repository_TEST_dir/root4"))
));
env.package_database()->add_repository(0, repo);
@@ -580,7 +580,7 @@ namespace test_cases
(*env.package_database()->query(query::Matches(PackageDepSpec("cat/pkg4b", pds_pm_unspecific)),
qo_require_exactly_one)->begin())->perform_action(action);
- TEST_CHECK(! FSEntry("installed_unpackaged_repository_TEST_dir/root4/dir").is_directory());
+ TEST_CHECK(! FSEntry("installed_repository_TEST_dir/root4/dir").is_directory());
repo->invalidate();
{
diff --git a/paludis/repositories/unpackaged/installed_repository_TEST_cleanup.sh b/paludis/repositories/unpackaged/installed_repository_TEST_cleanup.sh
new file mode 100755
index 0000000..66e79f3
--- /dev/null
+++ b/paludis/repositories/unpackaged/installed_repository_TEST_cleanup.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+# vim: set ft=sh sw=4 sts=4 et :
+
+if [ -d installed_repository_TEST_dir ] ; then
+ rm -fr installed_repository_TEST_dir
+else
+ true
+fi
+
diff --git a/paludis/repositories/unpackaged/installed_unpackaged_repository_TEST_setup.sh b/paludis/repositories/unpackaged/installed_repository_TEST_setup.sh
index 0b635c6..1c8c958 100755
--- a/paludis/repositories/unpackaged/installed_unpackaged_repository_TEST_setup.sh
+++ b/paludis/repositories/unpackaged/installed_repository_TEST_setup.sh
@@ -1,8 +1,8 @@
#!/bin/bash
# vim: set ft=sh sw=4 sts=4 et :
-mkdir installed_unpackaged_repository_TEST_dir || exit 1
-cd installed_unpackaged_repository_TEST_dir || exit 1
+mkdir installed_repository_TEST_dir || exit 1
+cd installed_repository_TEST_dir || exit 1
mkdir -p root
mkdir -p repo1/indices/{categories/cat-one,packages/foo}
diff --git a/paludis/repositories/unpackaged/installed_unpackaged_repository_TEST_cleanup.sh b/paludis/repositories/unpackaged/installed_unpackaged_repository_TEST_cleanup.sh
deleted file mode 100755
index 2063661..0000000
--- a/paludis/repositories/unpackaged/installed_unpackaged_repository_TEST_cleanup.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-# vim: set ft=sh sw=4 sts=4 et :
-
-if [ -d installed_unpackaged_repository_TEST_dir ] ; then
- rm -fr installed_unpackaged_repository_TEST_dir
-else
- true
-fi
-
diff --git a/paludis/repositories/unpackaged/registration.cc b/paludis/repositories/unpackaged/registration.cc
index aa5149c..02cbf61 100644
--- a/paludis/repositories/unpackaged/registration.cc
+++ b/paludis/repositories/unpackaged/registration.cc
@@ -20,7 +20,7 @@
#include <paludis/repository_maker.hh>
#include <paludis/util/attributes.hh>
#include <paludis/util/make_shared_ptr.hh>
-#include <paludis/repositories/unpackaged/installed_unpackaged_repository.hh>
+#include <paludis/repositories/unpackaged/installed_repository.hh>
#include <paludis/repositories/unpackaged/unpackaged_repository.hh>
#include <paludis/repositories/unpackaged/exceptions.hh>
#include <libwrapiter/libwrapiter_forward_iterator.hh>
diff --git a/paludis/repositories/unpackaged/unpackaged_repository_TEST.cc b/paludis/repositories/unpackaged/unpackaged_repository_TEST.cc
index f05dfcb..69fc00b 100644
--- a/paludis/repositories/unpackaged/unpackaged_repository_TEST.cc
+++ b/paludis/repositories/unpackaged/unpackaged_repository_TEST.cc
@@ -18,7 +18,7 @@
*/
#include <paludis/repositories/unpackaged/unpackaged_repository.hh>
-#include <paludis/repositories/unpackaged/installed_unpackaged_repository.hh>
+#include <paludis/repositories/unpackaged/installed_repository.hh>
#include <paludis/environments/test/test_environment.hh>
#include <paludis/package_database.hh>
#include <paludis/query.hh>