--- a/components/openstack/swift/swift.p5m	Wed May 27 05:22:49 2015 -0700
+++ b/components/openstack/swift/swift.p5m	Wed May 27 15:21:04 2015 -0600
@@ -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,11 +289,9 @@
 #
 license LICENSE license="Apache v2.0"
 
-# force a dependency on dnspython; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/dnspython-$(PYV)
-
-# force a dependency on keystonemiddleware; used via a paste.deploy filter
-depend type=require fmri=library/python/keystonemiddleware-$(PYV)
+# 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 netifaces; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python-2/netifaces-$(PYV)
@@ -304,5 +303,11 @@
 # force a dependency on setuptools; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python-2/setuptools-$(PYV)
 
+# force a dependency on dnspython; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/dnspython-$(PYV)
+
+# force a dependency on keystonemiddleware; used via a paste.deploy filter
+depend type=require fmri=library/python/keystonemiddleware-$(PYV)
+
 # force a dependency on xattr; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/xattr-$(PYV)