Commit 93542587 authored by Stavros Sachtouris's avatar Stavros Sachtouris
Browse files

Correct publish output, more details in storelist

parent 42cb53d0
......@@ -280,6 +280,9 @@ class _store_container_command(_store_account_command):
@command(pithos_cmds)
class store_list(_store_container_command):
"""List containers, object trees or objects in a directory
without parameters for a list of containers,
with one parameter (container) for the contents of a container,
with <container>:<prefix> for all contents starting with prefix
"""
def __init__(self, arguments={}):
......
......@@ -860,7 +860,10 @@ class PithosClient(PithosRestAPI):
r = self.object_post(obj, update=True, public=True)
r.release()
info = self.get_object_info(obj)
newurl = path4url(self.base_url, info['x-object-public'])
pref, sep, rest = self.base_url.partition('//')
base = rest.split('/')[0]
newurl = path4url('%s%s%s' % (pref, sep, base),
info['x-object-public'])
return newurl[1:]
def unpublish_object(self, obj):
......
......@@ -310,7 +310,7 @@ class testCyclades(unittest.TestCase):
u'cpu': 1}
self.PROFILES = ('ENABLED', 'DISABLED', 'PROTECTED')
"""okeanos.io"""
"""okeanos.io """
"""
self.img = 'b3e68235-3abd-4d60-adfe-1379a4f8d3fe'
self.img_details = {
......@@ -332,7 +332,7 @@ class testCyclades(unittest.TestCase):
u'description': u'Debian 6.0.6 (Squeeze) Base System'}
}
}
"""
"""
self.servers = {}
self.now = time.mktime(time.gmtime())
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment