Ansgar pushed to branch master at Debian FTP Team / dak
Commits:
3 changed files:
Changes:
... | ... | @@ -19,7 +19,7 @@ Use common-debian-service-https-redirect * ftp-master.debian.org |
19 | 19 | Redirect permanent /git/dakbot.git https://salsa.debian.org/ftp-team/dakbot.git
|
20 | 20 | Redirect permanent /git/presentations.git https://salsa.debian.org/ftp-team/presentations.git
|
21 | 21 | Redirect permanent /git/website.git https://salsa.debian.org/ftp-team/website.git
|
22 | - Redirect permanent /epydoc https://ftp-team.pages.debian.net/dak/epydoc
|
|
22 | + Redirect permanent /epydoc https://ftp-team.pages.debian.net/dak/docs
|
|
23 | 23 | Alias /users/ /srv/ftp.debian.org/web-users/
|
24 | 24 | Alias /static/lintian.tags /srv/ftp-master.debian.org/dak/config/debian/lintian.tags
|
25 | 25 |
... | ... | @@ -452,7 +452,10 @@ def main(): |
452 | 452 | if mode == "list":
|
453 | 453 | list_overrides(suite, component, otype, session)
|
454 | 454 | else:
|
455 | - if get_suite(suite).untouchable and not cnf["Control-Overrides::Options::Force"]:
|
|
455 | + if (
|
|
456 | + get_suite(suite).untouchable
|
|
457 | + and not cnf["Control-Overrides::Options::Force"]
|
|
458 | + ):
|
|
456 | 459 | utils.fubar("%s: suite is untouchable" % suite)
|
457 | 460 | |
458 | 461 | action = True
|
... | ... | @@ -30,27 +30,13 @@ QueryRegister().register_path("/", root_path) |
30 | 30 | def list_paths():
|
31 | 31 | """Returns a list of available paths"""
|
32 | 32 | redirect(
|
33 | - "https://ftp-team.pages.debian.net/dak/epydoc/dakweb-module.html#__package__"
|
|
33 | + "https://ftp-team.pages.debian.net/dak/docs/generated/dakweb.html#module-dakweb"
|
|
34 | 34 | )
|
35 | 35 | |
36 | 36 | |
37 | 37 | QueryRegister().register_path("/list_paths", list_paths)
|
38 | 38 | |
39 | 39 | |
40 | -@bottle.route("/path_help/<path>")
|
|
41 | -def path_help(path=None):
|
|
42 | - """Redirects to the API description containing the path_help"""
|
|
43 | - if path is None:
|
|
44 | - return bottle.HTTPError(503, "Path not specified.")
|
|
45 | - |
|
46 | - redirect(
|
|
47 | - "https://ftp-team.pages.debian.net/dak/epydoc/%s-module.html#%s"
|
|
48 | - % (QueryRegister().get_path_help(path), path)
|
|
49 | - )
|
|
50 | - |
|
51 | - |
|
52 | -QueryRegister().register_path("/path_help", list_paths)
|
|
53 | - |
|
54 | 40 | # Import our other methods
|
55 | 41 | from .queries import archive, binary, changelog, madison, source, suite # noqa: F401
|
56 | 42 |