Revision 41ddb860 pithos/lib/hashfiler/blocker.py

b/pithos/lib/hashfiler/blocker.py
1
#!/usr/bin/env python
1
# Copyright 2011 GRNET S.A. All rights reserved.
2
# 
3
# Redistribution and use in source and binary forms, with or
4
# without modification, are permitted provided that the following
5
# conditions are met:
6
# 
7
#   1. Redistributions of source code must retain the above
8
#      copyright notice, this list of conditions and the following
9
#      disclaimer.
10
# 
11
#   2. Redistributions in binary form must reproduce the above
12
#      copyright notice, this list of conditions and the following
13
#      disclaimer in the documentation and/or other materials
14
#      provided with the distribution.
15
# 
16
# THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
17
# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
19
# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
20
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
21
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
22
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
23
# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
24
# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
26
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
27
# POSSIBILITY OF SUCH DAMAGE.
28
# 
29
# The views and conclusions contained in the software and
30
# documentation are those of the authors and should not be
31
# interpreted as representing official policies, either expressed
32
# or implied, of GRNET S.A.
2 33

  
3 34
from os import makedirs
4 35
from os.path import isdir, realpath, exists, join
......
25 56
            if not exists(blockpath):
26 57
                makedirs(blockpath)
27 58
            else:
28
                raise ValueError("blockpath '%s' is not a directory" % (blockpath,))
59
                raise ValueError("Variable blockpath '%s' is not a directory" % (blockpath,))
29 60

  
30 61
        hashtype = params['hashtype']
31 62
        try:
32 63
            hasher = newhasher(hashtype)
33 64
        except ValueError:
34
            msg = "hashtype '%s' is not available from hashlib"
65
            msg = "Variable hashtype '%s' is not available from hashlib"
35 66
            raise ValueError(msg % (hashtype,))
36 67

  
37 68
        hasher.update("")

Also available in: Unified diff