Merge "Remove conflicting packages in Ubuntu"

Zuul · openstack-gerrit · commit 455be6609835 · 2020-01-30T00:01:06.000Z
diff --git a/tools/fixup_stuff.sh b/tools/fixup_stuff.sh
@@ -79,6 +79,8 @@ function fixup_ubuntu {
     # manifest of what to remove.  However, in most cases, simply
     # overwriting works.  So this hacks around those packages that
     # have been dragged in by some other system dependency
+    sudo rm -f /usr/lib/python3/dist-packages/httplib2-*.egg-info
+    sudo rm -f /usr/lib/python3/dist-packages/pyasn1_modules-*.egg-info
     sudo rm -f /usr/lib/python3/dist-packages/PyYAML-*.egg-info
 }
 

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,8 @@ function fixup_ubuntu {`
`79`	`79`	`# manifest of what to remove. However, in most cases, simply`
`80`	`80`	`# overwriting works. So this hacks around those packages that`
`81`	`81`	`# have been dragged in by some other system dependency`
	`82`	`+ sudo rm -f /usr/lib/python3/dist-packages/httplib2-*.egg-info`
	`83`	`+ sudo rm -f /usr/lib/python3/dist-packages/pyasn1_modules-*.egg-info`
`82`	`84`	`sudo rm -f /usr/lib/python3/dist-packages/PyYAML-*.egg-info`
`83`	`85`	`}`
`84`	`86`