Permalink
Browse files

fix merge.py merge feature - don't do it if a non-existent pkg has be…

…en specified
  • Loading branch information...
1 parent e44188f commit ef638349aaa0e37bc85ed3e78e20b012a0e968d3 @danielrobbins danielrobbins committed Mar 25, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 funtoo/scripts/merge_utils.py
@@ -356,7 +356,7 @@ def run(self,desttree):
if self.replace == True or (type(self.replace) == types.ListType and "%s/%s" % (cat,pkg) in self.replace):
if not os.path.exists(tcatdir):
os.makedirs(tcatdir)
- if isinstance(self.merge, list) and "%s/%s" % (cat,pkg) in self.merge:
+ if isinstance(self.merge, list) and "%s/%s" % (cat,pkg) in self.merge and os.path.isdir(tpkgdir):
pkgdir_manifest_file = open("%s/Manifest" % pkgdir)
tpkgdir_manifest_file = open("%s/Manifest" % tpkgdir)
pkgdir_manifest = pkgdir_manifest_file.readlines()

0 comments on commit ef63834

Please sign in to comment.