aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-07-25 17:45:30 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-07-25 17:45:30 +0000
commit537dc5558eae78bf025237849ce44132d2c55cea (patch)
tree6cdd385eed62129b4cb2d1d8a4ec4a8be77500b9
parentb64b94e1c003d681efbc599c20fbd8e20f375a9b (diff)
downloadpaludis-537dc5558eae78bf025237849ce44132d2c55cea.tar.gz
paludis-537dc5558eae78bf025237849ce44132d2c55cea.tar.xz
qa tweaks
-rw-r--r--paludis/repositories/e/qa/stray_files.cc27
-rwxr-xr-xruby/repository_TEST_setup.sh2
2 files changed, 19 insertions, 10 deletions
diff --git a/paludis/repositories/e/qa/stray_files.cc b/paludis/repositories/e/qa/stray_files.cc
index 1e4d2ae..1fe925b 100644
--- a/paludis/repositories/e/qa/stray_files.cc
+++ b/paludis/repositories/e/qa/stray_files.cc
@@ -22,6 +22,7 @@
#include <paludis/util/fs_entry.hh>
#include <paludis/util/dir_iterator.hh>
#include <paludis/util/stringify.hh>
+#include <paludis/util/is_file_with_extension.hh>
using namespace paludis;
using namespace paludis::erepository;
@@ -48,15 +49,19 @@ paludis::erepository::is_stray_at_tree_dir(
const FSEntry & d)
{
if (d.is_directory_or_symlink_to_directory())
- {
return false;
- }
- else if (d.is_regular_file_or_symlink_to_regular_file())
+
+ if (d.is_regular_file_or_symlink_to_regular_file())
{
+ if (d.basename() == "header.txt")
+ return false;
+ if (is_file_with_prefix_extension(d, "skel.", "", IsFileWithOptions()))
+ return false;
+
return true;
}
- else
- return true;
+
+ return true;
}
bool
@@ -65,14 +70,16 @@ paludis::erepository::is_stray_at_category_dir(
const FSEntry & d)
{
if (d.is_directory_or_symlink_to_directory())
- {
return false;
- }
- else if (d.is_regular_file_or_symlink_to_regular_file())
+
+ if (d.is_regular_file_or_symlink_to_regular_file())
{
+ if (d.basename() == "metadata.xml")
+ return false;
+
return true;
}
- else
- return true;
+
+ return true;
}
diff --git a/ruby/repository_TEST_setup.sh b/ruby/repository_TEST_setup.sh
index 121229c..c006420 100755
--- a/ruby/repository_TEST_setup.sh
+++ b/ruby/repository_TEST_setup.sh
@@ -38,6 +38,8 @@ END
mkdir -p testrepo/{eclass,distfiles,profiles/testprofile,foo/bar/files} || exit 1
cd testrepo || exit 1
+echo "stray" > stray
+
echo "testrepo" > profiles/repo_name || exit 1
cat <<END > profiles/categories || exit 1
foo