Deal with abs_path change in new version of perl, now it returns undefined when the...

This may cause other breakage; I only fixed the case I was seeing, where
a ~/.mrtrust that referred to a directory that does not exist failed.

diff --git a/debian/changelog b/debian/changelog
index 9a73e8d1214087cd32f84860c45ebab449505913..fbec96990d77aca990f334f3aa0e4c4cc5beeac0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+myrepos (1.20140614) UNRELEASED; urgency=medium
+
+  * Deal with abs_path change in new version of perl, now it returns undefined
+    when the directory does not exist.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 31 Aug 2014 13:19:14 -0700
+
 myrepos (1.20140613) unstable; urgency=medium
 
   * Added lib/git-annex. Thanks, martin f krafft.

diff --git a/mr b/mr
index a7295f0d252799156b6d43b951a42056f8a245df..be7e4e5478c5d75ead79b0d4ffa95a8639947a1e 100755 (executable)
--- a/mr
+++ b/mr
@@ -1154,7 +1154,8 @@ sub is_trusted_config {
                        while (<TRUST>) {
                                chomp;
                                s/^~\//$ENV{HOME}\//;
-                               $trusted{abs_path($_)}=1;
+                               my $d=abs_path($_);
+                               $trusted{$d}=1 if defined $d;
                        }
                        close TRUST;
                }