mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-09-06 13:18:42 +02:00
Code Activity

- adjusted store_write_string calls so that the storefile ends with a newline

Browse Source 
- adjusted testcase fixtures for this change
This commit is contained in:
Marcus Huewe
2010-08-30 14:20:12 +02:00
parent c8e849b391
commit c4ceb7f700
16 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osc/commandline.py
View File

@@ -190,7 +190,7 @@ class Osc(cmdln.Cmdln):
print 'Initializing %s (Project: %s)' % (os.curdir, project)
else:
Package.init_package(apiurl, project, package, os.curdir)
store_write_string(os.curdir, '_files', show_files_meta(apiurl, project, package))
store_write_string(os.curdir, '_files', show_files_meta(apiurl, project, package) + '\n')
print 'Initializing %s (Project: %s, Package: %s)' % (os.curdir, project, package)
@cmdln.alias('ls')
@@ -3026,7 +3026,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
msg = edit_message(footer='\n'.join(footer), template=template)
if msg:
store_write_string(os.path.abspath('.'), '_commit_msg', msg)
store_write_string(os.path.abspath('.'), '_commit_msg', msg + '\n')
else:
store_unlink_file(os.path.abspath('.'), '_commit_msg')
@@ -5495,7 +5495,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
os.mkdir(destdir)
Package.init_package(apiurl, target_prj, target_package, destdir)
store_write_string(destdir, '_files', ''.join(meta))
store_write_string(destdir, '_files', ''.join(meta) + '\n')
store_write_string(destdir, '_linkrepair', '')
pac = Package(destdir)
@@ -5681,7 +5681,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
p.write_deletelist()
p.write_conflictlist()
# store new linkrev
store_write_string(p.absdir, '_pulled', linkinfo_new.get('srcmd5'))
store_write_string(p.absdir, '_pulled', linkinfo_new.get('srcmd5') + '\n')
p.unmark_frozen()
print
if len(p.in_conflict):

10
osc/core.py
View File

@@ -900,7 +900,7 @@ class Package:
except:
pass
else:
store_write_string(self.absdir, '_size_limit', self.size_limit)
store_write_string(self.absdir, '_size_limit', str(self.size_limit) + '\n')
def write_addlist(self):
self.__write_storelist('_to_be_added', self.to_be_added)
@@ -1143,7 +1143,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, limit_size=self.limit_size, meta=self.meta))
store_write_string(self.absdir, '_files', meta)
store_write_string(self.absdir, '_files', meta + '\n')
def update_datastructs(self):
"""
@@ -1256,7 +1256,7 @@ class Package:
It is replaced with the version pulled from upstream.
"""
meta = ''.join(show_package_meta(self.apiurl, self.prjname, self.name))
store_write_string(self.absdir, '_meta', meta)
store_write_string(self.absdir, '_meta', meta + '\n')
def findfilebyname(self, n):
for i in self.filelist:
@@ -1644,7 +1644,7 @@ rev: %s
fm = show_files_meta(self.apiurl, self.prjname, self.name, revision=rev, limit_size=limit_size)
root = ET.fromstring(fm)
rfiles = self.__get_files(root)
store_write_string(self.absdir, '_files', fm, subdir='_in_update')
store_write_string(self.absdir, '_files', fm + '\n', subdir='_in_update')
kept, added, deleted, services = self.__get_rev_changes(rfiles)
if not service_files:
services = []
@@ -1720,7 +1720,7 @@ rev: %s
targetfilename=os.path.join(self.absdir, f.name), revision=rev,
progress_obj=self.progress_obj, mtime=f.mtime, meta=self.meta)
print statfrmt('A', os.path.join(pathn, f.name))
store_write_string(self.absdir, '_files', fm)
store_write_string(self.absdir, '_files', fm + '\n')
self.update_local_pacmeta()
self.update_datastructs()