mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-11-10 06:46:15 +01:00
Code

cleanup status code

Browse Source 
to only call os.path.join once
This commit is contained in:
Bernhard M. Wiedemann 2017-07-24 21:53:10 +02:00 committed by Bernhard M. Wiedemann
parent d34e0ace77
commit 461d83d722
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osc/core.py
View File

@ -1846,9 +1846,10 @@ class Package:
known_by_meta = False known_by_meta = False
exists = False exists = False
exists_in_store = False exists_in_store = False
localfile = os.path.join(self.absdir, n)
if n in self.filenamelist: if n in self.filenamelist:
known_by_meta = True known_by_meta = True
if os.path.exists(os.path.join(self.absdir, n)): if os.path.exists(localfile):
exists = True exists = True
if os.path.exists(os.path.join(self.storedir, n)): if os.path.exists(os.path.join(self.storedir, n)):
exists_in_store = True exists_in_store = True
@ -1864,7 +1865,7 @@ class Package:
elif n in self.to_be_added and exists: elif n in self.to_be_added and exists:
state = 'A' state = 'A'
elif exists and exists_in_store and known_by_meta: elif exists and exists_in_store and known_by_meta:
if dgst(os.path.join(self.absdir, n)) != self.findfilebyname(n).md5: if dgst(localfile) != self.findfilebyname(n).md5:
state = 'M' state = 'M'
else: else:
state = ' ' state = ' '
@ -1882,7 +1883,7 @@ class Package:
'This might be caused by an old wc format. Please backup your current\n' 'This might be caused by an old wc format. Please backup your current\n'
'wc and checkout the package again. Afterwards copy all files (except the\n' 'wc and checkout the package again. Afterwards copy all files (except the\n'
'.osc/ dir) into the new package wc.' % n) '.osc/ dir) into the new package wc.' % n)
elif os.path.islink(os.path.join(self.absdir, n)): elif os.path.islink(localfile):
# dangling symlink, whose name is _not_ tracked: treat it # dangling symlink, whose name is _not_ tracked: treat it
# as unversioned # as unversioned
state = '?' state = '?'