[paludis-commits] r4064 - in trunk: . paludis

[peper at svn.pioto.org]

Author: peper
Date: 2007-12-06 19:16:40 +0000 (Thu, 06 Dec 2007)
New Revision: 4064

Modified:
   trunk/ChangeLog
   trunk/paludis/merger.cc
Log:
Don't warn when installing empty $ROOT.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-12-04 20:50:50 UTC (rev 4063)
+++ trunk/ChangeLog	2007-12-06 19:16:40 UTC (rev 4064)
@@ -5,6 +5,10 @@
 only listed in SVN log. For a summary of what has changed between releases,
 see the NEWS file. This file is occasionally pruned to ChangeLog.old.bz2.
 
+2007-12-06 Piotr Jaroszyński
+
+	* paludis/merger.cc: Don't warn when installing empty $ROOT.
+
 2007-12-04 David Leverton
 
 	* doc/api/cplusplus/examples/: Fix parallel build (probably).

Modified: trunk/paludis/merger.cc
===================================================================
--- trunk/paludis/merger.cc	2007-12-04 20:50:50 UTC (rev 4063)
+++ trunk/paludis/merger.cc	2007-12-06 19:16:40 UTC (rev 4064)
@@ -154,7 +154,7 @@
 
     DirIterator d(src, false), d_end;
 
-    if (! is_check && d == d_end)
+    if (! is_check && d == d_end && dst != _options.root.realpath())
         Log::get_instance()->message(ll_warning, lc_context) << "Installing empty directory '"
             << stringify(dst) << "'";