diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-04-10 21:08:42 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-04-10 21:08:42 +0000 |
| commit | bc917674e146aa632b3f634bda51024a33c8c5e5 (patch) | |
| tree | d9fab6533527e9950d590eea8d9e8b74b3f03cf4 /bin/emerge | |
| parent | 426400b0e6c7f90b55b058fdd5a1f6daf112aa85 (diff) | |
| download | portage-bc917674e146aa632b3f634bda51024a33c8c5e5.tar.gz portage-bc917674e146aa632b3f634bda51024a33c8c5e5.tar.bz2 portage-bc917674e146aa632b3f634bda51024a33c8c5e5.zip | |
Rename variable pkg_cpv to pkg_str. (trunk r9821)
svn path=/main/branches/2.1.2/; revision=9822
Diffstat (limited to 'bin/emerge')
| -rwxr-xr-x | bin/emerge | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/bin/emerge b/bin/emerge index e9e6e1440..29fdd0d3e 100755 --- a/bin/emerge +++ b/bin/emerge @@ -4232,21 +4232,21 @@ class depgraph(object): # This is reported elsewhere if relevant. pass - def pkgprint(pkg_cpv): + def pkgprint(pkg_str): if pkg_merge: if pkg_system: - return colorize("PKG_MERGE_SYSTEM", pkg_cpv) + return colorize("PKG_MERGE_SYSTEM", pkg_str) elif pkg_world: - return colorize("PKG_MERGE_WORLD", pkg_cpv) + return colorize("PKG_MERGE_WORLD", pkg_str) else: - return colorize("PKG_MERGE", pkg_cpv) + return colorize("PKG_MERGE", pkg_str) else: if pkg_system: - return colorize("PKG_NOMERGE_SYSTEM", pkg_cpv) + return colorize("PKG_NOMERGE_SYSTEM", pkg_str) elif pkg_world: - return colorize("PKG_NOMERGE_WORLD", pkg_cpv) + return colorize("PKG_NOMERGE_WORLD", pkg_str) else: - return colorize("PKG_NOMERGE", pkg_cpv) + return colorize("PKG_NOMERGE", pkg_str) if x[1]!="/": if myoldbest: |