aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-02-05 21:35:14 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-02-05 21:35:14 +0000
commit0341fcad8dedbac0b50d9466d97cab0c7e031bc1 (patch)
tree001353ce2a651e936cf3be40b032a37e510507cc
parent6feebcd2bc5c371eed33f49bf4322273d337242f (diff)
downloadpaludis-0341fcad8dedbac0b50d9466d97cab0c7e031bc1.tar.gz
paludis-0341fcad8dedbac0b50d9466d97cab0c7e031bc1.tar.xz
Fix duff warning notices caused by variable name collisions
-rw-r--r--paludis/portage_repository.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/paludis/portage_repository.cc b/paludis/portage_repository.cc
index 3ac748e..6c735fe 100644
--- a/paludis/portage_repository.cc
+++ b/paludis/portage_repository.cc
@@ -596,8 +596,8 @@ PortageRepository::do_version_metadata(
stringify(_implementation->location) + "/" + stringify(c) + "/" + stringify(p) + "/" +
stringify(p) + "-" + stringify(v) + ".ebuild'");
- PStream p(cmd);
- KeyValueConfigFile f(&p);
+ PStream prog(cmd);
+ KeyValueConfigFile f(&prog);
result->set(vmk_depend, f.get("DEPEND"));
result->set(vmk_rdepend, f.get("RDEPEND"));
@@ -615,7 +615,7 @@ PortageRepository::do_version_metadata(
result->set(vmk_eapi, f.get("EAPI"));
result->set(vmk_virtual, "");
- if (p.exit_status())
+ if (prog.exit_status())
{
Log::get_instance()->message(ll_warning, "Could not generate cache for '"
+ stringify(c) + "/" + stringify(p) + "-" + stringify(v) + "' in repository '"