aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-02-04 03:45:22 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2008-02-04 03:45:22 +0000
commit22fff6b52785cdf2f9ba1cccc29ec0c8f8eff3c8 (patch)
tree57474701d7e226413229b550be43aaeaa51f8bc9
parentea7aca0cb35fed42ce247c31770fb009155ad601 (diff)
downloadpaludis-22fff6b52785cdf2f9ba1cccc29ec0c8f8eff3c8.tar.gz
paludis-22fff6b52785cdf2f9ba1cccc29ec0c8f8eff3c8.tar.xz
Don't explode if files/ doesn't exist when generating Manifest.
-rw-r--r--paludis/repositories/e/exheres_layout.cc3
-rw-r--r--paludis/repositories/e/traditional_layout.cc3
2 files changed, 6 insertions, 0 deletions
diff --git a/paludis/repositories/e/exheres_layout.cc b/paludis/repositories/e/exheres_layout.cc
index a7e2ecb..a737ddf 100644
--- a/paludis/repositories/e/exheres_layout.cc
+++ b/paludis/repositories/e/exheres_layout.cc
@@ -537,6 +537,9 @@ namespace
tr1::shared_ptr<Map<FSEntry, std::string> > & m,
const QualifiedPackageName & qpn)
{
+ if (! d.exists())
+ return;
+
std::list<FSEntry> files((DirIterator(d)),
DirIterator());
for (std::list<FSEntry>::iterator f(files.begin()) ;
diff --git a/paludis/repositories/e/traditional_layout.cc b/paludis/repositories/e/traditional_layout.cc
index 9a9b10d..cf06ce9 100644
--- a/paludis/repositories/e/traditional_layout.cc
+++ b/paludis/repositories/e/traditional_layout.cc
@@ -554,6 +554,9 @@ namespace
tr1::shared_ptr<Map<FSEntry, std::string> > & m,
const QualifiedPackageName & qpn)
{
+ if (! d.exists())
+ return;
+
std::list<FSEntry> files((DirIterator(d)),
DirIterator());
for (std::list<FSEntry>::iterator f(files.begin()) ;