[obs-commits] [openSUSE/osc] 40c480: Resurrect merge_cmd variable after it got removed ...
![](https://seccdn.libravatar.org/avatar/9181eb84f9c35729a3bad740fb7f9d93.jpg?s=120&d=mm&r=g)
Branch: refs/heads/master Home: https://github.com/openSUSE/osc Commit: 40c480e9ef48c0498d116c7d73f2384e1a3b4ffb https://github.com/openSUSE/osc/commit/40c480e9ef48c0498d116c7d73f2384e1a3b4... Author: Dan Čermák <dcermak@suse.com> Date: 2019-09-20 (Fri, 20 Sep 2019) Changed paths: M osc/core.py Log Message: ----------- Resurrect merge_cmd variable after it got removed in the past In case diff3 returns something except 0 or 1, osc errors out because the variable merge_cmd is not defined. It used to exist, but got removed in the past and is reintroduced via this commit. Commit: 74e1f47574c4ef29ac8e0f84ed586745b04772b2 https://github.com/openSUSE/osc/commit/74e1f47574c4ef29ac8e0f84ed586745b0477... Author: Marcus Huewe <suse-tux@gmx.de> Date: 2019-09-20 (Fri, 20 Sep 2019) Changed paths: M osc/core.py Log Message: ----------- Merge branch 'fix_nonexistent_variable' of https://github.com/dcermak/osc Fix NameError in Package.mergefile. It got broken in commit 63c2aa3630d336382b3df91e9b4e84ab96c378ce ("Do not run diff3 in the shell"). The mergefile method itself needs some love because opening the file with mode 'r' will break sooner or later (when it was introduced, it was no problem because we lived in the old python2 world). Also, instead of the newly introduced args variable, we could re-introduce the merge_cmd variable again. Compare: https://github.com/openSUSE/osc/compare/e7e91709ef71...74e1f47574c4
participants (1)
-
Marcus Hüwe