--- a/components/openstack/swift/swift.p5m	Wed May 13 04:53:25 2015 -0700
+++ b/components/openstack/swift/swift.p5m	Tue May 19 13:51:17 2015 -0700
@@ -114,7 +114,8 @@
 hardlink path=lib/svc/method/swift-object-updater
 file path=lib/svc/method/swift-proxy-server
 file path=lib/svc/method/swift-replicator-rsync
-file path=lib/svc/method/swift-upgrade
+file path=lib/svc/method/swift-upgrade \
+    pkg.depend.bypass-generate=.*/openstack_common.*
 file path=usr/bin/swift-account-audit
 file path=usr/bin/swift-account-info
 file path=usr/bin/swift-config
@@ -288,6 +289,10 @@
 #
 license LICENSE license="Apache v2.0"
 
+# force a dependency on cloud/openstack/openstack-common until it is
+# available in the WOS
+depend type=require fmri=cloud/openstack/openstack-common
+
 # force a dependency on dnspython; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/dnspython-$(PYV)