[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit d1502fb2ece707d9b4c3ac7e2a4e82cb9ad070d9
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 22 22:18:43 2009 +0000

    2009-12-22  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Darin Adler.
    
            validate-committer-lists fails when run from an SVN checkout
            https://bugs.webkit.org/show_bug.cgi?id=31974
    
            * Scripts/validate-committer-lists:
             - Make it print a warning message instead of throwing
               an exception when running from an SVN checkout.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52501 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 5805b5f..ea16eaa 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2009-12-22  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Darin Adler.
+
+        validate-committer-lists fails when run from an SVN checkout
+        https://bugs.webkit.org/show_bug.cgi?id=31974
+
+        * Scripts/validate-committer-lists:
+         - Make it print a warning message instead of throwing
+           an exception when running from an SVN checkout.
+
 2009-12-22  Philippe Normand  <pnormand at igalia.com>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/Scripts/validate-committer-lists b/WebKitTools/Scripts/validate-committer-lists
index 05f2b36..b41d9bb 100755
--- a/WebKitTools/Scripts/validate-committer-lists
+++ b/WebKitTools/Scripts/validate-committer-lists
@@ -38,6 +38,7 @@ import urllib2
 from datetime import date, datetime, timedelta
 from modules.committers import CommitterList
 from modules.logging import log, error
+from modules.scm import Git
 
 # WebKit includes a built copy of BeautifulSoup in Scripts/modules
 # so this import should always succeed.
@@ -243,7 +244,14 @@ class CommitterListFromGit:
 def main():
     committer_list = CommitterList()
     CommitterListFromMailingList().check_for_emails_missing_from_list(committer_list)
-
+ 
+    if not Git.in_working_directory("."):
+        print """\n\nWARNING: validate-committer-lists requires a git checkout.
+The following checks are disabled:
+ - List of committers ordered by last commit
+ - List of historical committers missing from committers.py
+"""
+        return 1
     svn_committer_list = CommitterListFromGit()
     svn_committer_list.print_possibly_expired_committers(committer_list)
     svn_committer_list.print_committers_missing_from_committer_list(committer_list)

-- 
WebKit Debian packaging