[Apt-offline-devel] [SCM] Offline APT Package Manager branch, master, updated. 0.9.5-20-g43fcee5

[Ritesh Raj Sarraf]

The following commit has been merged in the master branch:
commit 43fcee55a253c98e427bd5a9682fe1e26911c89b
Author: Ritesh Raj Sarraf <rrs at researchut.com>
Date:   Thu Dec 17 13:20:25 2009 +0530

    Be more specific when unlinking the file
    
    Hopefully fixes the following exception.
    Note: This exception was only seen once during a large package list
    download (350+ package debs download).
    
    Exception in thread Thread-2:
    Traceback (most recent call last):
      File "/usr/lib/python2.5/threading.py", line 486, in __bootstrap_inner
        self.run()
      File "/usr/lib/python2.5/threading.py", line 446, in run
        self.__target(*self.__args, **self.__kwargs)
      File "/home/rrs/devel/apt-offline/apt-offline/AptOfflineCoreLib.py",
    line 685, in run
        if FetchBugReportsDebian.FetchBugsDebian( PackageName ) in [1, 2]:
      File "/home/rrs/devel/apt-offline/apt-offline/AptOfflineCoreLib.py",
    line 168, in FetchBugsDebian
        self.AddToArchive( self.ArchiveFile )
      File "/home/rrs/devel/apt-offline/apt-offline/AptOfflineCoreLib.py",
    line 181, in AddToArchive
        os.unlink(self.fileName)
    OSError: [Errno 2] No such file or directory:
    'epiphany-browser.556393.__apt__bug__report'

diff --git a/AptOfflineCoreLib.py b/AptOfflineCoreLib.py
index 9c2043b..e616553 100644
--- a/AptOfflineCoreLib.py
+++ b/AptOfflineCoreLib.py
@@ -154,7 +154,8 @@ class FetchBugReports( AptOfflineLib.Archiver ):
                                                         self.fileName = PackageName + "." + bug_num + "." + self.apt_bug
                                                         file_handle = open( self.fileName, 'w' )
                                                 else:
-                                                        file_handle = open( Filename, 'a' )
+                                                        self.fileName = Filename
+                                                        file_handle = open( self.fileName, 'a' )
                             
                                                 file_handle.write( data[0] + "\n\n" )
                                                 for x in data[1]:
@@ -165,7 +166,7 @@ class FetchBugReports( AptOfflineLib.Archiver ):
                                                 file_handle.close()
                                                 #We're adding to an archive file here.
                                                 if self.lock:
-                                                        self.AddToArchive( self.ArchiveFile )
+                                                        self.AddToArchive( self.ArchiveFile, self.fileName )
                                                 atleast_one_bug_report_downloaded = True
                         if atleast_one_bug_report_downloaded:
                                 return 2
@@ -176,9 +177,9 @@ class FetchBugReports( AptOfflineLib.Archiver ):
                         # We shouldn't be returning False
                         return 1
                 
-        def AddToArchive(self, ArchiveFile):
-                if self.compress_the_file(self.ArchiveFile, self.fileName):
-                        os.unlink(self.fileName)
+        def AddToArchive(self, ArchiveFile, fileName):
+                if self.compress_the_file(ArchiveFile, fileName):
+                        os.unlink(fileName)
                 return True
         
         

-- 
Offline APT Package Manager