Merge branch 'master' of github.com:TracyWebTech/colab

Luan
2 parents cf44a3ad 915e79f8
Showing 3 changed files with 33 additions and 21 deletions Show diff stats
puppet/bootstrap.sh
src/super_archives/management/commands/import_emails.py
src/super_archives/management/commands/message.py
 #!/bin/bash
-PUPPET_VERSION=`dpkg -l | grep puppet-common | awk '{ print $3 }'`
+PUPPET_VERSION=`dpkg -l | grep puppet-common | awk '{ print $3 }' | cut -d- -f1`
+dpkg --compare-versions "$PUPPET_VERSION" "<" "3.3" ; OUTDATED=$?
-if [ "$PUPPET_VERSION" != '3.2.3-1puppetlabs1' ] ; then 
+if [ $OUTDATED -eq 0 ] ; then
     wget -O /tmp/puppet_apt.deb http://apt.puppetlabs.com/puppetlabs-release-precise.deb &> /dev/null
     dpkg -i /tmp/puppet_apt.deb
     DEBIAN_FRONTEND=noninteractive apt-get update -y
@@ -13,8 +13,10 @@ from django.db import transaction
 from django.template.defaultfilters import slugify
 from django.core.management.base import BaseCommand, CommandError
-from super_archives.models import MailingList, Message, Thread, EmailAddress
-from super_archives.management.commands.message import Message as CustomMessage
+from colab.super_archives.models import MailingList, Message, \
+                                        Thread, EmailAddress
+from colab.super_archives.management.commands.message import Message as \
+                                                             CustomMessage
 class Command(BaseCommand, object):
@@ -149,6 +151,10 @@ class Command(BaseCommand, object):
     def save_email(self, list_name, email_msg, index):
         """Save email message into the database."""
+        msg_id = email_msg.get('Message-ID')
+        if not msg_id:
+            return
+
         # Update last imported message into the DB
         mailinglist, created = MailingList.objects.get_or_create(name=list_name)
         mailinglist.last_imported_index = index
@@ -162,7 +168,7 @@ class Command(BaseCommand, object):
             # If the message is already at the database don't do anything
             try:
                 messages = Message.objects.get(
-                    message_id=email_msg.get('Message-ID'),
+                    message_id=msg_id,
                     thread__mailinglist=mailinglist
                 )
@@ -172,6 +178,9 @@ class Command(BaseCommand, object):
         mailinglist.save()
     def create_email(self, mailinglist, email_msg):
+        received_time = email_msg.get_received_datetime()
+        if not received_time:
+            return
         real_name, from_ = email_msg.get_from_addr()
@@ -13,35 +13,35 @@ import chardet
 def get_charset(message, default='ASCII'):
     """Get the message charset"""
-    charset = message.get_content_charset() 
-    
+    charset = message.get_content_charset()
+
     if not charset:
         charset = message.get_charset()
-    
+
     if not charset:
         charset = default
-        
+
     try:
         codecs.lookup(charset)
     except LookupError:
         charset = default
-        
+
     return charset
-    
+
 class Message(mailbox.mboxMessage):
-    
+
     RECEIVED_DELIMITER = re.compile('\n|;')
-    
+
     def get_subject(self):
         subject = email.header.decode_header(self['Subject'])
-                
+
         if isinstance(subject, list):
             new_subject = u''
             for text_part, encoding in subject:
                 if not encoding:
                     encoding = get_charset(self)
-                
+
                 try:
                     new_subject += unicode(text_part, encoding)
                 except (UnicodeDecodeError, LookupError):
@@ -50,7 +50,7 @@ class Message(mailbox.mboxMessage):
                     except (UnicodeDecodeError, LookupError):
                         encoding = chardet.detect(text_part)['encoding']
                         new_subject += unicode(text_part, encoding)
-        
+
         return ''.join(new_subject)
     def get_body(self):
@@ -77,25 +77,27 @@ class Message(mailbox.mboxMessage):
                            get_charset(self),
                            "replace")
             return body.strip()
-        
+
     def get_received_datetime(self):
+        if not self.has_key('Received'):
+            return None
         # The time received should always be the last element
-        #   in the `Received` attribute from the message headers   
+        #   in the `Received` attribute from the message headers
         received_header = self.RECEIVED_DELIMITER.split(self['Received'])
         received_time_header = received_header[-1].strip()
-        
+
         date_tuple = email.utils.parsedate_tz(received_time_header)
         utc_timestamp = email.utils.mktime_tz(date_tuple)
         utc_datetime = datetime.datetime.fromtimestamp(utc_timestamp,
                                                        pytz.utc)
         return utc_datetime
-        
+
     def get_from_addr(self):
         real_name_raw, from_ = email.utils.parseaddr(self['From'])
         real_name_str, encoding = email.header.decode_header(real_name_raw)[0]
         if not encoding:
             encoding = 'ascii'
-        
+
         real_name = unicode(real_name_str, encoding, errors='replace')
         return real_name, from_
1	#!/bin/bash	1	#!/bin/bash
2		2
3	-PUPPET_VERSION=`dpkg -l \| grep puppet-common \| awk '{ print $3 }'`	3	+PUPPET_VERSION=`dpkg -l \| grep puppet-common \| awk '{ print $3 }' \| cut -d- -f1`
		4	+dpkg --compare-versions "$PUPPET_VERSION" "<" "3.3" ; OUTDATED=$?
4		5
5	-if [ "$PUPPET_VERSION" != '3.2.3-1puppetlabs1' ] ; then	6	+if [ $OUTDATED -eq 0 ] ; then
6	wget -O /tmp/puppet_apt.deb http://apt.puppetlabs.com/puppetlabs-release-precise.deb &> /dev/null	7	wget -O /tmp/puppet_apt.deb http://apt.puppetlabs.com/puppetlabs-release-precise.deb &> /dev/null
7	dpkg -i /tmp/puppet_apt.deb	8	dpkg -i /tmp/puppet_apt.deb
8	DEBIAN_FRONTEND=noninteractive apt-get update -y	9	DEBIAN_FRONTEND=noninteractive apt-get update -y