Commite6f6955

AdamWill

authored and

Conan-Kudo

committed

check_lock: treat 'locked by other' differently to 'not locked'

check_lock currently claims the daemon is locked by another appeven if the problem is actually that it *isn't locked at all*.We should distinguish these two cases.Also, here and in a few other places we refer to this as eithera 'dnf lock' or a 'yum lock'. AFAICT it is not either of thosethings, it is a lock that is internal to the daemon. You canhappily perform operations with dnf *directly* while this lockis held. It's confusing to describe this as a 'dnf lock' whenthat isn't what it is, so this changes the description to'dnfdaemon lock' in a few places.Signed-off-by: Adam Williamson <awilliam@redhat.com>

1 parent5858310 commite6f6955Copy full SHA for e6f6955

File tree

2 files changed

+10

-6

lines changed

daemon
- dnfdaemon-session.py
- dnfdaemon-system.py

2 files changed

+10

-6

lines changed

`‎daemon/dnfdaemon-session.py‎`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ def Exit(self, sender=None):`
`95`	`95`	`sender_keyword='sender')`
`96`	`96`	`defLock(self,sender=None):`
`97`	`97`	`'''`
`98`		`- Get theyum lock`
	`98`	`+ Get thednfdaemon lock`
`99`	`99`	`:param sender:`
`100`	`100`	`'''`
`101`	`101`	`ifnotself._lock:`
`@@ -367,13 +367,15 @@ def working_ended(self, value=None):`
`367`	`367`
`368`	`368`	`defcheck_lock(self,sender):`
`369`	`369`	`'''`
`370`		`- Check that the current sender is owning theyum lock`
	`370`	`+ Check that the current sender is owning thednfdaemon lock`
`371`	`371`	`:param sender:`
`372`	`372`	`'''`
`373`	`373`	`ifself._lock==sender:`
`374`	`374`	`returnTrue`
	`375`	`+elifself._lock:`
	`376`	`+raiseLockedError('dnfdaemon is locked by another application')`
`375`	`377`	`else:`
`376`		`-raiseLockedError('dnf is locked by another application')`
	`378`	`+raiseLockedError('dnfdaemon isnotlocked, but was expected to be')`
`377`	`379`
`378`	`380`
`379`	`381`	`defmain():`

`‎daemon/dnfdaemon-system.py‎`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ def Exit(self, sender=None):`
`104`	`104`	`sender_keyword='sender')`
`105`	`105`	`defLock(self,sender=None):`
`106`	`106`	`"""`
`107`		`- Get theyum lock`
	`107`	`+ Get thednfdaemon lock`
`108`	`108`	`:param sender:`
`109`	`109`	`"""`
`110`	`110`	`self.check_permission_read(sender)`
`@@ -699,13 +699,15 @@ def working_ended(self, value=None):`
`699`	`699`
`700`	`700`	`defcheck_lock(self,sender):`
`701`	`701`	`"""`
`702`		`- Check that the current sender is owning thednf lock`
	`702`	`+ Check that the current sender is owning thednfdaemon lock`
`703`	`703`	`:param sender:`
`704`	`704`	`"""`
`705`	`705`	`ifself._lock==sender:`
`706`	`706`	`returnTrue`
	`707`	`+elifself._lock:`
	`708`	`+raiseLockedError('dnfdaemon is locked by another application')`
`707`	`709`	`else:`
`708`		`-raiseLockedError('dnf is locked by another application')`
	`710`	`+raiseLockedError('dnfdaemon isnotlocked, but was expected to be')`
`709`	`711`
`710`	`712`	`defcheck_permission_write(self,sender):`
`711`	`713`	`""" Check for senders permission to update system packages"""`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commite6f6955

File tree

2 files changed

2 files changed

`‎daemon/dnfdaemon-session.py‎`

`‎daemon/dnfdaemon-system.py‎`

0 commit comments