[copr] master: add rules for dist-git and keygen (8100222)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 81002226fb60e79cdcad7439a492dddcd5e982dc
Author: Miroslav Such�� <msuchy(a)redhat.com>
Date: Wed Feb 3 10:18:46 2016 +0100
add rules for dist-git and keygen
>---------------------------------------------------------------
selinux/copr.fc | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/selinux/copr.fc b/selinux/copr.fc
index d5ee0ad..b6854ef 100644
--- a/selinux/copr.fc
+++ b/selinux/copr.fc
@@ -1,3 +1,6 @@
/var/lib/copr(/.*)? gen_context(system_u:object_r:copr_data_t,s0)
/var/log/copr(/.*)? gen_context(system_u:object_r:copr_httpd_log_t,s0)
+/var/lib/dist-git/git/rpms(/.*)? gen_context(system_u:object_r:git_user_content_t,s0)
+/usr/libexec/git-core/git-http-backend gen_context(system_u:object_r:git_script_exec_t,s0)
+/var/lib/copr-keygen/gnupg/trustdb.gpg gen_context(system_u:object_r:httpd_var_lib_t,s0)
8 years, 2 months
[copr] master: [keygen] GnuPG 2.1 compatibility - key creation fix (d444475)
by clime＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit d4444752214895a95621a8193bff6bf317b9bdc7
Author: clime <clime(a)redhat.com>
Date: Tue Feb 2 11:07:10 2016 +0100
[keygen] GnuPG 2.1 compatibility - key creation fix
control statement %no-ask-passphrase is no-op in 2.1, instead, there is %no-protection to generate a key without a passphrase (see "Unattended GPG key generation" entry in GnuPG manual)
>---------------------------------------------------------------
keygen/src/copr_keygen/logic.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/keygen/src/copr_keygen/logic.py b/keygen/src/copr_keygen/logic.py
index 964b339..529786a 100644
--- a/keygen/src/copr_keygen/logic.py
+++ b/keygen/src/copr_keygen/logic.py
@@ -71,7 +71,7 @@ def user_exists(app, mail):
template = """
-%no-ask-passphrase
+%no-protection
Key-Type: {key_type}
Key-Length: {key_length}
Name-Real: {name_real}
8 years, 2 months
[copr] master: [keygen] extended logging for better diagnostics (ddd7695)
by clime＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit ddd76957f0337f8481fd51f8b01e5f3ae484ab52
Author: clime <clime(a)redhat.com>
Date: Tue Feb 2 11:18:05 2016 +0100
[keygen] extended logging for better diagnostics
>---------------------------------------------------------------
backend/backend/sign.py | 4 ++--
keygen/src/copr_keygen/logic.py | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/backend/backend/sign.py b/backend/backend/sign.py
index a5cc998..1b8676d 100755
--- a/backend/backend/sign.py
+++ b/backend/backend/sign.py
@@ -162,6 +162,6 @@ def create_user_keys(username, projectname, opts):
if response.status_code >= 400:
raise CoprKeygenRequestError(
- msg="Failed to create key-pair for user: {}, project:{}"
- .format(username, projectname),
+ msg="Failed to create key-pair for user: {}, project:{}, status_code: {}, response: {}"
+ .format(username, projectname, response.status_code, response.text),
request=query, response=response)
diff --git a/keygen/src/copr_keygen/logic.py b/keygen/src/copr_keygen/logic.py
index 529786a..7b42747 100644
--- a/keygen/src/copr_keygen/logic.py
+++ b/keygen/src/copr_keygen/logic.py
@@ -137,9 +137,9 @@ def create_new_key(
log.error(err)
raise err
- log.debug("returncode: {}".format(handle.returncode))
- log.debug("stdout: {}".format(stdout))
- log.debug("stderr: {}".format(stderr))
+ log.info("returncode: {}".format(handle.returncode))
+ log.info("stdout: {}".format(stdout))
+ log.info("stderr: {}".format(stderr))
if handle.returncode == 0:
# TODO: validate that we really got armored gpg key
if not user_exists(app, name_email):
8 years, 2 months
[copr] master: create build-missing-builds.sh (0da343c)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 0da343c6eae31030172964547c770163dd7477dc
Author: Miroslav Such�� <msuchy(a)redhat.com>
Date: Fri Jan 29 15:54:03 2016 +0100
create build-missing-builds.sh
>---------------------------------------------------------------
.tito/build-missing-builds.sh | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/.tito/build-missing-builds.sh b/.tito/build-missing-builds.sh
new file mode 100755
index 0000000..f6a29b7
--- /dev/null
+++ b/.tito/build-missing-builds.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+pushd `dirname $0`/.. >/dev/null
+PROJECT=$1
+if [ -z "$PROJECT" ]; then
+ echo "usage: build-missing-builds.sh TARGET"
+ echo " where TARGET is either @copr or @copr-dev"
+ exit 1
+fi
+
+for package in $(cat .tito/packages/*| cut -d' ' -f2); do
+ pushd $package
+ tito release $PROJECT
+done
+
+popd >/dev/null
8 years, 2 months
[copr] master: convert bytes to utf-8 in Py3 (9c5aa4d)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 9c5aa4de043c667c4521b88d82c11f90c4589d96
Author: Miroslav Such�� <msuchy(a)redhat.com>
Date: Mon Feb 1 14:34:40 2016 +0100
convert bytes to utf-8 in Py3
>---------------------------------------------------------------
.tito/build-missing-builds.sh | 1 +
python/copr/client_v2/net_client.py | 5 ++++-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/.tito/build-missing-builds.sh b/.tito/build-missing-builds.sh
index f6a29b7..b88f5b5 100755
--- a/.tito/build-missing-builds.sh
+++ b/.tito/build-missing-builds.sh
@@ -11,6 +11,7 @@ fi
for package in $(cat .tito/packages/*| cut -d' ' -f2); do
pushd $package
tito release $PROJECT
+ popd
done
popd >/dev/null
diff --git a/python/copr/client_v2/net_client.py b/python/copr/client_v2/net_client.py
index 369b651..1a642fa 100644
--- a/python/copr/client_v2/net_client.py
+++ b/python/copr/client_v2/net_client.py
@@ -76,7 +76,10 @@ class ResponseWrapper(object):
"""
self.response = response
if response.status_code != 204 and response.content:
- self.json = json.loads(response.content)
+ if isinstance(response.content, bytes):
+ self.json = json.loads(response.content.decode('utf-8'))
+ else:
+ self.json = json.loads(response.content)
else:
self.json = None
8 years, 2 months