Blame odcs-unique-path.patch
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
bc08ad6 |
diff --git a/server/odcs/server/config.py b/server/odcs/server/config.py
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
bc08ad6 |
index 4aade88..dc9d0c8 100644
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
bc08ad6 |
--- a/server/odcs/server/config.py
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
bc08ad6 |
+++ b/server/odcs/server/config.py
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
bc08ad6 |
@@ -280,6 +280,18 @@ class Config(object):
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
bc08ad6 |
'type': str,
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
bc08ad6 |
'default': None,
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
bc08ad6 |
'desc': 'Koji config profile.'},
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
bc08ad6 |
+ 'krb_ccache': {
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
bc08ad6 |
+ 'type': str,
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
bc08ad6 |
+ 'default': None,
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
bc08ad6 |
+ 'desc': 'Kerberos ccache file to use for Koji auth.'},
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
bc08ad6 |
+ 'krb_keytab': {
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
bc08ad6 |
+ 'type': str,
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
bc08ad6 |
+ 'default': None,
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
bc08ad6 |
+ 'desc': 'Kerberos keytab to use for Koji auth.'},
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
bc08ad6 |
+ 'krb_principal': {
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
bc08ad6 |
+ 'type': str,
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
bc08ad6 |
+ 'default': None,
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
bc08ad6 |
+ 'desc': 'Kerberos principal to use for Koji auth.'},
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
bc08ad6 |
'raw_config_urls': {
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
bc08ad6 |
'type': dict,
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
bc08ad6 |
'default': {},
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
3152777 |
diff --git a/server/odcs/server/pungi.py b/server/odcs/server/pungi.py
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
3152777 |
index 9dbd1d3..1d6d82d 100644
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
3152777 |
--- a/server/odcs/server/pungi.py
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
3152777 |
+++ b/server/odcs/server/pungi.py
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
3152777 |
@@ -222,7 +222,7 @@ class Pungi(object):
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
3152777 |
"Failed to remove temporary directory {!r}: {}".format(
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
3152777 |
td, str(e)))
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
3152777 |
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
3152777 |
- def _unique_path(prefix):
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
3152777 |
+ def _unique_path(self, prefix):
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
3152777 |
"""
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
3152777 |
Create a unique path fragment by appending a path component
|
|
![](https://seccdn.libravatar.org/avatar/430f5efc40e35e0aa1fd79627936a80d173d15601d93a228822d42e35eddcd83?s=16&d=retro) |
3152777 |
to prefix. The path component will consist of a string of letter and numbers
|