# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1151326158 -7200
# Node ID 1e2ec4fd16df58d2d7836fc3df0e51acacd9aab3
# Parent  976b6b2a1613432ebe7298a6fabd3c9354625334
Fix ui.expandpath problem and broken test introduced by 4a2a4d988ead.

diff --git a/mercurial/ui.py b/mercurial/ui.py
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -205,7 +205,7 @@ class ui(object):
         path = self.config("paths", loc)
         if not path and default is not None:
             path = self.config("paths", default)
-        return path
+        return path or loc
 
     def write(self, *args):
         if self.header: