From e0a22249fcea1733cc5a5277c475ecb5e75cc8f4 Mon Sep 17 00:00:00 2001
From: Gerardo Ganis <Gerardo.Ganis@cern.ch>
Date: Thu, 15 Feb 2018 11:21:04 +0100
Subject: [PATCH] pq2: add deprecation message
Deprecated in v6.14; plan to remove in v6.16
---
man/man1/pq2-ana-dist.1 | 7 +++++++
man/man1/pq2-cache.1 | 7 +++++++
man/man1/pq2-info-server.1 | 7 +++++++
man/man1/pq2-ls-files-server.1 | 7 +++++++
man/man1/pq2-ls-files.1 | 7 +++++++
man/man1/pq2-ls.1 | 7 +++++++
man/man1/pq2-put.1 | 7 +++++++
man/man1/pq2-redistribute.1 | 7 +++++++
man/man1/pq2-rm.1 | 7 +++++++
man/man1/pq2-verify.1 | 7 +++++++
man/man1/pq2.1 | 7 +++++++
man/man1/setup-pq2.1 | 7 +++++++
proof/pq2/src/pq2main.cxx | 15 +++++++++++++++
13 files changed, 99 insertions(+)
diff --git a/man/man1/pq2-ana-dist.1 b/man/man1/pq2-ana-dist.1
index 6653aa3c92d..035a61df1b2 100644
--- a/man/man1/pq2-ana-dist.1
+++ b/man/man1/pq2-ana-dist.1
@@ -4,6 +4,13 @@
.TH PQ2-ANA-DIST 1 "Version 5" "ROOT"
.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
.\" other parms are allowed: see man(7), man(1)
+.SH NOTA BENE
+.B The PQ2 tools are deprecated will be removed in ROOT v6.16/00.
+.PP
+Please contact the ROOT team at
+.UR http://root.cern.ch/
+.I http://root.cern.ch
+in the unlikely event this change is disruptive for your workflow.
.SH NAME
pq2-ana-dist \- Analyse the file distribution of a dataset (or a set of datasets) from a dataset meta-repository based on ROOT files
.SH SYNOPSIS
diff --git a/man/man1/pq2-cache.1 b/man/man1/pq2-cache.1
index 7b7bf07395f..f34aa090e23 100644
--- a/man/man1/pq2-cache.1
+++ b/man/man1/pq2-cache.1
@@ -4,6 +4,13 @@
.TH PQ2-CACHE 1 "Version 5" "ROOT"
.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
.\" other parms are allowed: see man(7), man(1)
+.SH NOTA BENE
+.B The PQ2 tools are deprecated and will be removed in ROOT v6.16/00.
+.PP
+Please contact the ROOT team at
+.UR http://root.cern.ch/
+.I http://root.cern.ch
+in the unlikely event this change is disruptive for your workflow.
.SH NAME
pq2-cache \- display or clear the local cache content of a remote dataset meta-repository based on ROOT files
.SH SYNOPSIS
diff --git a/man/man1/pq2-info-server.1 b/man/man1/pq2-info-server.1
index 114c3d12ca2..ef89b5e239d 100644
--- a/man/man1/pq2-info-server.1
+++ b/man/man1/pq2-info-server.1
@@ -4,6 +4,13 @@
.TH PQ2-INFO-SERVER 1 "Version 5" "ROOT"
.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
.\" other parms are allowed: see man(7), man(1)
+.SH NOTA BENE
+.B The PQ2 tools are deprecated and will be removed in ROOT v6.16/00.
+.PP
+Please contact the ROOT team at
+.UR http://root.cern.ch/
+.I http://root.cern.ch
+in the unlikely event this change is disruptive for your workflow.
.SH NAME
pq2-info-server \- Display info about the datasets on a given server from a dataset meta-repository based on ROOT files
.SH SYNOPSIS
diff --git a/man/man1/pq2-ls-files-server.1 b/man/man1/pq2-ls-files-server.1
index 1ea80c4c2e1..6177e54ad1e 100644
--- a/man/man1/pq2-ls-files-server.1
+++ b/man/man1/pq2-ls-files-server.1
@@ -4,6 +4,13 @@
.TH PQ2-LS-FILES-SERVER 1 "Version 5" "ROOT"
.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
.\" other parms are allowed: see man(7), man(1)
+.SH NOTA BENE
+.B The PQ2 tools are deprecated and will be removed in ROOT v6.16/00.
+.PP
+Please contact the ROOT team at
+.UR http://root.cern.ch/
+.I http://root.cern.ch
+in the unlikely event this change is disruptive for your workflow.
.SH NAME
pq2-ls-files-server \- List the file content of a dataset on a given server from a dataset meta-repository based on ROOT files
.SH SYNOPSIS
diff --git a/man/man1/pq2-ls-files.1 b/man/man1/pq2-ls-files.1
index 963b6e3a351..3674ee2caab 100644
--- a/man/man1/pq2-ls-files.1
+++ b/man/man1/pq2-ls-files.1
@@ -4,6 +4,13 @@
.TH PQ2-LS-FILES 1 "Version 5" "ROOT"
.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
.\" other parms are allowed: see man(7), man(1)
+.SH NOTA BENE
+.B The PQ2 tools are deprecated and will be removed in ROOT v6.16/00.
+.PP
+Please contact the ROOT team at
+.UR http://root.cern.ch/
+.I http://root.cern.ch
+in the unlikely event this change is disruptive for your workflow.
.SH NAME
pq2-ls-files \- List the file content of a dataset from a dataset meta-repository based on ROOT files
.SH SYNOPSIS
diff --git a/man/man1/pq2-ls.1 b/man/man1/pq2-ls.1
index ad5b2b0de2b..2c99d8ec077 100644
--- a/man/man1/pq2-ls.1
+++ b/man/man1/pq2-ls.1
@@ -4,6 +4,13 @@
.TH PQ2-LS 1 "Version 5" "ROOT"
.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
.\" other parms are allowed: see man(7), man(1)
+.SH NOTA BENE
+.B The PQ2 tools are deprecated and will be removed in ROOT v6.16/00.
+.PP
+Please contact the ROOT team at
+.UR http://root.cern.ch/
+.I http://root.cern.ch
+in the unlikely event this change is disruptive for your workflow.
.SH NAME
pq2-ls \- List the available datasets in a dataset meta-repository based on ROOT files
.SH SYNOPSIS
diff --git a/man/man1/pq2-put.1 b/man/man1/pq2-put.1
index b7eb314a380..d511f04079d 100644
--- a/man/man1/pq2-put.1
+++ b/man/man1/pq2-put.1
@@ -4,6 +4,13 @@
.TH PQ2-PUT 1 "Version 5" "ROOT"
.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
.\" other parms are allowed: see man(7), man(1)
+.SH NOTA BENE
+.B The PQ2 tools are deprecated and will be removed in ROOT v6.16/00.
+.PP
+Please contact the ROOT team at
+.UR http://root.cern.ch/
+.I http://root.cern.ch
+in the unlikely event this change is disruptive for your workflow.
.SH NAME
pq2-put \- Register one or more datasets in a dataset meta-repository based on ROOT files
.SH SYNOPSIS
diff --git a/man/man1/pq2-redistribute.1 b/man/man1/pq2-redistribute.1
index 2fb8da8f57a..512bc9cc7b2 100644
--- a/man/man1/pq2-redistribute.1
+++ b/man/man1/pq2-redistribute.1
@@ -4,6 +4,13 @@
.TH PQ2-REDISTRIBUTE 1 "Version 5" "ROOT"
.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
.\" other parms are allowed: see man(7), man(1)
+.SH NOTA BENE
+.B The PQ2 tools are deprecated and will be removed in ROOT v6.16/00.
+.PP
+Please contact the ROOT team at
+.UR http://root.cern.ch/
+.I http://root.cern.ch
+in the unlikely event this change is disruptive for your workflow.
.SH NAME
pq2-redistribute \- Execute the file movements as determined by pq2-ana-dist
.SH SYNOPSIS
diff --git a/man/man1/pq2-rm.1 b/man/man1/pq2-rm.1
index 25f9fcae27c..2039217a62d 100644
--- a/man/man1/pq2-rm.1
+++ b/man/man1/pq2-rm.1
@@ -4,6 +4,13 @@
.TH PQ2-RM 1 "Version 5" "ROOT"
.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
.\" other parms are allowed: see man(7), man(1)
+.SH NOTA BENE
+.B The PQ2 tools are deprecated and will be removed in ROOT v6.16/00.
+.PP
+Please contact the ROOT team at
+.UR http://root.cern.ch/
+.I http://root.cern.ch
+in the unlikely event this change is disruptive for your workflow.
.SH NAME
pq2-rm \- Remove one or more datasets from a dataset meta-repository based on ROOT files
.SH SYNOPSIS
diff --git a/man/man1/pq2-verify.1 b/man/man1/pq2-verify.1
index f642d7a9a22..8a111adf6b5 100644
--- a/man/man1/pq2-verify.1
+++ b/man/man1/pq2-verify.1
@@ -4,6 +4,13 @@
.TH PQ2-VERIFY 1 "Version 5" "ROOT"
.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
.\" other parms are allowed: see man(7), man(1)
+.SH NOTA BENE
+.B The PQ2 tools are deprecated and will be removed in ROOT v6.16/00.
+.PP
+Please contact the ROOT team at
+.UR http://root.cern.ch/
+.I http://root.cern.ch
+in the unlikely event this change is disruptive for your workflow.
.SH NAME
pq2-verify \- Extract the content one or more datasets from a dataset meta-repository based on ROOT files
.SH SYNOPSIS
diff --git a/man/man1/pq2.1 b/man/man1/pq2.1
index 2711f047512..31a10fe5bfd 100644
--- a/man/man1/pq2.1
+++ b/man/man1/pq2.1
@@ -4,6 +4,13 @@
.TH PQ2 1 "Version 5" "ROOT"
.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
.\" other parms are allowed: see man(7), man(1)
+.SH NOTA BENE
+.B The PQ2 tools are deprecated and will be removed in ROOT v6.16/00.
+.PP
+Please contact the ROOT team at
+.UR http://root.cern.ch/
+.I http://root.cern.ch
+in the unlikely event this change is disruptive for your workflow.
.SH NAME
pq2 \- The command line interface to a dataset meta-repository based on ROOT files
.SH SYNOPSIS
diff --git a/man/man1/setup-pq2.1 b/man/man1/setup-pq2.1
index e1af2e135d5..8149f33507b 100644
--- a/man/man1/setup-pq2.1
+++ b/man/man1/setup-pq2.1
@@ -4,6 +4,13 @@
.TH SETUP-PQ2 1 "Version 5" "ROOT"
.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
.\" other parms are allowed: see man(7), man(1)
+.SH NOTA BENE
+.B The PQ2 tools are deprecated and will be removed in ROOT v6.16/00.
+.PP
+Please contact the ROOT team at
+.UR http://root.cern.ch/
+.I http://root.cern.ch
+in the unlikely event this change is disruptive for your workflow.
.SH NAME
setup-pq2 \- Script defining the environment for the PQ2 tools
.SH SYNOPSIS
diff --git a/proof/pq2/src/pq2main.cxx b/proof/pq2/src/pq2main.cxx
index 23e6e24dcb6..3eca30cf679 100644
--- a/proof/pq2/src/pq2main.cxx
+++ b/proof/pq2/src/pq2main.cxx
@@ -39,6 +39,15 @@ TString ferr;
TString fres;
Int_t gverbose = 0;
+void PrintDeprecation(bool withctx = true)
+{
+ if (withctx) printf(" \n");
+ printf(" NB: The PQ2 tools are deprecated and not maintained any longer and will be removed in ROOT v6.16/00\n");
+ printf(" Please contact the ROOT team in the unlikely event this change is disruptive for your workflow.\n");
+ if (withctx) printf(" \n");
+}
+
+
//_____________________________batch only_____________________
int main(int argc, char **argv)
{
@@ -74,9 +83,13 @@ int main(int argc, char **argv)
printf(" serviceurl entry point of the service to be used to get the information (PROOF master\n");
printf(" or data server) in the form '[user@]host.domain[:port]'\n");
printf(" \n");
+ PrintDeprecation(false);
+ printf(" \n");
gSystem->Exit(0);
}
+ PrintDeprecation();
+
// Parse options
const char *action = 0;
const char *url = 0;
@@ -347,6 +360,8 @@ int main(int argc, char **argv)
if (!gSystem->AccessPathName(fres)) Printf(" -> %s", fres.Data());
}
+ PrintDeprecation();
+
gSystem->Exit(rc);
}
--
GitLab