Merge branch 'master' of github.com:stv0g/snippets
This commit is contained in:
commit
9311adcfaa
1 changed files with 11 additions and 1 deletions
12
python/sciebo_shares.py
Normal file → Executable file
12
python/sciebo_shares.py
Normal file → Executable file
|
@ -200,6 +200,7 @@ if __name__ == "__main__":
|
|||
else:
|
||||
command = 'list'
|
||||
|
||||
<<<<<<< HEAD
|
||||
if command == 'add':
|
||||
add_shares(options, oc, shares)
|
||||
elif command == 'list':
|
||||
|
@ -208,4 +209,13 @@ if __name__ == "__main__":
|
|||
check_shares(options, oc, shares)
|
||||
|
||||
except owncloud.ResponseError as e:
|
||||
print 'OwnCloud: %s' % e.response.content.strip()
|
||||
print 'OwnCloud: %s' % e.response.content.strip()
|
||||
=======
|
||||
if command == 'add':
|
||||
add_shares(oc, shares)
|
||||
elif command == 'list':
|
||||
admin = (len(sys.argv) == 3) and (sys.argv[2] == 'admin')
|
||||
list_shares(oc, shares, admin)
|
||||
elif command == 'check':
|
||||
check_shares(oc, shares)
|
||||
>>>>>>> c849a33e2d76a4349136ab874b977599786789e2
|
||||
|
|
Loading…
Add table
Reference in a new issue