Fix the last revision so it also works for files copied from local fsmirrors.
authorZac Medico <zmedico@gentoo.org>
Fri, 26 May 2006 03:38:57 +0000 (03:38 -0000)
committerZac Medico <zmedico@gentoo.org>
Fri, 26 May 2006 03:38:57 +0000 (03:38 -0000)
svn path=/main/trunk/; revision=3417

pym/portage.py

index 9ab6ad76e903171c24b65182b70dd295c23a43f4..761e14ed8aa3c7c0b101fa82f99e28a18786b5a7 100644 (file)
@@ -1923,9 +1923,11 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
                                                writemsg(_("Local mirror has file: %(file)s\n" % {"file":myfile}))
                                                shutil.copyfile(mydir+"/"+myfile,destdir+"/"+myfile)
                                                break
-                       else:
+                       try:
                                apply_secpass_permissions(os.path.join(mysettings["DISTDIR"], myfile), gid=portage_gid,
                                        mode=0664, mask=02)
+                       except portage_exception.FileNotFound:
+                               pass
                except (OSError,IOError),e:
                        # file does not exist
                        writemsg(_("!!! %(file)s not found in %(dir)s\n") % {"file":myfile, "dir":mysettings["DISTDIR"]})