Note: This is a public test instance of Red Hat Bugzilla. The data contained within is a snapshot of the live data so any changes you make will not be reflected in the production Bugzilla. Email is disabled so feel free to test any aspect of the site that you want. File any problems you find or give feedback at bugzilla.redhat.com.
Bug 990444
Summary: | RFE: please add "mergetool" virtual provides | |||
---|---|---|---|---|
Product: | [Fedora] Fedora | Reporter: | Karel Volný <kvolny> | |
Component: | distribution | Assignee: | Radek Vokál <rvokal> | |
Status: | NEW --- | QA Contact: | Radek Vokál <rvokal> | |
Severity: | unspecified | Docs Contact: | ||
Priority: | unspecified | |||
Version: | rawhide | CC: | dennis, neteler | |
Target Milestone: | --- | Keywords: | Tracking | |
Target Release: | --- | |||
Hardware: | Unspecified | |||
OS: | Unspecified | |||
Whiteboard: | ||||
Fixed In Version: | Doc Type: | Bug Fix | ||
Doc Text: | Story Points: | --- | ||
Clone Of: | ||||
: | vim-mergetool diffuse-mergetool kdiff3-mergetool meld-mergetool tkcvs-mergetool 990452 (view as bug list) | Environment: | ||
Last Closed: | Type: | Bug | ||
Regression: | --- | Mount Type: | --- | |
Documentation: | --- | CRM: | ||
Verified Versions: | Category: | --- | ||
oVirt Team: | --- | RHEL 7.3 requirements from Atomic Host: | ||
Cloudforms Team: | --- | Target Upstream Version: | ||
Embargoed: | ||||
Bug Depends On: | 990445, 990446, 990447, 990449, 990450, 990452, 994434 | |||
Bug Blocks: | 990467 |
Description
Karel Volný
2013-07-31 08:46:37 UTC
I just (almost) finished updating F21 -> F22 using fedup. All fine except for a missing merge tool in "rpmconf": [root@desktop ~]# rpmconf -a Configuration file '/etc/systemd/journald.conf' -rw-r--r--. 1 root root 969 4. Aug 08:23 /etc/systemd/journald.conf.rpmnew -rw-r--r--. 1 root root 808 29. Aug 11:41 /etc/systemd/journald.conf ==> Package distributor has shipped an updated version. What would you like to do about it ? Your options are: Y or I : install the package maintainer's version N or O : keep your currently-installed version D : show the differences between the versions M : merge configuration files Z : background this process to examine the situation S : skip this file The default action is to keep your current version. *** aliases (Y/I/N/O/D/M/Z/S) [default=N] ? Your choice: D Configuration file '/etc/systemd/journald.conf' -rw-r--r--. 1 root root 969 4. Aug 08:23 /etc/systemd/journald.conf.rpmnew -rw-r--r--. 1 root root 808 29. Aug 11:41 /etc/systemd/journald.conf ==> Package distributor has shipped an updated version. What would you like to do about it ? Your options are: Y or I : install the package maintainer's version N or O : keep your currently-installed version D : show the differences between the versions M : merge configuration files Z : background this process to examine the situation S : skip this file The default action is to keep your current version. *** aliases (Y/I/N/O/D/M/Z/S) [default=N] ? Your choice: M ERROR:rpmconf:You did not selected any frontend for merge [root@desktop ~]# cat /etc/issue Fedora release 22 (Twenty Two) Kernel \r on an \m (\l) Using rpmconf-1.0.12-1.fc22.noarch Now what do install? (for the record: I reached this report thru bug #982627) (In reply to markusN from comment #3) > Now what do install? rpmconf can use one of vimdiff, gvimdiff, meld, diffuse, kdiff3 or anything you set using environment variable 'MERGE' so you're free to choose ... please see the list of bugs this depends on (also 'kompare' provides this functionality) (In reply to markusN from comment #4) > (for the record: I reached this report thru bug #982627) there's a difference between rpmconf and fedora-upgrade - interrupting the latter will leave a messed up system, so it has to require some mergetool to prevent rpmconf bailing out OTOH, if you run rpmconf manually and it quits unexpectedly, you can install the missing dependency and re-run it without breaking any process therefore there's no such bug for rpmconf as #982627 for fedora-upgrade Thanks for your comments, I agree. Will report an enhancement request against "rpmconf" to provide a better error message (essentially, suggesting at least tell the user to make use of the environment variable 'MERGE'): Instead of ERROR:rpmconf:You did not selected any frontend for merge may it be ERROR:rpmconf:You did not selected any frontend for merge (define it with environment variable 'MERGE' or flag -f) (In reply to markusN from comment #6) > Will report an enhancement request against "rpmconf" to provide a better > error message For the record: done, bug #1258464 |