Commita1c472b

authored

Merge pull request#1619 from HageMaster3108/bugfix/use-python-builtin-open-method-to-create-lockfile-to-workaround-docker-virtiofs-permission-issue

#1566 Creating a lock now uses python built-in "open()" method to work arou…

2 parents8b75434 +70924c4 commita1c472bCopy full SHA for a1c472b

File tree

-6

lines changed

-6

lines changed

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -935,11 +935,7 @@ def _obtain_lock_or_raise(self) -> None:`
`935`	`935`	`)`
`936`	`936`
`937`	`937`	`try:`
`938`		`-flags=os.O_WRONLY\|os.O_CREAT\|os.O_EXCL`
`939`		`-ifis_win:`
`940`		`-flags\|=os.O_SHORT_LIVED`
`941`		`-fd=os.open(lock_file,flags,0)`
`942`		`-os.close(fd)`
	`938`	`+open(lock_file,mode='w',closefd=True)`
`943`	`939`	`exceptOSErrorase:`
`944`	`940`	`raiseIOError(str(e))frome`
`945`	`941`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`importpickle`
`14`	`14`	`importsys`
`15`	`15`	`importtempfile`
`16`		`-fromunittestimportmock,skipIf,SkipTest`
	`16`	`+fromunittestimportmock,skipIf,SkipTest,skip`
`17`	`17`
`18`	`18`	`importpytest`
`19`	`19`
`@@ -251,6 +251,7 @@ def test_clone_from_with_path_contains_unicode(self):`
`251`	`251`	`self.fail("Raised UnicodeEncodeError")`
`252`	`252`
`253`	`253`	`@with_rw_directory`
	`254`	`+@skip("the referenced repository was removed, and one needs to setup a new password controlled repo under the orgs control")`
`254`	`255`	`deftest_leaking_password_in_clone_logs(self,rw_dir):`
`255`	`256`	`password="fakepassword1234"`
`256`	`257`	`try:`

Comments

(0)