diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-07-06 00:37:28 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-07-06 00:37:28 +0000 |
| commit | 5f1edecd003bc92445c94d708c60863a65a073a5 (patch) | |
| tree | 077c884c9b002060bc8ef6cf1f1a3dc2fe9491bb | |
| parent | 617754d104bfb45348d53b5aaf00ef6fa113c2e7 (diff) | |
| download | portage-5f1edecd003bc92445c94d708c60863a65a073a5.tar.gz portage-5f1edecd003bc92445c94d708c60863a65a073a5.tar.bz2 portage-5f1edecd003bc92445c94d708c60863a65a073a5.zip | |
Fix emerge by tbz2 path so that it works properly.
svn path=/main/trunk/; revision=7171
| -rw-r--r-- | pym/emerge/__init__.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index 97fc49d8c..72573b552 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -1486,15 +1486,16 @@ class depgraph(object): else: print "\n\n!!! Binary package '"+str(x)+"' does not exist." print "!!! Please ensure the tbz2 exists as specified.\n" - sys.exit(1) + return 0, myfavorites mytbz2=portage.xpak.tbz2(x) mykey=mytbz2.getelements("CATEGORY")[0]+"/"+os.path.splitext(os.path.basename(x))[0] if os.path.realpath(x) != \ os.path.realpath(self.trees[myroot]["bintree"].getname(mykey)): print colorize("BAD", "\n*** You need to adjust PKGDIR to emerge this package.\n") - sys.exit(1) + return 0, myfavorites if not self.create(["binary", myroot, mykey], - None, "--onlydeps" not in self.myopts): + None, "--onlydeps" not in self.myopts, + myuse=mytbz2.getelements("USE"), arg=x): return (0,myfavorites) arg_atoms.append((x, "="+mykey)) elif ext==".ebuild": @@ -5940,7 +5941,6 @@ def emerge_main(): for x in myfiles: ext = os.path.splitext(x)[1] if (ext == ".ebuild" or ext == ".tbz2") and os.path.exists(os.path.abspath(x)): - print "emerging by path implies --oneshot... adding --oneshot to options." print colorize("BAD", "\n*** emerging by path is broken and may not always work!!!\n") break |