Show More
@@ -112,7 +112,7 b' def action_logger(user, action, repo, ip' | |||||
112 | if hasattr(user, 'user_id'): |
|
112 | if hasattr(user, 'user_id'): | |
113 | user_obj = user |
|
113 | user_obj = user | |
114 | elif isinstance(user, basestring): |
|
114 | elif isinstance(user, basestring): | |
115 |
user_obj = User.by_username(user |
|
115 | user_obj = User.by_username(user) | |
116 | else: |
|
116 | else: | |
117 | raise Exception('You have to provide user object or username') |
|
117 | raise Exception('You have to provide user object or username') | |
118 |
|
118 | |||
@@ -189,7 +189,7 b' def is_valid_repo(repo_name, base_path):' | |||||
189 | :return True: if given path is a valid repository |
|
189 | :return True: if given path is a valid repository | |
190 | """ |
|
190 | """ | |
191 | full_path = os.path.join(base_path, repo_name) |
|
191 | full_path = os.path.join(base_path, repo_name) | |
192 |
|
192 | |||
193 | try: |
|
193 | try: | |
194 | get_scm(full_path) |
|
194 | get_scm(full_path) | |
195 | return True |
|
195 | return True | |
@@ -204,17 +204,17 b' def is_valid_repos_group(repos_group_nam' | |||||
204 | :param base_path: |
|
204 | :param base_path: | |
205 | """ |
|
205 | """ | |
206 | full_path = os.path.join(base_path, repos_group_name) |
|
206 | full_path = os.path.join(base_path, repos_group_name) | |
207 |
|
207 | |||
208 | # check if it's not a repo |
|
208 | # check if it's not a repo | |
209 | if is_valid_repo(repos_group_name, base_path): |
|
209 | if is_valid_repo(repos_group_name, base_path): | |
210 | return False |
|
210 | return False | |
211 |
|
211 | |||
212 | # check if it's a valid path |
|
212 | # check if it's a valid path | |
213 | if os.path.isdir(full_path): |
|
213 | if os.path.isdir(full_path): | |
214 | return True |
|
214 | return True | |
215 |
|
215 | |||
216 | return False |
|
216 | return False | |
217 |
|
217 | |||
218 | def ask_ok(prompt, retries=4, complaint='Yes or no, please!'): |
|
218 | def ask_ok(prompt, retries=4, complaint='Yes or no, please!'): | |
219 | while True: |
|
219 | while True: | |
220 | ok = raw_input(prompt) |
|
220 | ok = raw_input(prompt) |
General Comments 0
You need to be logged in to leave comments.
Login now