[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

wsiegrist at apple.com wsiegrist at apple.com
Wed Dec 22 12:38:42 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 19faba41c215f9e7b15e0bc1f1a044f6f0f8fe93
Author: wsiegrist at apple.com <wsiegrist at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 26 15:51:28 2010 +0000

    2010-08-26 William Siegrist <wsiegrist at apple.com>
    
    Fix PATH for PrettyPatch so it can find git.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66104 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/BugsSite/attachment.cgi b/BugsSite/attachment.cgi
index ef2b477..07800d3 100755
--- a/BugsSite/attachment.cgi
+++ b/BugsSite/attachment.cgi
@@ -392,7 +392,10 @@ sub prettyPatch
     print $cgi->header(-type => 'text/html',
                        -expires => '+3M');
 
+    my $orig_path = $ENV{'PATH'};
+    $ENV{'PATH'} = "/opt/local/bin:" . $ENV{'PATH'};
     open2(\*OUT, \*IN, "/usr/bin/ruby", "-I", "PrettyPatch", "PrettyPatch/prettify.rb", "--html-exceptions");
+    $ENV{'PATH'} = $orig_path;
     print IN $attachment->data . "\n";
     close(IN);
     while (<OUT>) {
diff --git a/BugsSite/contrib/cmdline/makequery b/BugsSite/contrib/cmdline/makequery
index b34efb8..79c19b1 100755
--- a/BugsSite/contrib/cmdline/makequery
+++ b/BugsSite/contrib/cmdline/makequery
@@ -21,7 +21,7 @@
 
 conf="`dirname $0`/query.conf"
 
-query="https://bugzilla.mozilla.org/buglist.cgi?ctype=csv"
+query="https://bugs.webkit.org/buglist.cgi?ctype=csv"
 
 chart=0
 and=0
diff --git a/BugsSite/mod_perl.pl b/BugsSite/mod_perl.pl
index 6a9bc5c..3bb9b29 100644
--- a/BugsSite/mod_perl.pl
+++ b/BugsSite/mod_perl.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl -wT
+#!/opt/local/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list