From c1dcf3b12df00659121bcfb7718297f2a578661f Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Fri, 25 Feb 2011 12:42:17 +0800
Subject: Bug 621925: Avoid 'used only once' warning when loading extensions
 r=mkanat, a=mkanat

---
 Bugzilla/Install/Util.pm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'Bugzilla/Install')

diff --git a/Bugzilla/Install/Util.pm b/Bugzilla/Install/Util.pm
index ef71f5b75..c8d3d8eb4 100644
--- a/Bugzilla/Install/Util.pm
+++ b/Bugzilla/Install/Util.pm
@@ -222,8 +222,14 @@ sub extension_package_directory {
     my ($invocant, $file) = @_;
     my $class = ref($invocant) || $invocant;
 
+    # $file is set on the first invocation, store the value in the extension's
+    # package for retrieval on subsequent calls
     my $var;
-    { no strict 'refs'; $var = \${"${class}::EXTENSION_PACKAGE_DIR"}; }
+    {
+        no warnings 'once';
+        no strict 'refs';
+        $var = \${"${class}::EXTENSION_PACKAGE_DIR"};
+    }
     if ($file) {
         $$var = dirname($file);
     }
-- 
cgit v1.2.3-24-g4f1b