Repository :
http://git.fedorahosted.org/cgit/copr.git
On branch : master
---------------------------------------------------------------
commit 513441f93ca10e58cb61d262f0db57f0090171f0
Author: Valentin Gologuzov <vgologuz(a)redhat.com>
Date: Tue Mar 24 14:09:34 2015 +0100
[backend] ensure that prune script running under the copr user; simpler
`copr_find_obsolete_builds`
---------------------------------------------------------------
backend/run/copr_find_obsolete_builds.sh | 3 +--
backend/run/copr_prune_results.py | 15 ++++++++++-----
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/backend/run/copr_find_obsolete_builds.sh
b/backend/run/copr_find_obsolete_builds.sh
index dcd3e34..e46df34 100755
--- a/backend/run/copr_find_obsolete_builds.sh
+++ b/backend/run/copr_find_obsolete_builds.sh
@@ -6,7 +6,7 @@ DAYS=$2
echo "# looking for obsolete files in: " $CHROOT_PATH
if [ -d $CHROOT_PATH ]
then
- pushd $CHROOT_PATH >/dev/null
+ cd $CHROOT_PATH
# query latest (sucessfull) packages
LATEST_PKGS=$(mktemp)
@@ -33,5 +33,4 @@ then
done
rm -f $LATEST_PKGS $ERR_LOG
- popd >/dev/null
fi
diff --git a/backend/run/copr_prune_results.py b/backend/run/copr_prune_results.py
index d9445fd..de96dc3 100644
--- a/backend/run/copr_prune_results.py
+++ b/backend/run/copr_prune_results.py
@@ -11,6 +11,7 @@ import sys
import logging
from subprocess import Popen, PIPE
import time
+import pwd
log = logging.getLogger(__name__)
@@ -156,8 +157,12 @@ def main():
pruner.run()
if __name__ == "__main__":
- logging.basicConfig(
- filename="/var/log/copr/prune_old.log",
- format='[%(asctime)s][%(levelname)6s]: %(message)s',
- level=logging.INFO)
- main()
+ if pwd.getpwuid(os.getuid())[0] != "copr":
+ print("This script should be executed under the `copr` user")
+ sys.exit(1)
+ else:
+ logging.basicConfig(
+ filename="/var/log/copr/prune_old.log",
+ format='[%(asctime)s][%(levelname)6s]: %(message)s',
+ level=logging.INFO)
+ main()