Commit3808311

committed

rsync: fix SyntaxWarning when using Python 3.14

Thanks-to: Brian Harring <ferringb@gmail.com>Resolves:#448Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>

1 parentc9cfe2a commit3808311Copy full SHA for 3808311

File tree

+17

-17

lines changed

+17

-17

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@ pkgcore 0.12.31 (????-??-??)`
`11`	`11`
`12`	`12`	`- rsync: fix logical bug with negative sync delta (Arthur Zamarin)`
`13`	`13`
	`14`	`+- rsync: fix SyntaxWarning when using Python 3.14 (Arthur Zamarin, #448)`
	`15`	`+`
`14`	`16`	`----------------------------`
`15`	`17`	`pkgcore 0.12.30 (2025-06-02)`
`16`	`18`	`----------------------------`

Lines changed: 15 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -228,22 +228,20 @@ def _sync(self, verbosity, force=False):`
`228`	`228`	`# force a reset of the timestamp`
`229`	`229`	`self.last_timestamp=self.current_timestamp()`
`230`	`230`	`finally:`
`231`		`-ifret:`
`232`		`-returnret`
`233`		`-# ensure the timestamp is back to the old`
`234`		`-try:`
`235`		`-timestamp_path=pjoin(self.basedir,"metadata","timestamp.chk")`
`236`		`-ifself.last_timestampisNone:`
`237`		`-os.remove(timestamp_path)`
`238`		`-else:`
`239`		`-withopen(timestamp_path,"w")asf:`
`240`		`-f.write(`
`241`		`-time.strftime(`
`242`		`-"%a, %d %b %Y %H:%M:%S +0000",`
`243`		`-time.gmtime(self.last_timestamp),`
	`231`	`+ifnotret:`
	`232`	`+# ensure the timestamp is back to the old`
	`233`	`+try:`
	`234`	`+timestamp_path=pjoin(self.basedir,"metadata","timestamp.chk")`
	`235`	`+ifself.last_timestampisNone:`
	`236`	`+os.remove(timestamp_path)`
	`237`	`+else:`
	`238`	`+withopen(timestamp_path,"w")asf:`
	`239`	`+f.write(`
	`240`	`+time.strftime(`
	`241`	`+"%a, %d %b %Y %H:%M:%S +0000",`
	`242`	`+time.gmtime(self.last_timestamp),`
	`243`	`+)`
`244`	`244`	`)`
`245`		`- )`
`246`		`-exceptEnvironmentError:`
`247`		`-# don't care...`
`248`		`-pass`
	`245`	`+exceptEnvironmentError:`
	`246`	`+pass# don't care...`
`249`	`247`	`returnret`

Comments

(0)