mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-08-06 15:43:39 +02:00
Code Activity

- make store_write_* methods more safe

Browse Source
This commit is contained in:
Marcus Huewe
2010-03-04 00:31:46 +01:00
parent f9aa6c7271
commit 0dcf378060
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
osc/core.py
View File

@@ -990,15 +990,7 @@ class Package:
It is replaced with the version pulled from upstream.
"""
meta = ''.join(show_files_meta(self.apiurl, self.prjname, self.name, revision=revision))
try:
f = open(os.path.join(self.storedir, '_files.new'), 'w')
f.write(meta)
f.close()
os.rename(os.path.join(self.storedir, '_files.new'), os.path.join(self.storedir, '_files'))
except:
if os.path.exists(os.path.join(self.storedir, '_files.new')):
os.unlink(os.path.join(self.storedir, '_files.new'))
raise
store_write_string(self.absdir, '_files', meta)
def update_datastructs(self):
"""
@@ -1091,9 +1083,7 @@ class Package:
It is replaced with the version pulled from upstream.
"""
meta = ''.join(show_package_meta(self.apiurl, self.prjname, self.name))
f = open(os.path.join(self.storedir, '_meta'), 'w')
f.write(meta)
f.close()
store_write_string(self.absdir, '_meta', meta)
def findfilebyname(self, n):
for i in self.filelist:
@@ -3929,15 +3919,21 @@ def store_read_apiurl(dir):
def store_write_string(dir, file, string):
fname = os.path.join(dir, store, file)
open(fname, 'w').write(string)
try:
f = open(fname + '.new', 'w')
f.write(string)
f.close()
os.rename(fname + '.new', fname)
except:
if os.path.exists(fname + '.new'):
os.unlink(fname + '.new')
raise
def store_write_project(dir, project):
fname = os.path.join(dir, store, '_project')
open(fname, 'w').write(project + '\n')
store_write_string(dir, '_project', project + '\n')
def store_write_apiurl(dir, apiurl):
fname = os.path.join(dir, store, '_apiurl')
open(fname, 'w').write(apiurl + '\n')
store_write_string(dir, '_apiurl', apiurl + '\n')
def store_unlink_file(dir, file):
try: os.unlink(os.path.join(dir, store, file))