diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 189d0a7..0000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -archivemail-0.7.2.tar.gz -archivemail-0.8.0.tar.gz -/archivemail-0.8.1.tar.gz -/archivemail-0.8.2.tar.gz -/archivemail-0.9.0.tar.gz diff --git a/archivemail b/archivemail deleted file mode 100644 index d77a1bf..0000000 --- a/archivemail +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env python2 -if __name__ == '__main__': - import sys - sys.path.insert(0, '/usr/share/archivemail') - from archivemail import main - main() diff --git a/archivemail-0.7.0-fpname.patch b/archivemail-0.7.0-fpname.patch deleted file mode 100644 index 6a385f9..0000000 --- a/archivemail-0.7.0-fpname.patch +++ /dev/null @@ -1,94 +0,0 @@ ---- archivemail 2006-11-03 01:21:22.000000000 +0200 -+++ archivemail 2007-05-10 12:04:16.000000000 +0300 -@@ -779,7 +779,10 @@ - # the headers have no valid dates -- last resort, try the file timestamp - # this will not work for mbox mailboxes - try: -- file_name = message.fp.name -+ if sys.hexversion >= 0x020500F0: -+ file_name = message.fp._file.name -+ else: -+ file_name = message.fp.name - except AttributeError: - # we are looking at a 'mbox' mailbox - argh! - # Just return the current time - this will never get archived :( -@@ -788,7 +791,7 @@ - if not os.path.isfile(file_name): - unexpected_error("mailbox file name '%s' has gone missing" % \ - file_name) -- time_message = os.path.getmtime(message.fp.name) -+ time_message = os.path.getmtime(file_name) - vprint("using valid time found from '%s' last-modification time" % \ - file_name) - return time_message -@@ -806,7 +809,11 @@ - """ - status = "" - x_status = "" -- match = re.search(":2,(.+)$", message.fp.name) -+ if sys.hexversion >= 0x020500F0: -+ fpname = message.fp._file.name -+ else: -+ fpname = message.fp.name -+ match = re.search(":2,(.+)$", fpname) - if match: - flags = match.group(1) - for flag in flags: -@@ -825,7 +832,7 @@ - - # files in the maildir 'cur' directory are no longer new, - # they are the same as messages with 'Status: O' headers in mbox -- last_dir = os.path.basename(os.path.dirname(message.fp.name)) -+ last_dir = os.path.basename(os.path.dirname(fpname)) - if last_dir == "cur": - status = status + "O" - -@@ -881,7 +888,10 @@ - return 1 - file_name = None - try: -- file_name = message.fp.name -+ if sys.hexversion >= 0x020500F0: -+ file_name = message.fp._file.name -+ else: -+ file_name = message.fp.name - except AttributeError: - pass - # maildir mailboxes use the filename suffix to indicate flagged status -@@ -901,7 +911,10 @@ - return 0 - file_name = None - try: -- file_name = message.fp.name -+ if sys.hexversion >= 0x020500F0: -+ file_name = message.fp._file.name -+ else: -+ file_name = message.fp.name - except AttributeError: - pass - # maildir mailboxes use the filename suffix to indicate read status -@@ -918,7 +931,10 @@ - file_name = None - message_size = None - try: -- file_name = message.fp.name -+ if sys.hexversion >= 0x020500F0: -+ file_name = message.fp._file.name -+ else: -+ file_name = message.fp.name - except AttributeError: - pass - if file_name: -@@ -1269,7 +1285,11 @@ - if type == "maildir": - add_status_headers(msg) - archive.write(msg) -- if not options.dry_run: delete_queue.append(msg.fp.name) -+ if sys.hexversion >= 0x020500F0: -+ fpname = msg.fp._file.name -+ else: -+ fpname = msg.fp.name -+ if not options.dry_run: delete_queue.append(fpname) - else: - vprint("decision: retain message") - msg = original.next() diff --git a/archivemail-0.7.0-imap.patch b/archivemail-0.7.0-imap.patch deleted file mode 100644 index 8461b31..0000000 --- a/archivemail-0.7.0-imap.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- archivemail 2007-02-17 10:32:39.000000000 +1000 -+++ archivemail 2007-02-17 10:34:51.000000000 +1000 -@@ -1299,7 +1299,8 @@ - imap_filter = build_imap_filter() - vprint("imap filter: '%s'" % imap_filter) - try: -- imap_username, imap_str = imap_str.split('@', 1) -+ imap_username, imap_str = re.split(r"(?, - # (C) 2006 Peter Poeml , diff --git a/archivemail-test-noshebang.patch b/archivemail-test-noshebang.patch deleted file mode 100644 index 763d34d..0000000 --- a/archivemail-test-noshebang.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- test_archivemail.py 2007-05-24 06:45:58.000000000 -0500 -+++ test_archivemail.py 2007-05-24 06:45:58.000000000 -0500 -@@ -1,4 +1,3 @@ --#! /usr/bin/env python - ############################################################################ - # Copyright (C) 2002 Paul Rodger - # (C) 2006 Nikolaus Schulz diff --git a/archivemail.spec b/archivemail.spec deleted file mode 100644 index b077487..0000000 --- a/archivemail.spec +++ /dev/null @@ -1,154 +0,0 @@ -Name: archivemail -Version: 0.9.0 -Release: 17%{?dist} -Summary: A tool for archiving and compressing old email in mailboxes - -License: GPLv2+ -URL: http://archivemail.sourceforge.net/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -# Small wrapper script for launching archivemail -Source1: archivemail -Source2: archivemail-README.tests -Patch2: archivemail-main-noshebang.patch -Patch3: archivemail-0.8.0-test_path.patch -BuildArch: noarch -BuildRequires: /usr/bin/pathfix.py, python2-devel -Requires: python2 - -%description -Archivemail is a tool written in Python for archiving and compressing old -email in mailboxes. It can move messages older than the specified number of -days to a separate mbox format mailbox that is compressed with gzip, or -optionally just delete old email. - -%prep -pathfix.py -pni "%{__python2} %{py2_shbang_opts}" . - -%setup -q -%patch2 -p0 -%patch3 -p0 - -%build - -%install -mkdir -p $RPM_BUILD_ROOT%{_bindir} -install -D -m 755 -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/archivemail -install -D -m 644 -p archivemail $RPM_BUILD_ROOT%{_datadir}/archivemail/archivemail.py -install -D -m 644 -p archivemail.1 $RPM_BUILD_ROOT%{_mandir}/man1/archivemail.1 -cp %{SOURCE2} . - -%files -%license COPYING -%doc archivemail.xml CHANGELOG FAQ README test_archivemail TODO examples archivemail-README.tests -%{_bindir}/archivemail -%{_datadir}/archivemail -%{_mandir}/man1/archivemail.1.gz - -%changelog -* Wed Jul 24 2019 Fedora Release Engineering - 0.9.0-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Feb 12 2019 Gwyn Ciesla - 0.9.10-16 -- Fix shebang to fix FTBFS. - -* Thu Jan 31 2019 Fedora Release Engineering - 0.9.0-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Sep 10 2018 Gwyn Ciesla - 0.9.0-14 -- Fix shebang handling. - -* Thu Jul 12 2018 Fedora Release Engineering - 0.9.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 0.9.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Feb 06 2018 Iryna Shcherbina - 0.9.0-11 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Wed Jul 26 2017 Fedora Release Engineering - 0.9.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 0.9.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 03 2016 Fedora Release Engineering - 0.9.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 0.9.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 0.9.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Aug 03 2013 Fedora Release Engineering - 0.9.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Feb 13 2013 Fedora Release Engineering - 0.9.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jul 18 2012 Fedora Release Engineering - 0.9.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jan 12 2012 Fedora Release Engineering - 0.9.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Sun Jul 10 2011 Jon Ciesla 0.9.0-1 -- New upstream release. - -* Mon Feb 07 2011 Fedora Release Engineering - 0.8.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Oct 18 2010 Jon Ciesla 0.8.2-1 -- New upstream release. - -* Fri Oct 01 2010 Jon Ciesla 0.8.1-1 -- New upstream release. - -* Mon Aug 09 2010 Jon Ciesla 0.8.0-1 -- New upstream release. -- Updated test patches, dropped patch fuzz. Finally. :) - -* Fri Jul 24 2009 Fedora Release Engineering - 0.7.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Mon Feb 23 2009 Fedora Release Engineering - 0.7.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Fri Sep 12 2008 Jon Ciesla 0.7.2-2 -- Introduced patch fuzz workaround, will fix. - -* Fri Nov 9 2007 Jon Ciesla 0.7.2-1 -- Update to 0.7.2. - -* Thu Nov 8 2007 Jon Ciesla 0.7.1-1 -- Update to 0.7.1. -- Updated test_archivemail.patch for new version. -- Removed fpname and imap patches, fixed by upstream. - -* Thu Aug 16 2007 Jon Ciesla 0.7.0-7 -- License tag correction. - -* Tue Jun 12 2007 Jon Ciesla 0.7.0-6 -- Patch to fix imap handling, BZ 243846. - -* Thu May 24 2007 Jon Ciesla 0.7.0-5 -- Applied upstream patch to fix issues with python 2.5. - -* Thu May 24 2007 Jon Ciesla 0.7.0-4 -- Removed shebang from test, main scripts. - -* Wed May 23 2007 Jon Ciesla 0.7.0-3 -- Added Readme about test script. - -* Wed May 23 2007 Francois Aucamp - 0.7.0-1.1 -- Example spec file using distributed file paths for unit tests - and the archivemail python module -- Added sed scripts to %%prep -- Moved chmod entries from %%build to %%prep, and cleaned them up -- Removed unnecessary %%doc entries -- Removed unnecessary versioned dependencies - -* Tue May 22 2007 Jon Ciesla 0.7.0-1 -- Initial packaging. diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..bb567a7 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Python 2 only. diff --git a/sources b/sources deleted file mode 100644 index fb8585c..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -ee36b3e8451ec563ae9338f3dd75e3f6 archivemail-0.9.0.tar.gz diff --git a/test_archivemail.patch b/test_archivemail.patch deleted file mode 100644 index d255f72..0000000 --- a/test_archivemail.patch +++ /dev/null @@ -1,364 +0,0 @@ ---- test_archivemail.py 2007-11-08 10:17:39.000000000 -0600 -+++ test_archivemail.py 2007-11-08 10:22:05.000000000 -0600 -@@ -30,6 +30,8 @@ - - """ - -+ARCHIVEMAIL_DATADIR = './' -+ - import sys - - def check_python_version(): -@@ -60,6 +62,7 @@ - import unittest - - try: -+ sys.path.insert(0, ARCHIVEMAIL_DATADIR) - import archivemail - except ImportError: - print "The archivemail script needs to be called 'archivemail.py'" -@@ -432,7 +435,7 @@ - if execute == "package": - archivemail.archive(self.mbox_name) - elif execute == "system": -- run = "./archivemail.py --quiet %s" % self.mbox_name -+ run = "python archivemail.py --quiet %s" % self.mbox_name - self.assertEqual(os.system(run), 0) - else: - sys.exit(1) -@@ -495,7 +498,7 @@ - self.mbox_name = make_mbox(messages=3, headers=headers) - self.copy_name = tempfile.mkstemp()[1] - shutil.copyfile(self.mbox_name, self.copy_name) -- run = "./archivemail.py -q %s %s" % (option, self.mbox_name) -+ run = "python archivemail.py -q %s %s" % (option, self.mbox_name) - self.assertEqual(os.system(run), 0) - assert(os.path.exists(self.mbox_name)) - self.assertEqual(os.path.getsize(self.mbox_name), 0) -@@ -512,7 +515,7 @@ - self.mbox_name = make_mbox(messages=3, headers=headers) - self.copy_name = tempfile.mkstemp()[1] - shutil.copyfile(self.mbox_name, self.copy_name) -- run = "./archivemail.py -q %s %s" % (option, self.mbox_name) -+ run = "python archivemail.py -q %s %s" % (option, self.mbox_name) - self.assertEqual(os.system(run), 0) - assert(os.path.exists(self.mbox_name)) - assert(filecmp.cmp(self.mbox_name, self.copy_name, shallow=0)) -@@ -532,7 +535,7 @@ - if execute == "package": - archivemail.archive(self.mbox_name) - elif execute == "system": -- run = "./archivemail.py --quiet %s" % self.mbox_name -+ run = "python archivemail.py --quiet %s" % self.mbox_name - self.assertEqual(os.system(run), 0) - else: - sys.exit(1) -@@ -557,7 +560,7 @@ - if execute == "package": - archivemail.archive(self.mbox_name) - elif execute == "system": -- run = "./archivemail.py --quiet %s" % self.mbox_name -+ run = "python archivemail.py --quiet %s" % self.mbox_name - self.assertEqual(os.system(run), 0) - else: - sys.exit(1) -@@ -585,7 +588,7 @@ - if execute == "package": - archivemail.archive(self.mbox_name) - elif execute == "system": -- run = "./archivemail.py --quiet %s" % self.mbox_name -+ run = "python archivemail.py --quiet %s" % self.mbox_name - self.assertEqual(os.system(run), 0) - else: - sys.exit(1) -@@ -680,7 +683,7 @@ - if execute == "package": - archivemail.archive(self.mbox_name) - elif execute == "system": -- run = "./archivemail.py --quiet %s" % self.mbox_name -+ run = "python archivemail.py --quiet %s" % self.mbox_name - self.assertEqual(os.system(run), 0) - else: - sys.exit(1) -@@ -703,7 +706,7 @@ - if execute == "package": - archivemail.archive(self.mbox_name) - elif execute == "system": -- run = "./archivemail.py --quiet %s" % self.mbox_name -+ run = "python archivemail.py --quiet %s" % self.mbox_name - self.assertEqual(os.system(run), 0) - else: - sys.exit(1) -@@ -726,7 +729,7 @@ - if execute == "package": - archivemail.archive(self.mbox_name) - elif execute == "system": -- run = "./archivemail.py --quiet %s" % self.mbox_name -+ run = "python archivemail.py --quiet %s" % self.mbox_name - self.assertEqual(os.system(run), 0) - else: - sys.exit(1) -@@ -760,11 +763,11 @@ - if execute == "package": - archivemail.archive(self.mbox_name) - elif execute == "system_long": -- run = "./archivemail.py --preserve-unread --quiet %s" % \ -+ run = "python archivemail.py --preserve-unread --quiet %s" % \ - self.mbox_name - self.assertEqual(os.system(run), 0) - elif execute == "system_short": -- run = "./archivemail.py -u --quiet %s" % self.mbox_name -+ run = "python archivemail.py -u --quiet %s" % self.mbox_name - self.assertEqual(os.system(run), 0) - else: - sys.exit(1) -@@ -788,11 +791,11 @@ - if execute == "package": - archivemail.archive(self.mbox_name) - elif execute == "system_long": -- run = "./archivemail.py --preserve-unread --quiet %s" % \ -+ run = "python archivemail.py --preserve-unread --quiet %s" % \ - self.mbox_name - self.assertEqual(os.system(run), 0) - elif execute == "system_short": -- run = "./archivemail.py -u --quiet %s" % self.mbox_name -+ run = "python archivemail.py -u --quiet %s" % self.mbox_name - self.assertEqual(os.system(run), 0) - else: - sys.exit(1) -@@ -825,11 +828,11 @@ - self.copy_name = tempfile.mkstemp()[1] - shutil.copyfile(self.mbox_name, self.copy_name) - if execute == "system_long": -- run = "./archivemail.py --quiet --suffix='%s' %s" % \ -+ run = "python archivemail.py --quiet --suffix='%s' %s" % \ - (suffix, self.mbox_name) - self.assertEqual(os.system(run), 0) - elif execute == "system_short": -- run = "./archivemail.py --quiet -s'%s' %s" % \ -+ run = "python archivemail.py --quiet -s'%s' %s" % \ - (suffix, self.mbox_name) - self.assertEqual(os.system(run), 0) - elif execute == "package": -@@ -876,10 +879,10 @@ - if execute == "package": - archivemail.archive(self.mbox_name) - elif execute == "system_long": -- run = "./archivemail.py --dry-run --quiet %s" % self.mbox_name -+ run = "python archivemail.py --dry-run --quiet %s" % self.mbox_name - self.assertEqual(os.system(run), 0) - elif execute == "system_short": -- run = "./archivemail.py -n --quiet %s" % self.mbox_name -+ run = "python archivemail.py -n --quiet %s" % self.mbox_name - self.assertEqual(os.system(run), 0) - else: - sys.exit(1) -@@ -912,10 +915,10 @@ - archivemail.options.days_old_max = 11 - archivemail.archive(self.mbox_name) - elif execute == "system": -- run = "./archivemail.py -d11 --quiet %s" % self.mbox_name -+ run = "python archivemail.py -d11 --quiet %s" % self.mbox_name - self.assertEqual(os.system(run), 0) - elif execute == "system_long": -- run = "./archivemail.py --days=11 --quiet %s" % self.mbox_name -+ run = "python archivemail.py --days=11 --quiet %s" % self.mbox_name - self.assertEqual(os.system(run), 0) - else: - sys.exit(1) -@@ -940,10 +943,10 @@ - archivemail.options.days_old_max = 11 - archivemail.archive(self.mbox_name) - elif execute == "system": -- run = "./archivemail.py -d11 --quiet %s" % self.mbox_name -+ run = "python archivemail.py -d11 --quiet %s" % self.mbox_name - self.assertEqual(os.system(run), 0) - elif execute == "system_long": -- run = "./archivemail.py --days=11 --quiet %s" % self.mbox_name -+ run = "python archivemail.py --days=11 --quiet %s" % self.mbox_name - self.assertEqual(os.system(run), 0) - else: - sys.exit(1) -@@ -981,7 +984,7 @@ - if execute == "package": - archivemail.archive(self.mbox_name) - elif execute == "system": -- run = "./archivemail.py --delete --quiet %s" % self.mbox_name -+ run = "python archivemail.py --delete --quiet %s" % self.mbox_name - self.assertEqual(os.system(run), 0) - else: - sys.exit(1) -@@ -1003,7 +1006,7 @@ - if execute == "package": - archivemail.archive(self.mbox_name) - elif execute == "system": -- run = "./archivemail.py --delete --quiet %s" % self.mbox_name -+ run = "python archivemail.py --delete --quiet %s" % self.mbox_name - self.assertEqual(os.system(run), 0) - else: - sys.exit(1) -@@ -1023,7 +1026,7 @@ - if execute == "package": - archivemail.archive(self.mbox_name) - elif execute == "system": -- run = "./archivemail.py --delete --quiet %s" % self.mbox_name -+ run = "python archivemail.py --delete --quiet %s" % self.mbox_name - self.assertEqual(os.system(run), 0) - else: - sys.exit(1) -@@ -1061,7 +1064,7 @@ - if execute == "package": - archivemail.archive(self.mbox_name) - elif execute == "system": -- run = "./archivemail.py --copy --quiet %s" % self.mbox_name -+ run = "python archivemail.py --copy --quiet %s" % self.mbox_name - self.assertEqual(os.system(run), 0) - else: - sys.exit(1) -@@ -1087,7 +1090,7 @@ - if execute == "package": - archivemail.archive(self.mbox_name) - elif execute == "system": -- run = "./archivemail.py --copy --quiet %s" % self.mbox_name -+ run = "python archivemail.py --copy --quiet %s" % self.mbox_name - self.assertEqual(os.system(run), 0) - else: - sys.exit(1) -@@ -1113,7 +1116,7 @@ - if execute == "package": - archivemail.archive(self.mbox_name) - elif execute == "system": -- run = "./archivemail.py --copy --quiet %s" % self.mbox_name -+ run = "python archivemail.py --copy --quiet %s" % self.mbox_name - self.assertEqual(os.system(run), 0) - else: - sys.exit(1) -@@ -1153,7 +1156,7 @@ - archivemail.options.include_flagged = 0 - archivemail.archive(self.mbox_name) - elif execute == "system": -- run = "./archivemail.py --quiet %s" % self.mbox_name -+ run = "python archivemail.py --quiet %s" % self.mbox_name - self.assertEqual(os.system(run), 0) - else: - sys.exit(1) -@@ -1175,7 +1178,7 @@ - archivemail.options.include_flagged = 1 - archivemail.archive(self.mbox_name) - elif execute == "system": -- run = "./archivemail.py --include-flagged --quiet %s" % \ -+ run = "python archivemail.py --include-flagged --quiet %s" % \ - self.mbox_name - self.assertEqual(os.system(run), 0) - else: -@@ -1198,7 +1201,7 @@ - archivemail.options.include_flagged = 1 - archivemail.archive(self.mbox_name) - elif execute == "system": -- run = "./archivemail.py --include-flagged --quiet %s" % \ -+ run = "python archivemail.py --include-flagged --quiet %s" % \ - self.mbox_name - self.assertEqual(os.system(run), 0) - else: -@@ -1237,11 +1240,11 @@ - archivemail.options.output_dir = self.dir_name - archivemail.archive(self.mbox_name) - elif execute == "system_long": -- run = "./archivemail.py --output-dir=%s --quiet %s" % \ -+ run = "python archivemail.py --output-dir=%s --quiet %s" % \ - (self.dir_name, self.mbox_name) - self.assertEqual(os.system(run), 0) - elif execute == "system_short": -- run = "./archivemail.py -o%s --quiet %s" % \ -+ run = "python archivemail.py -o%s --quiet %s" % \ - (self.dir_name, self.mbox_name) - self.assertEqual(os.system(run), 0) - else: -@@ -1286,7 +1289,7 @@ - if execute == "package": - archivemail.archive(self.mbox_name) - elif execute == "system": -- run = "./archivemail.py --no-compress --quiet %s" % \ -+ run = "python archivemail.py --no-compress --quiet %s" % \ - self.mbox_name - self.assertEqual(os.system(run), 0) - else: -@@ -1312,7 +1315,7 @@ - if execute == "package": - archivemail.archive(self.mbox_name) - elif execute == "system": -- run = "./archivemail.py --no-compress --quiet %s" % \ -+ run = "python archivemail.py --no-compress --quiet %s" % \ - self.mbox_name - self.assertEqual(os.system(run), 0) - else: -@@ -1338,7 +1341,7 @@ - if execute == "package": - archivemail.archive(self.mbox_name) - elif execute == "system": -- run = "./archivemail.py --no-compress --quiet %s" % \ -+ run = "python archivemail.py --no-compress --quiet %s" % \ - self.mbox_name - self.assertEqual(os.system(run), 0) - else: -@@ -1365,7 +1368,7 @@ - if execute == "package": - archivemail.archive(self.mbox_name) - elif execute == "system": -- run = "./archivemail.py --no-compress --quiet %s" % \ -+ run = "python archivemail.py --no-compress --quiet %s" % \ - self.mbox_name - self.assertEqual(os.system(run), 0) - else: -@@ -1404,11 +1407,11 @@ - archivemail.options.min_size = size_arg - archivemail.archive(self.mbox_name) - elif execute == "system_long": -- run = "./archivemail.py --size=%d --quiet %s" % \ -+ run = "python archivemail.py --size=%d --quiet %s" % \ - (size_arg, self.mbox_name) - self.assertEqual(os.system(run), 0) - elif execute == "system_short": -- run = "./archivemail.py -S%d --quiet %s" % \ -+ run = "python archivemail.py -S%d --quiet %s" % \ - (size_arg, self.mbox_name) - self.assertEqual(os.system(run), 0) - else: -@@ -1435,11 +1438,11 @@ - archivemail.options.min_size = size_arg - archivemail.archive(self.mbox_name) - elif execute == "system_long": -- run = "./archivemail.py --size=%d --quiet %s" % \ -+ run = "python archivemail.py --size=%d --quiet %s" % \ - (size_arg, self.mbox_name) - self.assertEqual(os.system(run), 0) - elif execute == "system_short": -- run = "./archivemail.py -S%d --quiet %s" % \ -+ run = "python archivemail.py -S%d --quiet %s" % \ - (size_arg, self.mbox_name) - self.assertEqual(os.system(run), 0) - else: -@@ -1472,7 +1475,7 @@ - if execute == "package": - archivemail.archive(self.mbox_name) - elif execute == "system": -- run = "./archivemail.py --quiet %s" % self.mbox_name -+ run = "python archivemail.py --quiet %s" % self.mbox_name - self.assertEqual(os.system(run), 0) - else: - sys.exit(1) -@@ -1495,7 +1498,7 @@ - if execute == "package": - archivemail.archive(self.mbox_name) - elif execute == "system": -- run = "./archivemail.py --quiet %s" % self.mbox_name -+ run = "python archivemail.py --quiet %s" % self.mbox_name - self.assertEqual(os.system(run), 0) - else: - sys.exit(1) -@@ -1567,4 +1570,5 @@ - - - if __name__ == "__main__": -+ os.chdir(ARCHIVEMAIL_DATADIR) - unittest.main()