tMore style fixes + note on logging - amprolla - devuan's apt repo merger
HTML git clone git://parazyd.org/amprolla.git
DIR Log
DIR Files
DIR Refs
DIR README
DIR LICENSE
---
DIR commit 1226778224578a31af771a5879d90135aa2fb1ac
DIR parent 5df8c5c98b05552b52dafe784239e4067b223351
HTML Author: Merlijn Wajer <merlijn@wizzup.org>
Date: Sat, 20 May 2017 23:55:34 +0200
More style fixes + note on logging
Diffstat:
M amprolla-init | 4 ++--
M lib/log.py | 3 +++
M lib/net.py | 5 ++---
3 files changed, 7 insertions(+), 5 deletions(-)
---
DIR diff --git a/amprolla-init b/amprolla-init
t@@ -9,10 +9,10 @@ import lib.config as config
import lib.delta as delta
import lib.fs as fs
import lib.net as net
-from lib.log import die, notice, warn, cleanexit
+from lib.log import notice, warn
-def popDirs():
+def pop_dirs():
paths = fs.crawl()
notice("creating initial directory structure")
DIR diff --git a/lib/log.py b/lib/log.py
t@@ -2,6 +2,9 @@
# copyright (c) 2017 - Ivan J. <parazyd@dyne.org>
# see LICENSE file for copyright and license details
+# TODO: Replace with logging
+
+
import sys
DIR diff --git a/lib/net.py b/lib/net.py
t@@ -4,7 +4,6 @@
import requests
-import config
from log import die, notice, warn, cleanexit
t@@ -12,10 +11,10 @@ def download(url, path):
print("\tdownloading: %s\n\tto: %s" % (url, path))
r = requests.get(url, stream=True)
if r.status_code == 404:
- warn("not found!")
+ warn("download of %s failed: not found!", url)
return
elif r.status_code != 200:
- die("fail!")
+ die("download of %s failed", url)
with open(path, "wb") as f:
# XXX: should be more on gbit servers