From: Joey Hess <joey@kitenet.net>
Date: Sun, 31 Aug 2014 20:20:22 +0000 (-0700)
Subject: Deal with abs_path change in new version of perl, now it returns undefined when the... 
X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/de3c4524d954e1ebc3081675790f4624496523da?hp=0b8d4ccc789964c4ebff3c64ee1cb9c1d0afd249

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

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 9a73e8d..fbec969 100644
--- 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 a7295f0..be7e4e5 100755
--- 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;
 		}