aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rwxr-xr-x.ci/local/test.sh2
-rw-r--r--cgitize/cgit.py4
-rw-r--r--cgitize/config.py4
-rw-r--r--cgitize/main.py2
-rw-r--r--examples/cgitize.toml2
5 files changed, 7 insertions, 7 deletions
diff --git a/.ci/local/test.sh b/.ci/local/test.sh
index e78a4be..088539b 100755
--- a/.ci/local/test.sh
+++ b/.ci/local/test.sh
@@ -71,7 +71,7 @@ setup_cgitize_toml() {
mkdir -p -- "$conf_dir"
cat <<EOF | tee "$cgitize_toml_path"
-output = "$output_dir"
+output_dir = "$output_dir"
[repositories.test_repo]
name = "test_repo"
diff --git a/cgitize/cgit.py b/cgitize/cgit.py
index 53a726a..418f0c6 100644
--- a/cgitize/cgit.py
+++ b/cgitize/cgit.py
@@ -84,8 +84,8 @@ class AgeFile:
class CGitRepositories:
- def __init__(self, dir, cgit_server, force=False):
- self.dir = self._make_dir(dir)
+ def __init__(self, output_dir, cgit_server, force=False):
+ self.dir = self._make_dir(output_dir)
self.cgitrc = CGitRCWriter(cgit_server)
self.force = force
diff --git a/cgitize/config.py b/cgitize/config.py
index 8a68906..c207597 100644
--- a/cgitize/config.py
+++ b/cgitize/config.py
@@ -38,8 +38,8 @@ class MainSection(Section):
DEFAULT_OUTPUT_DIR = '/var/tmp/cgitize/output'
@property
- def output(self):
- return self._get_config_path('output', default=MainSection.DEFAULT_OUTPUT_DIR)
+ def output_dir(self):
+ return self._get_config_path('output_dir', default=MainSection.DEFAULT_OUTPUT_DIR)
@property
def clone_url(self):
diff --git a/cgitize/main.py b/cgitize/main.py
index e7d2dfd..9497cad 100644
--- a/cgitize/main.py
+++ b/cgitize/main.py
@@ -34,7 +34,7 @@ def main(args=None):
with setup_logging(args.verbose):
config = Config.read(args.config)
cgit_server = CGitServer(config.main.clone_url)
- output = CGitRepositories(config.main.output, cgit_server, force=args.force)
+ output = CGitRepositories(config.main.output_dir, cgit_server, force=args.force)
success = True
for repo in config.parse_repositories():
if args.repos is None or repo.repo_id in args.repos:
diff --git a/examples/cgitize.toml b/examples/cgitize.toml
index fcf6b92..9b55d26 100644
--- a/examples/cgitize.toml
+++ b/examples/cgitize.toml
@@ -1,7 +1,7 @@
# All settings are optional.
# /var/tmp/cgitize/output by default.
-output = "/tmp/cgitize"
+output_dir = "/tmp/cgitize"
# URL to clone from the output directory. {name} is replaced by the repository
# ID.