* Make registration work when no config file yet exists. Closes: #448422

diff --git a/debian/changelog b/debian/changelog
index 2c7d823b6c04f2cc822e5e05595e4206c2ef513a..9e058259d37a2fdd4fc505dfde385cc9e682b3b5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 mr (0.10) UNRELEASED; urgency=low
 
   * Add a lib file for using unison with mr.
+  * Make registration work when no config file yet exists. Closes: #448422
 
- -- Joey Hess <joeyh@debian.org>  Fri, 26 Oct 2007 03:57:51 -0400
+ -- Joey Hess <joeyh@debian.org>  Sun, 28 Oct 2007 19:54:31 -0400
 
 mr (0.9) unstable; urgency=low
 

diff --git a/mr b/mr
index 67196ca2046ca5b5f7d4acb18d7eafe3c793dbd2..ccc764744b10681e23f569864943069cfda227ed 100755 (executable)
--- a/mr
+++ b/mr
@@ -960,14 +960,19 @@ sub register { #{{{
                # Find the closest known mrconfig file to the current
                # directory.
                $directory.="/" unless $directory=~/\/$/;
+               my $foundconfig=0;
                foreach my $topdir (reverse sort keys %config) {
                        next unless length $topdir;
                        if ($directory=~/^\Q$topdir\E/) {
                                $ENV{MR_CONFIG}=$configfiles{$topdir};
                                $directory=$topdir;
+                               $foundconfig=1;
                                last;
                        }
                }
+               if (! $foundconfig) {
+                       $directory=""; # no config file, use builtin
+               }
        }
        if (@ARGV) {
                my $subdir=shift @ARGV;