[Apt-offline-devel] [SCM] Offline APT Package Manager branch, master, updated. 0.9.8-2-g4d4a599

[Ritesh Raj Sarraf]

The following commit has been merged in the master branch:
commit 4d4a599fba3f6f60d9c0a50401e790296d51e9d6
Author: Ritesh Raj Sarraf <rrs at researchut.com>
Date:   Fri Jun 18 19:51:39 2010 +0530

    fix dbts 584427

diff --git a/apt_offline_core/AptOfflineCoreLib.py b/apt_offline_core/AptOfflineCoreLib.py
index 81b8438..42cb79f 100644
--- a/apt_offline_core/AptOfflineCoreLib.py
+++ b/apt_offline_core/AptOfflineCoreLib.py
@@ -604,7 +604,11 @@ def fetcher( args ):
                                                         if bug_fetched is True:
                                                                 for x in os.listdir(os.curdir):
                                                                         if (x.startswith(PackageName) and x.endswith(apt_bug_file_format) ):
-                                                                                shutil.move(x, Str_DownloadDir)
+                                                                                try:
+                                                                                        shutil.move(x, Str_DownloadDir)
+                                                                                except:
+                                                                                        #INFO: This should fix DBTS #584427
+                                                                                        log.verbose("Exception thrown. Most likely it is because the cache_dir and download_dir locations are the same.\n")
                                                                                 log.verbose("Moved %s file to %s folder.%s\n" % (x, Str_DownloadDir, LINE_OVERWRITE_FULL) )
                                         #INFO: Damn!! The md5chesum didn't match :-(
                                         # The file is corrupted and we need to download a new copy from the internet

-- 
Offline APT Package Manager