| [...truncated 2141 lines...] |
| removing 'nova-2012.2' (and everything under it) |
| INFO:root:Building package using /tmp/tmpAZp9Sj/nova_2012.2+git201207181232~precise.orig.tar.gz |
| INFO:root:Generating git changelog entries for this package |
| DEBUG:root:['git', 'log', '-n1', '--no-merges', '--pretty=format:%H'] |
| DEBUG:root:6dd53cf4970ffb08fe961e72b78a5c170c536b62 |
| INFO:root:Detected previous commit - reading |
| DEBUG:root:['git', 'log', '43677fc6dab76d9b6ad0375eba4b3c2a78e5b405..HEAD', '--no-merges', '--pretty=format:[%h] %s'] |
| INFO:root:Merging testing branch from launchpad |
| DEBUG:root:['bzr', 'merge', 'lp:~openstack-ubuntu-testing/nova/precise-folsom', '--force'] |
| Warning: criss-cross merge encountered. See bzr help criss-cross. |
| Not attempting to fix packaging branch ancestry, missing pristine tar data for version 2012.2+git201207131602~precise. |
| dpkg-mergechangelogs: warning: /tmp/tmpJqtnmFdeb_changelog_merge/changelog.this(l16): badly formatted trailer line |
| LINE: -- Chuck Short Mon, 09 Jul 2012 21:47:03 -0400 |
| dpkg-mergechangelogs: warning: /tmp/tmpJqtnmFdeb_changelog_merge/changelog.this(l18): found start of entry where expected more change data or trailer |
| LINE: nova (2012.2~f2-0ubuntu1) quantal; urgency=low |
| dpkg-mergechangelogs: warning: /tmp/tmpJqtnmFdeb_changelog_merge/changelog.this(l42): badly formatted heading line |
| LINE: >>>>>>> |
|
| M debian/changelog |
| Text conflict in debian/changelog |
| 1 conflicts encountered. |
| ERROR:root:Error occurred during package creation/build |
| ERROR:root:Command '['bzr', 'merge', 'lp:~openstack-ubuntu-testing/nova/precise-folsom', '--force']' returned non-zero exit status 1 |
| INFO:root:Complete command log: |
| INFO:root:Destroying schroot. |
| bzr branch lp:~openstack-ubuntu-testing/nova/precise-folsom-proposed /tmp/tmpAZp9Sj/nova |
| mk-build-deps -i -r -t apt-get -y /tmp/tmpAZp9Sj/nova/debian/control |
| python setup.py sdist |
| git log -n1 --no-merges --pretty=format:%H |
| git log 43677fc6dab76d9b6ad0375eba4b3c2a78e5b405..HEAD --no-merges --pretty=format:[%h] %s |
| bzr merge lp:~openstack-ubuntu-testing/nova/precise-folsom --force |
| Traceback (most recent call last): |
| File "/var/lib/jenkins/tools/openstack-ubuntu-testing/bin/build-package", line 135, in |
| raise e |
| subprocess.CalledProcessError: Command '['bzr', 'merge', 'lp:~openstack-ubuntu-testing/nova/precise-folsom', '--force']' returned non-zero exit status 1 |
| Error in sys.excepthook: |
| Traceback (most recent call last): |
| File "/usr/lib/python2.7/dist-packages/apport_python_hook.py", line 68, in apport_excepthook |
| binary = os.path.realpath(os.path.join(os.getcwdu(), sys.argv[0])) |
| OSError: [Errno 2] No such file or directory |
|
| Original exception was: |
| Traceback (most recent call last): |
| File "/var/lib/jenkins/tools/openstack-ubuntu-testing/bin/build-package", line 135, in |
| raise e |
| subprocess.CalledProcessError: Command '['bzr', 'merge', 'lp:~openstack-ubuntu-testing/nova/precise-folsom', '--force']' returned non-zero exit status 1 |
| Build step 'Execute shell' marked build as failure |
| Email was triggered for: Failure |
| Sending email for trigger: Failure |
