Repository :
http://git.fedorahosted.org/cgit/copr.git
On branch : master
---------------------------------------------------------------
commit a2ab5c412b60498eed6053f4e8cb458ee3547f01
Author: Valentin Gologuzov <vgologuz(a)redhat.com>
Date: Thu Sep 18 14:51:12 2014 +0200
[backend][keygen] minor fixes/typos
---------------------------------------------------------------
backend/backend/sign.py | 10 +++++-----
backend/copr-backend.spec | 2 +-
keygen/copr-keygen.spec | 9 +++------
3 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/backend/backend/sign.py b/backend/backend/sign.py
index d46f3f1..a0cc930 100755
--- a/backend/backend/sign.py
+++ b/backend/backend/sign.py
@@ -33,10 +33,10 @@ def create_gpg_email(username, projectname):
def get_pubkey(username, projectname, outfile=None):
"""
- Re
+ Retrieves public key for user/project from signer host.
:param outfile: [optional] file to write obtained key
- :return:
+ :return: public keys
:raises: CoprSignError or CoprSignNoKeyError
"""
@@ -48,7 +48,7 @@ def get_pubkey(username, projectname, outfile=None):
stdout, stderr = handle.communicate()
except Exception as e:
raise CoprSignError("Failed to get user pubkey"
- " dut to: {}".format(e))
+ " due to: {}".format(e))
if handle.returncode != 0:
if "unknown key:" in stderr:
@@ -65,8 +65,8 @@ def get_pubkey(username, projectname, outfile=None):
if outfile:
with open(outfile, "w") as handle:
handle.write(stdout)
- else:
- return stdout
+
+ return stdout
def _sign_one(path, email, callback=None):
diff --git a/backend/copr-backend.spec b/backend/copr-backend.spec
index efd3d0d..ba0cd0d 100644
--- a/backend/copr-backend.spec
+++ b/backend/copr-backend.spec
@@ -51,7 +51,7 @@ Requires: logrotate
Requires: fedmsg
Requires: gawk
Requires: crontabs
-Requires: uwsgi
+
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
diff --git a/keygen/copr-keygen.spec b/keygen/copr-keygen.spec
index 17fda37..f31fa7d 100644
--- a/keygen/copr-keygen.spec
+++ b/keygen/copr-keygen.spec
@@ -14,7 +14,7 @@ License: GPLv2+
URL:
https://fedorahosted.org/copr/
# Source is created by
# git clone
https://git.fedorahosted.org/git/copr.git
-# cd copr/frontend
+# cd copr/keygen
# tito build --tgz
Source0: %{name}-%{version}.tar.gz
@@ -102,10 +102,6 @@ install -d -m 500 %{buildroot}%{_sharedstatedir}/copr-keygen/gnupg
install -d %{buildroot}%{_unitdir}/
-#%{__install} -p -m 0644 run/uwsgi.ini %{buildroot}%{_sysconfdir}/copr-keygen/
-#%{__install} -p -m 0644 run/copr-keygen.uwsgi.service
%{buildroot}%{_unitdir}/copr-keygen.uwsgi.service
-
-
%{__install} -p -m 0644 run/signd-copr.service
%{buildroot}%{_unitdir}/signd-copr.service
%{__install} -p -m 0644 run/gpg_copr.sh %{buildroot}/%{_bindir}/gpg_copr.sh
@@ -129,8 +125,9 @@ getent passwd copr-signer >/dev/null || \
%post
service httpd condrestart
-#service haveged enable
+%postun
+service httpd condrestart
%files
%doc LICENSE docs/INSTALL.rst docs/README.rst