Marcus Huewe 45e27c01af Correctly update a conflict file ('C') that is going to be deleted ... Deleting a conflict file (state 'C') during an update operation results in an inconsistent working copy. To fix this, we remove the conflict file from the _in_conflict list.		2017-03-20 19:20:59 +01:00
..
util	Support arm packages in pkg-prefer	2016-08-08 10:35:14 +02:00
__init__.py	add vim mode lines to avoid evil tab characters :-)	2010-02-25 09:53:45 +01:00
.gitignore	convert svn:ignore to gitignore	2009-12-03 19:19:53 +01:00
babysitter.py	Fix URLGrabError exception handling.	2017-01-17 23:27:08 +00:00
build.py	list appimage build results	2017-03-15 10:32:11 +01:00
checker.py	Resolve PEP8 issue W291	2014-08-12 15:01:16 +02:00
cmdln.py	Added readline support to cmdln-module.	2015-01-09 13:33:31 +01:00
commandline.py	cat/less/blame command: default to expand to stay in sync with checkout	2017-03-14 19:02:01 +01:00
conf.py	Backport a fix from Python 2.7 upstream for urllib2.	2016-11-22 11:13:24 +02:00
core.py	Correctly update a conflict file ('C') that is going to be deleted	2017-03-20 19:20:59 +01:00
fetch.py	fetch.py: reworded Fetcher.failureReport message a bit	2016-02-05 11:28:47 +01:00
meter.py	python3 compatibility: print function	2013-04-16 10:51:41 +02:00
OscConfigParser.py	- OscConfigParser: added "proper" parameter to the has_option method	2014-06-04 15:29:50 +02:00
oscerr.py	Fix "args" handling in class PackageNotInstalled	2016-09-09 13:14:35 +02:00
oscssl.py	Fix SSL.Connection instantiation in case of an old M2Crypto	2017-03-09 13:34:17 +01:00
oscsslexcp.py	- remove shebang line to make rpmlint happy	2010-03-21 22:57:06 +01:00