mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-04 18:46:17 +01:00
Code

osc update: fix diff3 merging for expanded links, by adding the revision to the

Browse Source 
get_source_file() call in the mergfile method.
This commit is contained in:
Dr. Peter Poeml 2008-03-26 16:11:11 +00:00
parent ab76e2cf84
commit a0bae2ab52
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osc/core.py
View File

@ -755,7 +755,8 @@ class Package:
os.rename(filename, myfilename)
mtime = self.findfilebyname(n).mtime
get_source_file(self.apiurl, self.prjname, self.name, n, targetfilename=upfilename)
get_source_file(self.apiurl, self.prjname, self.name, n,
revision=self.rev, targetfilename=upfilename)
os.utime(upfilename, (-1, mtime))
if binary_file(myfilename) or binary_file(upfilename):