aboutsummaryrefslogtreecommitdiff
path: root/src/clients/cave/cmd_graph_jobs.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-05-19 14:20:48 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-05-19 20:52:24 +0100
commite52571861104efe6139b78b22557211f08025f11 (patch)
tree634bec98491886d12f8f5a25b24f4cacf8d69de5 /src/clients/cave/cmd_graph_jobs.cc
parent80bf4ad14bfd8ab74a9c0d5f203ad5a370351def (diff)
downloadpaludis-e52571861104efe6139b78b22557211f08025f11.tar.gz
paludis-e52571861104efe6139b78b22557211f08025f11.tar.xz
Revert the package dep spec changes
Diffstat (limited to 'src/clients/cave/cmd_graph_jobs.cc')
-rw-r--r--src/clients/cave/cmd_graph_jobs.cc17
1 files changed, 6 insertions, 11 deletions
diff --git a/src/clients/cave/cmd_graph_jobs.cc b/src/clients/cave/cmd_graph_jobs.cc
index 34ba7d7d8..5583422b7 100644
--- a/src/clients/cave/cmd_graph_jobs.cc
+++ b/src/clients/cave/cmd_graph_jobs.cc
@@ -21,9 +21,7 @@
#include "resolve_cmdline.hh"
#include "exceptions.hh"
#include "command_command_line.hh"
-
#include <paludis/args/do_help.hh>
-
#include <paludis/util/safe_ifstream.hh>
#include <paludis/util/make_named_values.hh>
#include <paludis/util/make_shared_copy.hh>
@@ -33,16 +31,13 @@
#include <paludis/util/fs_path.hh>
#include <paludis/util/join.hh>
#include <paludis/util/process.hh>
-
#include <paludis/resolver/job_list.hh>
#include <paludis/resolver/job_lists.hh>
#include <paludis/resolver/job.hh>
#include <paludis/resolver/job_requirements.hh>
-
#include <paludis/serialise-impl.hh>
#include <paludis/dep_spec.hh>
#include <paludis/name.hh>
-#include <paludis/package_dep_spec_requirement.hh>
#include <iostream>
#include <cstdlib>
@@ -91,15 +86,15 @@ namespace
std::string short_spec(const PackageDepSpec & p, bool full)
{
- if (full || ! p.package_name_requirement())
+ if (full || ! p.package_ptr())
return stringify(p);
else
{
- std::string result(stringify(p.package_name_requirement()->name().package()));
- if (p.exact_slot_requirement())
- result = result + ":" + stringify(p.exact_slot_requirement()->name());
- if (p.in_repository_requirement())
- result = result + "::" + stringify(p.in_repository_requirement()->name());
+ std::string result(stringify(p.package_ptr()->package()));
+ if (p.slot_requirement_ptr())
+ result = result + stringify(*p.slot_requirement_ptr());
+ if (p.in_repository_ptr())
+ result = result + "::" + stringify(*p.in_repository_ptr());
return result;
}
}