github.com_openSUSE_osc

mirror of https://github.com/openSUSE/osc.git synced 2025-09-06 13:18:42 +02:00

Files

Marcus Huewe bf42c70f56 Use a fixed suffix for the upfilename in Package.mergefile

The old code uses a variable .rXYZ suffix (where XYZ is the revision
of the package wc during the merge operation). Now, if Package.mergefile
is invoked during an update, XYZ represents the "old" revision. That
is, if a merge conflict happens, then a subsequent "osc resolved <file>"
will not unlink the <file>.rXYZ file (because
Package.clear_from_conflictlist only takes the current rev into account).

In order to fix this, use a fixed ".new" suffix. This way,
Package.clear_from_conflictlist can properly unlink the corresponding
*.new file. This naming scheme for the "upfilename" is in line with
"osc pull" and "osc repairlink".

Note: if a working copy was updated with an "old" osc version (without
this commit) and a "new" osc version (with this commit) is used to run
"osc resolved <file>", then the <file>.rXYZ file is _NOT_ removed (it
is not worth the effort to add compat code for this).

2021-07-20 15:19:16 +02:00

util

Use os.getcwdb() instead of os.getcwd().encode() in util.cpio.CpioRead

2020-11-22 17:39:54 +01:00

__init__.py

replace urlgrabber to enable python3 compatibility

2018-10-19 09:31:37 +02:00

.gitignore

convert svn:ignore to gitignore

2009-12-03 19:19:53 +01:00

babysitter.py

Ignore signal.SIGWINCH.