summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-07 22:02:37 +0000
committerkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-07 22:02:37 +0000
commitb81ebe3dcea2d8c3bf512648751f13f155db50ac (patch)
tree5e9ddaf9588dd3c715b6d8ecb0cf367fc866de68
parent4bab3b214e92e0884af87c4ae9287da3daff5f3d (diff)
downloadchromium_src-b81ebe3dcea2d8c3bf512648751f13f155db50ac.zip
chromium_src-b81ebe3dcea2d8c3bf512648751f13f155db50ac.tar.gz
chromium_src-b81ebe3dcea2d8c3bf512648751f13f155db50ac.tar.bz2
* Fix error messaging for http server.
* Fix year for copyright notice. Review URL: http://codereview.chromium.org/16581 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7685 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/app/theme/chromium/BRANDING2
-rw-r--r--webkit/tools/layout_tests/layout_package/http_server.py12
2 files changed, 8 insertions, 6 deletions
diff --git a/chrome/app/theme/chromium/BRANDING b/chrome/app/theme/chromium/BRANDING
index 510c8b5..159e194 100644
--- a/chrome/app/theme/chromium/BRANDING
+++ b/chrome/app/theme/chromium/BRANDING
@@ -2,4 +2,4 @@ COMPANY_FULLNAME=The Chromium Authors
COMPANY_SHORTNAME=The Chromium Authors
PRODUCT_FULLNAME=Chromium
PRODUCT_SHORTNAME=Chromium
-COPYRIGHT=Copyright (C) 2006-2008 The Chromium Authors. All Rights Reserved.
+COPYRIGHT=Copyright (C) 2006-2009 The Chromium Authors. All Rights Reserved.
diff --git a/webkit/tools/layout_tests/layout_package/http_server.py b/webkit/tools/layout_tests/layout_package/http_server.py
index f2c4c76..61bef1c 100644
--- a/webkit/tools/layout_tests/layout_package/http_server.py
+++ b/webkit/tools/layout_tests/layout_package/http_server.py
@@ -222,8 +222,10 @@ if '__main__' == __name__:
else:
if (options.root is None) != (options.port is None):
raise 'Either port or root is missing (need both, or neither)'
- httpd = Lighttpd(tempfile.gettempdir(), port=options.port, root=options.root)
- if 'start' == options.server:
- httpd.Start()
- else:
- httpd.Stop(force=True)
+ httpd = Lighttpd(tempfile.gettempdir(),
+ port=options.port,
+ root=options.root)
+ if 'start' == options.server:
+ httpd.Start()
+ else:
+ httpd.Stop(force=True)