Removed dep on profile

Keywords:

(jgoerzen@complete.org--projects/offlineimap--head--1.0--patch-8)

diff --git a/ChangeLog b/ChangeLog
index 106f9f7616609d0ae69729d03d022f098a064953..531a57589d141941c90dc65afdba3fd6b35c1fff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,18 @@
 # arch-tag: automatic-ChangeLog--jgoerzen@complete.org--projects/offlineimap--head--1.0
 #
 
+2005-02-09 22:37:33 GMT        John Goerzen <jgoerzen@complete.org>    patch-8
+
+    Summary:
+      Removed dep on profile
+    Revision:
+      offlineimap--head--1.0--patch-8
+
+
+    modified files:
+     ChangeLog debian/changelog offlineimap/threadutil.py
+
+
 2005-01-17 14:07:35 GMT        John Goerzen <jgoerzen@complete.org>    patch-7
 
     Summary:

diff --git a/debian/changelog b/debian/changelog
index a54a9cc46fc98628cec06daef20778e7cb3f0921..79f38bcd8162a7172116d86e8dc975e22d034ff3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+offlineimap (4.0.9) unstable; urgency=low
+
+  * Removed dep on profile.py due to DFSG-free issues with it.
+    Closes: #294479.
+
+ -- John Goerzen <jgoerzen@complete.org>  Wed,  9 Feb 2005 16:34:50 -0600
+
 offlineimap (4.0.8) unstable; urgency=low
 
   * Added code to limit number of messages that get their flags set at

diff --git a/offlineimap/threadutil.py b/offlineimap/threadutil.py
index 87b8973aa7d1ac707707660eb5450367e7356d9f..1818cf87db0ba9e9dbb747a09ae03e2b51013960 100644 (file)
--- a/offlineimap/threadutil.py
+++ b/offlineimap/threadutil.py
@@ -18,7 +18,7 @@
 
 from threading import *
 from StringIO import StringIO
-import sys, traceback, thread, profile
+import sys, traceback, thread
 from offlineimap.ui import UIBase       # for getglobalui()
 
 profiledir = None
@@ -152,6 +152,7 @@ class ExitNotifyThread(Thread):
             if not profiledir:          # normal case
                 Thread.run(self)
             else:
+                import profile
                 prof = profile.Profile()
                 try:
                     prof = prof.runctx("Thread.run(self)", globals(), locals())