From 76c16149adf30919dbf925e4853b58624db03583 Mon Sep 17 00:00:00 2001 From: lxnay Date: Tue, 26 Aug 2008 11:29:25 +0000 Subject: [PATCH] Entropy/Server Interface: - export binary packages expiration days setting to server.conf git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@2339 cd1c1023-2f26-0410-ae45-c471fc1f0318 --- conf/server.conf.example | 15 ++++++++++++++- libraries/entropyConstants.py | 8 ++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/conf/server.conf.example b/conf/server.conf.example index eab77c6eb..6e542f9b0 100644 --- a/conf/server.conf.example +++ b/conf/server.conf.example @@ -12,6 +12,19 @@ # branches|3.5 +# +# Packages expiration days: +# expiration-days| +# +# +# Number of days after a binary package will be removed from its belonging repository if not available anymore (old files) +# +# example: +# expiration-days|15 +# +# expiration-days| + + # # syntax for officialserverrepositoryid: # @@ -30,4 +43,4 @@ officialserverrepositoryid|sabayonlinux.org # example: #| repository|sabayonlinux.org|Sabayon Linux Official Repository|ftp://user:pass@111.111.111.111/|http://svn.sabayonlinux.org/entropy|svn.sabayonlinux.org#1026,1027 # -# repository| \ No newline at end of file +# repository| diff --git a/libraries/entropyConstants.py b/libraries/entropyConstants.py index e9f3f38b6..4337b8c8c 100644 --- a/libraries/entropyConstants.py +++ b/libraries/entropyConstants.py @@ -1369,6 +1369,14 @@ def const_readServerSettings(): elif (line.find("officialserverrepositoryid|") != -1) and (not line.startswith("#")) and (len(line.split("|")) == 2): etpConst['officialserverrepositoryid'] = line.split("|")[1].strip() + elif (line.find("expiration-days|") != -1) and (not line.startswith("#")) and (len(line.split("|")) == 2): + mydays = line.split("|")[1].strip() + try: + mydays = int(mydays) + etpConst['packagesexpirationdays'] = mydays + except ValueError: + pass + elif line.startswith("repository|") and (len(line.split("|")) in [5,6]): repoid, repodata = const_extractServerRepositoryParameters(line)