Commit63756df

authored

Merge pull request#30309 from dstansby/improve-redirecter

2 parents1663e9a +ef45c7b commit63756dfCopy full SHA for 63756df

File tree

-2

lines changed

-2

lines changed

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -94,10 +94,15 @@ def run(self):`
`94`	`94`	`domain=self.env.get_domain('redirect_from')`
`95`	`95`	`current_doc=self.env.path2doc(self.state.document.current_source)`
`96`	`96`	`redirected_reldoc,_=self.env.relfn2path(redirected_doc,current_doc)`
`97`		`-ifredirected_reldocindomain.redirects:`
	`97`	`+if (`
	`98`	`+redirected_reldocindomain.redirects`
	`99`	`+anddomain.redirects[redirected_reldoc]!=current_doc`
	`100`	`+ ):`
`98`	`101`	`raiseValueError(`
`99`	`102`	`f"{redirected_reldoc} is already noted as redirecting to "`
`100`		`-f"{domain.redirects[redirected_reldoc]}")`
	`103`	`+f"{domain.redirects[redirected_reldoc]}\n"`
	`104`	`+f"Cannot also redirect it to{current_doc}"`
	`105`	`+ )`
`101`	`106`	`domain.redirects[redirected_reldoc]=current_doc`
`102`	`107`	`return []`
`103`	`108`

Comments

(0)