From 02e14506ac57f50b8fe77c79ae72be0403d52b2c Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <guillomovitch@mandriva.org>
Date: Tue, 29 Jan 2008 21:34:54 +0000
Subject: sanitize usage and test of buildroot env var

---
 relink_symlinks | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'relink_symlinks')

diff --git a/relink_symlinks b/relink_symlinks
index 4f8dad4..0150899 100755
--- a/relink_symlinks
+++ b/relink_symlinks
@@ -5,6 +5,12 @@ use strict;
 use warnings;
 use File::Find;
 
+my $buildroot = $ENV{RPM_BUILD_ROOT};
+die "No build root defined" unless $buildroot;
+die "Invalid build root" unless -d $buildroot;
+# normalize build root
+$buildroot =~ s|/$||;
+
 sub relativize {
     return unless -l $_;
 
@@ -13,14 +19,11 @@ sub relativize {
 
     $link =~ s{^/}{};
     my $dirname = $File::Find::dir;
-    $dirname =~ s/^\Q$ENV{RPM_BUILD_ROOT}\E//;
+    $dirname =~ s/^\Q$buildroot\E//;
     $dirname =~ s{/[^/]+}{../}g;
 
     unlink $_;
     symlink $dirname . $link, $_;
 }
 
-die "No build root defined\n" unless $ENV{RPM_BUILD_ROOT};
-
-$ENV{RPM_BUILD_ROOT} =~ s{/$}{};
-find(\&relativize, $ENV{RPM_BUILD_ROOT});
+find(\&relativize, $buildroot);
-- 
cgit v1.2.1