diff options
| -rwxr-xr-x | createproject.sh | 14 | ||||
| -rwxr-xr-x | hemiptera | 13 |
2 files changed, 18 insertions, 9 deletions
diff --git a/createproject.sh b/createproject.sh index 8bc4193..87ec315 100755 --- a/createproject.sh +++ b/createproject.sh @@ -2,29 +2,29 @@ ### Tool to create projects manually. -[ -d projects ] || { echo "projects/ dir not found. Please enter the hemiptera base directory." >/dev/stderr; exit 1; } +[ -d projects ] || { echo "projects/ dir not found. Please enter the hemiptera base directory." >&2; exit 1; } -[ -z "$1" ] && { echo "Usage: $0 PRNAME">/dev/stderr; exit 1; } +[ -z "$1" ] && { echo "Usage: $0 PRNAME">&2; exit 1; } -[ -d "projects/$1" ] && { echo "project $1 already exists. Not creating" >/dev/stderr; exit 1; } +[ -d "projects/$1" ] && { echo "project $1 already exists. Not creating" >&2; exit 1; } mkdir "projects/$1" while true; do read -p "Enter name of developer, leave blank to end list > " dev case $dev in - '') echo "Dev list written." > /dev/stderr; break;; + '') echo "Dev list written." >&2; break;; * ) echo "$dev" >> "projects/$1/devs.txt" ;; esac done -echo "Please enter a description, enter a blank line to end description:" > /dev/stderr +echo "Please enter a description, enter a blank line to end description:" >&2 while true; do read -p "> " line case $line in - '') echo "Description written." > /dev/stderr; break;; + '') echo "Description written." >&2; break;; * ) echo "$line" >> "projects/$1/description.txt" ;; esac done -echo "Project created." > /dev/stderr +echo "Project created." >&2 @@ -113,7 +113,11 @@ def write_message(path, m) : def get_message_data(m) : """ returns subject and content of message """ - content = m.get_body("plain").get_content() + content = "" + try : + content = m.get_body("plain").get_content() + except : + pass subject = m["Subject"] return subject,content @@ -147,7 +151,10 @@ The TrustedDate Parameter indicates whether the date from the message """ m = email.message.EmailMessage() - m.set_payload(msg.get_body("plain").get_content(), charset="utf-8") + try : + m.set_payload(msg.get_body("plain").get_content(), charset="utf-8") + except : + m.set_payload("", charset="utf-8") m["From"] = get_from_addr(msg) m["To"] = get_to_addr(msg) m["Subject"] = msg["Subject"] @@ -291,6 +298,8 @@ def import_bugs() : os.remove(opj(inbox, i)) def process_message(m) : + if "MAILER-DAEMON" in get_from_addr(m) : + return toaddr = get_to_addr(m) os.makedirs(bugdir, exist_ok=True) dest = toaddr.split("@")[0] |