update to subdir mgmt, active work undergoing on kant, and some notes for future projects for arch pkg mgmt

This commit is contained in:
brent s
2017-09-03 09:25:13 -04:00
parent efa84759da
commit eddf7750c7
3 changed files with 108 additions and 6 deletions

View File

@@ -107,7 +107,14 @@ def getKeys(args):
return(allkeys)
def sigKeys(keyids):
pass
# Map the trust levels to "human" equivs
trustmap = {0: 'unknown',
1: 'untrusted',
2: 'marginal',
3: 'full',
4: 'ultimate'}
def promptTrust(kinfo):
trust = input('\nWhat trust level should we sign {0} ({1} <{2}>) with?'.format(kinfo['fpr'], kinfo['name'], kinfo['email']))
def modifyDirmngr(op, args):
if not args['keyservers']:

View File

@@ -70,16 +70,19 @@ def destPrep():
nowdir = os.path.join(sks['destdir'], NOWstr)
curdir = os.path.join(sks['destdir'], 'current')
PAST = NOW - datetime.timedelta(days = sks['days'])
for thisdir, dirs, files in os.walk(sks['destdir']):
for thisdir, dirs, files in os.walk(sks['destdir'], topdown = False):
for f in files:
fstat = os.stat(os.path.join(thisdir, f))
mtime = fstat.st_mtime
if int(mtime) < PAST.timestamp():
os.remove(os.path.join(thisdir, f))
try:
os.removedirs(sks['destdir']) # Remove empty dirs
except:
pass # thisisfine.jpg
# Delete if empty dir
if len(os.listdir(thisdir)) == 0:
os.rmdir(thisdir)
#try:
# os.removedirs(sks['destdir']) # Remove empty dirs
#except:
# pass # thisisfine.jpg
os.makedirs(nowdir, exist_ok = True)
if getpass.getuser() == 'root':
uid = getpwnam(sks['user']).pw_uid
@@ -119,6 +122,9 @@ def compressDB():
for f in files:
fullpath = os.path.join(thisdir, f)
newfile = '{0}.{1}'.format(fullpath, sks['compress'])
# TODO: add compressed tarball support.
# However, I can't do this on memory-constrained systems for lrzip.
# See: https://github.com/kata198/python-lrzip/issues/1
with open(sks['logfile'], 'a') as f:
f.write('===== {0} Now compressing {1} =====\n'.format(str(datetime.datetime.utcnow()), fullpath))
if sks['compress'].lower() == 'gz':