diff options
| author | Robin H. Johnson <robbat2@gentoo.org> | 2007-12-18 01:14:14 -0800 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2007-12-18 01:14:14 -0800 |
| commit | 0ac3f7ff39ef36a90011fbae9ab5392a7d97d093 (patch) | |
| tree | 2a80b4577160eaf9ede4d8d26a004566673e126b | |
| parent | Add more testcases, and add coverage exclusion notations on places where we d... (diff) | |
| download | gitosis-dakkar-0ac3f7ff39ef36a90011fbae9ab5392a7d97d093.tar.gz gitosis-dakkar-0ac3f7ff39ef36a90011fbae9ab5392a7d97d093.tar.bz2 gitosis-dakkar-0ac3f7ff39ef36a90011fbae9ab5392a7d97d093.zip | |
Fix tabs for spaces.
| -rw-r--r-- | gitosis/configutil.py | 4 | ||||
| -rw-r--r-- | gitosis/gitweb.py | 8 | ||||
| -rw-r--r-- | gitosis/init.py | 4 | ||||
| -rw-r--r-- | gitosis/run_hook.py | 2 | ||||
| -rw-r--r-- | gitosis/ssh.py | 8 |
5 files changed, 13 insertions, 13 deletions
diff --git a/gitosis/configutil.py b/gitosis/configutil.py index e067352..799c84b 100644 --- a/gitosis/configutil.py +++ b/gitosis/configutil.py @@ -5,8 +5,8 @@ from ConfigParser import NoSectionError, NoOptionError def getboolean_default(config, section, option, default_value): """ - Return the given section.variable, or return the default if no specific - value is set. + Return the given section.variable, or return the default if no specific + value is set. """ try: value = config.getboolean(section, option) diff --git a/gitosis/gitweb.py b/gitosis/gitweb.py index 271e1bd..25076b1 100644 --- a/gitosis/gitweb.py +++ b/gitosis/gitweb.py @@ -5,18 +5,18 @@ To plug this into ``gitweb``, you have two choices. - The global way, edit ``/etc/gitweb.conf`` to say:: - $projects_list = "/path/to/your/projects.list"; + $projects_list = "/path/to/your/projects.list"; Note that there can be only one such use of gitweb. - The local way, create a new config file:: - do "/etc/gitweb.conf" if -e "/etc/gitweb.conf"; - $projects_list = "/path/to/your/projects.list"; + do "/etc/gitweb.conf" if -e "/etc/gitweb.conf"; + $projects_list = "/path/to/your/projects.list"; # see ``repositories`` in the ``gitosis`` section # of ``~/.gitosis.conf``; usually ``~/repositories`` # but you need to expand the tilde here - $projectroot = "/path/to/your/repositories"; + $projectroot = "/path/to/your/repositories"; Then in your web server, set environment variable ``GITWEB_CONFIG`` to point to this file. diff --git a/gitosis/init.py b/gitosis/init.py index 054bda1..94be4e1 100644 --- a/gitosis/init.py +++ b/gitosis/init.py @@ -111,8 +111,8 @@ class Main(app.App): def read_config(self, options, cfg): """Ignore errors that result from non-existent config file.""" - # Pylint gets it wrong. - # pylint: disable-msg=W0704 + # Pylint gets it wrong. + # pylint: disable-msg=W0704 try: super(Main, self).read_config(options, cfg) except app.ConfigFileDoesNotExistError: diff --git a/gitosis/run_hook.py b/gitosis/run_hook.py index 230eb4f..cc852e8 100644 --- a/gitosis/run_hook.py +++ b/gitosis/run_hook.py @@ -19,7 +19,7 @@ def build_reposistory_data(config): repositories, such as the description, owner, and export marker. Also update the projects.list file as needed to list relevant repositories. - :type config: RawConfigParser + :type config: RawConfigParser """ gitweb.set_descriptions( config=config, diff --git a/gitosis/ssh.py b/gitosis/ssh.py index 0d2d87f..fb15969 100644 --- a/gitosis/ssh.py +++ b/gitosis/ssh.py @@ -46,16 +46,16 @@ def generateAuthorizedKeys(keys): Genarate the lines for the Gitosis ~/.ssh/authorized_keys. """ TEMPLATE = ('command="gitosis-serve %(user)s",no-port-forwarding,' - +'no-X11-forwarding,no-agent-forwarding,no-pty %(key)s') + +'no-X11-forwarding,no-agent-forwarding,no-pty %(key)s') yield COMMENT for (user, key) in keys: yield TEMPLATE % dict(user=user, key=key) _COMMAND_RE = re.compile('^command="(/[^ "]+/)?gitosis-serve [^"]+",' - +'no-port-forwarding,no-X11-forwarding,' - +'no-agent-forwarding,no-pty' - +' .*') + +'no-port-forwarding,no-X11-forwarding,' + +'no-agent-forwarding,no-pty' + +' .*') def filterAuthorizedKeys(fp): """ |