https://bugzilla.novell.com/show_bug.cgi?id=896837 https://bugzilla.novell.com/show_bug.cgi?id=896837#c0 Summary: OBS reports diff error in .changes erroneously Classification: openSUSE Product: openSUSE.org Version: unspecified Platform: Other OS/Version: Other Status: NEW Severity: Critical Priority: P5 - None Component: OBS Request AssignedTo: mrueckert@suse.com ReportedBy: kgronlund@suse.com QAContact: adrian@suse.com Found By: Development Blocker: --- After updating the package and .changes, OBS shows this error: Files could not be expanded: conflict in file fence-agents.changes Link has errors: conflict in file fence-agents.changes Manually diffing the upstream .changes with the modified .changes shows that diff erroneusly associates the first separator line of the previous changelog entry with the latest change entry, inserting the new entry below the first line. However, this is not something I can control, the two lines are identical and it is arbritrary which line diff chooses to include in the added lines. See diff: --- /home/krig/Downloads/fence-agents.changes 2014-09-16 10:06:44.834812397 +0200 +++ fence-agents.changes 2014-09-16 09:51:07.540491014 +0200 @@ -1,4 +1,33 @@ ------------------------------------------------------------------- +Tue Sep 16 07:15:30 UTC 2014 - kgronlund@suse.com + +- Backport fixes from upstream (bnc#896833): + + fence_brocade: Add support for 'list' action + + fencing: Monitor is not working correctly without 'list' or 'status' + + fence_apc_snmp: Add support for firmware 6.x + + fence_zvm: Add support for "on" and "status" + + fence_zvm: Add current XML metadata to test suite + + [build] Fix automake files, so 'make distcheck' works + + fencing: Add new options --ssl-secure and --ssl-insecure + + [tests] Update XML metadata of fence agents + + fence_cisco_ucs & fence_vmware_soap: Logout has to be performed even when fencing fails + + fence_zvm: Fixes for better upstream inclusion + + fence_zvm: Add support for 'on', improve documentation +- Added patches: + + 0001-fence_brocade-Add-support-for-list-action.patch + + 0002-fencing-Monitor-is-not-working-correctly-without-lis.patch + + 0003-fence_apc_snmp-Add-support-for-firmware-6.x.patch + + 0004-fence_zvm-Add-support-for-on-and-status.patch + + 0005-fence_zvm-Add-current-XML-metadata-to-test-suite.patch + + 0006-build-Fix-automake-files-so-make-distcheck-works.patch + + 0007-fencing-Add-new-options-ssl-secure-and-ssl-insecure.patch + + 0008-tests-Update-XML-metadata-of-fence-agents.patch + + 0009-fence_cisco_ucs-fence_vmware_soap-Logout-has-to-be-p.patch + + 0010-fence_zvm-Fixes-for-better-upstream-inclusion.patch + + 0011-fence_zvm-Add-support-for-on-improve-documentation.patch +- Add dependency on python-requests + +------------------------------------------------------------------- Tue Jul 1 12:32:09 UTC 2014 - kgronlund@suse.com - Update to 4.0.10: -- Configure bugmail: https://bugzilla.novell.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug.