aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Piotr Jaroszyński <peper@gentoo.org> 2008-01-02 19:18:33 +0000
committerAvatar Piotr Jaroszyński <peper@gentoo.org> 2008-01-02 19:18:33 +0000
commitfae222dd3a23d93171899885b9b89f678d0ce43a (patch)
tree20f99248f8e2444d04112c03a6f477288d9d7fc5
parent92711652ec74135f3924c546bb387b363bd3444e (diff)
downloadpaludis-fae222dd3a23d93171899885b9b89f678d0ce43a.tar.gz
paludis-fae222dd3a23d93171899885b9b89f678d0ce43a.tar.xz
Include *_OPTIONS in the clients' main context.
-rw-r--r--src/clients/accerso/accerso.cc8
-rw-r--r--src/clients/contrarius/contrarius.cc8
-rw-r--r--src/clients/importare/importare.cc8
-rw-r--r--src/clients/inquisitio/inquisitio.cc8
-rw-r--r--src/clients/instruo/instruo.cc8
-rw-r--r--src/clients/paludis/paludis.cc8
-rw-r--r--src/clients/qualudis/qualudis.cc8
-rw-r--r--src/clients/reconcilio/reconcilio.cc8
8 files changed, 56 insertions, 8 deletions
diff --git a/src/clients/accerso/accerso.cc b/src/clients/accerso/accerso.cc
index 2f25050..7f4f329 100644
--- a/src/clients/accerso/accerso.cc
+++ b/src/clients/accerso/accerso.cc
@@ -23,6 +23,7 @@
#include <paludis/about.hh>
#include <paludis/action.hh>
#include <paludis/package_id.hh>
+#include <paludis/util/system.hh>
#include <paludis/util/join.hh>
#include <paludis/util/log.hh>
#include <paludis/util/fs_entry.hh>
@@ -45,7 +46,12 @@ using std::endl;
int
main(int argc, char *argv[])
{
- Context context("In program " + join(argv, argv + argc, " ") + ":");
+ std::string options(paludis::getenv_with_default("ACCERSO_OPTIONS", ""));
+ if (! options.empty())
+ options = "(" + options + ") ";
+ options += join(argv + 1, argv + argc, " ");
+
+ Context context(std::string("In program ") + argv[0] + " " + options + ":");
try
{
diff --git a/src/clients/contrarius/contrarius.cc b/src/clients/contrarius/contrarius.cc
index 6f3cb9d..6a65f8a 100644
--- a/src/clients/contrarius/contrarius.cc
+++ b/src/clients/contrarius/contrarius.cc
@@ -22,6 +22,7 @@
#include <paludis/environment_maker.hh>
#include <paludis/environments/adapted/adapted_environment.hh>
#include <paludis/util/util.hh>
+#include <paludis/util/system.hh>
#include <cstdlib>
#include <iostream>
@@ -44,7 +45,12 @@ struct DoVersion
int main(int argc, char *argv[])
{
- Context context("In main program:");
+ std::string options(paludis::getenv_with_default("CONTRARIUS_OPTIONS", ""));
+ if (! options.empty())
+ options = "(" + options + ") ";
+ options += join(argv + 1, argv + argc, " ");
+
+ Context context(std::string("In program ") + argv[0] + " " + options + ":");
try
{
diff --git a/src/clients/importare/importare.cc b/src/clients/importare/importare.cc
index 81d878d..6597b8a 100644
--- a/src/clients/importare/importare.cc
+++ b/src/clients/importare/importare.cc
@@ -24,6 +24,7 @@
#include <src/output/colour.hh>
#include <paludis/environment_maker.hh>
+#include <paludis/util/system.hh>
#include <paludis/util/log.hh>
#include <paludis/util/map.hh>
#include <paludis/util/sequence.hh>
@@ -64,7 +65,12 @@ namespace
int
main(int argc, char *argv[])
{
- Context context("In program " + join(argv, argv + argc, " ") + ":");
+ std::string options(paludis::getenv_with_default("IMPORTARE_OPTIONS", ""));
+ if (! options.empty())
+ options = "(" + options + ") ";
+ options += join(argv + 1, argv + argc, " ");
+
+ Context context(std::string("In program ") + argv[0] + " " + options + ":");
try
{
diff --git a/src/clients/inquisitio/inquisitio.cc b/src/clients/inquisitio/inquisitio.cc
index 1a0e19f..2cee553 100644
--- a/src/clients/inquisitio/inquisitio.cc
+++ b/src/clients/inquisitio/inquisitio.cc
@@ -25,6 +25,7 @@
#include <cstdlib>
#include <paludis/about.hh>
+#include <paludis/util/system.hh>
#include <paludis/util/join.hh>
#include <paludis/environment_maker.hh>
@@ -55,7 +56,12 @@ namespace
int
main(int argc, char *argv[])
{
- Context context("In program " + join(argv, argv + argc, " ") + ":");
+ std::string options(paludis::getenv_with_default("INQUISITIO_OPTIONS", ""));
+ if (! options.empty())
+ options = "(" + options + ") ";
+ options += join(argv + 1, argv + argc, " ");
+
+ Context context(std::string("In program ") + argv[0] + " " + options + ":");
try
{
diff --git a/src/clients/instruo/instruo.cc b/src/clients/instruo/instruo.cc
index 1813f3d..b8f8e1c 100644
--- a/src/clients/instruo/instruo.cc
+++ b/src/clients/instruo/instruo.cc
@@ -23,6 +23,7 @@
#include <paludis/about.hh>
#include <paludis/action.hh>
#include <paludis/package_id.hh>
+#include <paludis/util/system.hh>
#include <paludis/util/join.hh>
#include <paludis/util/log.hh>
#include <paludis/util/fs_entry.hh>
@@ -156,7 +157,12 @@ namespace
int
main(int argc, char *argv[])
{
- Context context("In program " + join(argv, argv + argc, " ") + ":");
+ std::string options(paludis::getenv_with_default("INSTRUO_OPTIONS", ""));
+ if (! options.empty())
+ options = "(" + options + ") ";
+ options += join(argv + 1, argv + argc, " ");
+
+ Context context(std::string("In program ") + argv[0] + " " + options + ":");
try
{
diff --git a/src/clients/paludis/paludis.cc b/src/clients/paludis/paludis.cc
index ddc779b..6ffa456 100644
--- a/src/clients/paludis/paludis.cc
+++ b/src/clients/paludis/paludis.cc
@@ -37,6 +37,7 @@
#include <paludis/paludis.hh>
#include <paludis/environment_maker.hh>
#include <paludis/hashed_containers.hh>
+#include <paludis/util/system.hh>
#include <paludis/util/util.hh>
#include <paludis/util/log.hh>
#include <paludis/fuzzy_finder.hh>
@@ -82,7 +83,12 @@ namespace
int
main(int argc, char *argv[])
{
- Context context("In program " + join(argv, argv + argc, " ") + ":");
+ std::string options(paludis::getenv_with_default("PALUDIS_OPTIONS", ""));
+ if (! options.empty())
+ options = "(" + options + ") ";
+ options += join(argv + 1, argv + argc, " ");
+
+ Context context(std::string("In program ") + argv[0] + " " + options + ":");
try
{
diff --git a/src/clients/qualudis/qualudis.cc b/src/clients/qualudis/qualudis.cc
index eae8324..0795f02 100644
--- a/src/clients/qualudis/qualudis.cc
+++ b/src/clients/qualudis/qualudis.cc
@@ -20,6 +20,7 @@
#include <paludis/args/args.hh>
#include <paludis/paludis.hh>
#include <paludis/qa.hh>
+#include <paludis/util/system.hh>
#include <paludis/util/join.hh>
#include <paludis/util/dir_iterator.hh>
#include <paludis/util/log.hh>
@@ -251,7 +252,12 @@ namespace
int main(int argc, char *argv[])
{
- Context context("In main program:");
+ std::string options(paludis::getenv_with_default("QUALUDIS_OPTIONS", ""));
+ if (! options.empty())
+ options = "(" + options + ") ";
+ options += join(argv + 1, argv + argc, " ");
+
+ Context context(std::string("In program ") + argv[0] + " " + options + ":");
try
{
diff --git a/src/clients/reconcilio/reconcilio.cc b/src/clients/reconcilio/reconcilio.cc
index 1a9e84c..109ca3e 100644
--- a/src/clients/reconcilio/reconcilio.cc
+++ b/src/clients/reconcilio/reconcilio.cc
@@ -21,6 +21,7 @@
#include "command_line.hh"
#include "fix_linkage.hh"
+#include <paludis/util/system.hh>
#include <paludis/util/join.hh>
#include <paludis/util/log.hh>
@@ -53,7 +54,12 @@ namespace
int
main(int argc, char *argv[])
{
- Context ctx("In program " + join(argv, argv + argc, " ") + ":");
+ std::string options(paludis::getenv_with_default("RECONCILIO_OPTIONS", ""));
+ if (! options.empty())
+ options = "(" + options + ") ";
+ options += join(argv + 1, argv + argc, " ");
+
+ Context context(std::string("In program ") + argv[0] + " " + options + ":");
try
{