aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-02-15 16:22:21 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-02-15 16:22:21 +0000
commit714e1588eaeb13e2b8bfe1e7616543440f9638ae (patch)
tree5b355bf5bc541a09c3a819263746ea4e20f1b5ea
parentc3845ceae3e99fc49ac1e5ee4102a1d319292fe9 (diff)
downloadpaludis-714e1588eaeb13e2b8bfe1e7616543440f9638ae.tar.gz
paludis-714e1588eaeb13e2b8bfe1e7616543440f9638ae.tar.xz
Include --destinations in resume command.
-rw-r--r--src/clients/paludis/Makefile.am2
-rw-r--r--src/clients/paludis/install.cc7
2 files changed, 8 insertions, 1 deletions
diff --git a/src/clients/paludis/Makefile.am b/src/clients/paludis/Makefile.am
index f253b0c..a9581d7 100644
--- a/src/clients/paludis/Makefile.am
+++ b/src/clients/paludis/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src @PALUDIS_CXXFLAGS@
+AM_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_NO_WOLD_STYLE_CAST@
DEFS= \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DDATADIR=\"$(datadir)\" \
diff --git a/src/clients/paludis/install.cc b/src/clients/paludis/install.cc
index 63838c3..0272536 100644
--- a/src/clients/paludis/install.cc
+++ b/src/clients/paludis/install.cc
@@ -87,6 +87,13 @@ namespace
resume_command = resume_command + " --" + CommandLine::get_instance()->a_add_to_world_atom.long_name()
+ " '( " + join(task.begin_targets(), task.end_targets(), " ") + " )'";
+ if (CommandLine::get_instance()->a_destinations.specified())
+ for (args::StringSetArg::Iterator i(CommandLine::get_instance()->a_destinations.begin_args()),
+ i_end(CommandLine::get_instance()->a_destinations.end_args()) ;
+ i != i_end ; ++i)
+ resume_command = resume_command + " --" + CommandLine::get_instance()->a_destinations.long_name()
+ + " '" + *i + "'";
+
return resume_command;
}