stop displaying time of build in online help

As part of the “reproducible builds” effort [1], we have noticed that
apt could not be built reproducibly.

One issue is that it uses the __DATE__ and __TIME__ macros of the C
preprocessor to display the time of build in the online help. We believe
this information not to be really useful to users as they can always
look at the package data and metadata to figure it out.

The attached patch simply removes this information. All
non-documentation packages can then be built reproducibly with our
current experimental framework.

[David: changed the string slightly to be untranslateable as well]

Closes: 774342

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index a5024c5812924738ddd0ab598854cccd41c9264c..e2cf7e8b70b621ebe73abc8f02ee038b42930b8a 100644 (file)
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1824,9 +1824,8 @@ static bool GenCaches(CommandLine &)
 /* */
 static bool ShowHelp(CommandLine &)
 {
 /* */
 static bool ShowHelp(CommandLine &)
 {

-   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
-           COMMON_ARCH,__DATE__,__TIME__);
-   
+   ioprintf(cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
+

    if (_config->FindB("version") == true)
      return true;
 
    if (_config->FindB("version") == true)
      return true;
 

diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 327039e000ddfc7886f835eb15f665b9377a49cb..d95c169cdeffe5a170a567c032891b576d2aedcf 100644 (file)
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -205,8 +205,8 @@ static bool DoIdent(CommandLine &)
 // ShowHelp - Show the help screen                                     /*{{{*/
 static bool ShowHelp(CommandLine &)
 {
 // ShowHelp - Show the help screen                                     /*{{{*/
 static bool ShowHelp(CommandLine &)
 {

-   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
-           COMMON_ARCH,__DATE__,__TIME__);
+   ioprintf(cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
+

    if (_config->FindB("version") == true)
       return true;
    
    if (_config->FindB("version") == true)
       return true;
    

diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc
index e0b8a624eeb7efdea1c598f58a8bc398bffe5bbe..4479b84a7c56f6f2071ecf20687947ddfcf1a716 100644 (file)
--- a/cmdline/apt-config.cc
+++ b/cmdline/apt-config.cc
@@ -80,11 +80,10 @@ static bool DoDump(CommandLine &CmdL)
 /* */
 static bool ShowHelp(CommandLine &)
 {
 /* */
 static bool ShowHelp(CommandLine &)
 {

-   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
-           COMMON_ARCH,__DATE__,__TIME__);
+   ioprintf(cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);

    if (_config->FindB("version") == true)
       return true;
    if (_config->FindB("version") == true)
       return true;

-   
+

    cout <<
     _("Usage: apt-config [options] command\n"
       "\n"
    cout <<
     _("Usage: apt-config [options] command\n"
       "\n"

diff --git a/cmdline/apt-dump-solver.cc b/cmdline/apt-dump-solver.cc
index f765234c5f8b61d5fc2a729e76d39699b277e047..4729eac55a649c8ce6b5fec4c3322860581e6f20 100644 (file)
--- a/cmdline/apt-dump-solver.cc
+++ b/cmdline/apt-dump-solver.cc
@@ -21,9 +21,8 @@
 // ---------------------------------------------------------------------
 /* */
 static bool ShowHelp() {
 // ---------------------------------------------------------------------
 /* */
 static bool ShowHelp() {

-
+       ioprintf(std::cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);

        std::cout <<
        std::cout <<

-               PACKAGE " " PACKAGE_VERSION " for " COMMON_ARCH " compiled on " __DATE__ " " __TIME__ << std::endl <<

                "Usage: apt-dump-resolver\n"
                "\n"
                "apt-dump-resolver is a dummy solver who just dumps its input to the\n"
                "Usage: apt-dump-resolver\n"
                "\n"
                "apt-dump-resolver is a dummy solver who just dumps its input to the\n"

diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index 5211ee027e9af25d4374fd3d1939e2d9b6f18383..3e4f8928680920a419d3c57860e3d426383bb5f2 100644 (file)
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -219,8 +219,7 @@ bool DebFile::ParseInfo()
 /* */
 static bool ShowHelp(CommandLine &)
 {
 /* */
 static bool ShowHelp(CommandLine &)
 {

-       ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
-           COMMON_ARCH,__DATE__,__TIME__);
+       ioprintf(std::cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);

 
        if (_config->FindB("version") == true)
                return true;
 
        if (_config->FindB("version") == true)
                return true;

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 33bbdd86189fa5305b09d79bf45bff1e7e67e6a8..a0d78257caf1cb663c1dd60f6e220a2055b94f36 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1607,13 +1607,12 @@ static bool DoChangelog(CommandLine &CmdL)
 /* */
 static bool ShowHelp(CommandLine &)
 {
 /* */
 static bool ShowHelp(CommandLine &)
 {

-   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
-           COMMON_ARCH,__DATE__,__TIME__);
-           
+   ioprintf(cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
+

    if (_config->FindB("version") == true)
    {
       cout << _("Supported modules:") << endl;
    if (_config->FindB("version") == true)
    {
       cout << _("Supported modules:") << endl;

-      
+

       for (unsigned I = 0; I != pkgVersioningSystem::GlobalListLen; I++)
       {
         pkgVersioningSystem *VS = pkgVersioningSystem::GlobalList[I];
       for (unsigned I = 0; I != pkgVersioningSystem::GlobalListLen; I++)
       {
         pkgVersioningSystem *VS = pkgVersioningSystem::GlobalList[I];


@@ -1622,7 +1621,7 @@ static bool ShowHelp(CommandLine &)
         else
            cout << ' ';
         cout << "Ver: " << VS->Label << endl;
         else
            cout << ' ';
         cout << "Ver: " << VS->Label << endl;

-        
+

         /* Print out all the packaging systems that will work with 
            this VS */
         for (unsigned J = 0; J != pkgSystem::GlobalListLen; J++)
         /* Print out all the packaging systems that will work with 
            this VS */
         for (unsigned J = 0; J != pkgSystem::GlobalListLen; J++)

diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc
index a05ae90a28c1449906d83293ddf83575e10ba9c9..65db857adaaf9fa8558d7f1dddc659b7b0e1b510 100644 (file)
--- a/cmdline/apt-helper.cc
+++ b/cmdline/apt-helper.cc
@@ -83,8 +83,7 @@ static bool DoDownloadFile(CommandLine &CmdL)
 
 static bool ShowHelp(CommandLine &)
 {
 
 static bool ShowHelp(CommandLine &)
 {

-   ioprintf(std::cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
-           COMMON_ARCH,__DATE__,__TIME__);
+   ioprintf(std::cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);

 
    if (_config->FindB("version") == true)
      return true;
 
    if (_config->FindB("version") == true)
      return true;

diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index 4fabeb02fc683f5a3d70d1c477dc8b3f5f041c91..939061b9387f1d5220623fedc448c2b45ed6cd61 100644 (file)
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -44,8 +44,7 @@
 // ---------------------------------------------------------------------
 /* */
 static bool ShowHelp(CommandLine &) {
 // ---------------------------------------------------------------------
 /* */
 static bool ShowHelp(CommandLine &) {

-       ioprintf(std::cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
-                COMMON_ARCH,__DATE__,__TIME__);
+       ioprintf(std::cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);

 
        std::cout <<
                _("Usage: apt-internal-solver\n"
 
        std::cout <<
                _("Usage: apt-internal-solver\n"

diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc
index 47777009b0715695c8f823f7052f89c8b38061b2..de1c80309c8ef50afb284a303a4ff2be3475f152 100644 (file)
--- a/cmdline/apt-mark.cc
+++ b/cmdline/apt-mark.cc
@@ -443,8 +443,7 @@ static bool ShowHold(CommandLine &CmdL)
 /* */
 static bool ShowHelp(CommandLine &)
 {
 /* */
 static bool ShowHelp(CommandLine &)
 {

-   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
-           COMMON_ARCH,__DATE__,__TIME__);
+   ioprintf(std::cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);

 
    cout <<
     _("Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 
    cout <<
     _("Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"

diff --git a/cmdline/apt-sortpkgs.cc b/cmdline/apt-sortpkgs.cc
index 9b66ad4db1e6da4c1660d00388722b1ace0ac97f..971900e4f839d0e806a0ffd5faf48340d2a1ca8b 100644 (file)
--- a/cmdline/apt-sortpkgs.cc
+++ b/cmdline/apt-sortpkgs.cc
@@ -146,8 +146,7 @@ static bool DoIt(string InFile)
 /* */
 static bool ShowHelp(CommandLine &)
 {
 /* */
 static bool ShowHelp(CommandLine &)
 {

-   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
-           COMMON_ARCH,__DATE__,__TIME__);
+   ioprintf(std::cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);

    if (_config->FindB("version") == true)
       return true;
    
    if (_config->FindB("version") == true)
       return true;
    

diff --git a/cmdline/apt.cc b/cmdline/apt.cc
index 056cd213f44800e07f72b6254325f02772f8fd4d..2f7eddb611154adb5d97d0a26548aa4c433dd14d 100644 (file)
--- a/cmdline/apt.cc
+++ b/cmdline/apt.cc
@@ -39,8 +39,7 @@
 
 static bool ShowHelp(CommandLine &)
 {
 
 static bool ShowHelp(CommandLine &)
 {

-   ioprintf(c1out,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
-           COMMON_ARCH,__DATE__,__TIME__);
+   ioprintf(c1out, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);

 
    // FIXME: generate from CommandLine
    c1out << 
 
    // FIXME: generate from CommandLine
    c1out << 

diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc
index adf1b6d73214921a4663b2e7799e2f74e062e5ce..69b936dff1f28ddbd4858ab53832afacaa76789d 100644 (file)
--- a/ftparchive/apt-ftparchive.cc
+++ b/ftparchive/apt-ftparchive.cc
@@ -616,8 +616,7 @@ static void LoadBinDir(vector<PackageMap> &PkgList,Configuration &Setup)
 /* */
 static bool ShowHelp(CommandLine &)
 {
 /* */
 static bool ShowHelp(CommandLine &)
 {

-   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
-           COMMON_ARCH,__DATE__,__TIME__);
+   ioprintf(cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);

    if (_config->FindB("version") == true)
       return true;
 
    if (_config->FindB("version") == true)
       return true;
 

diff --git a/test/integration/test-00-commands-have-help b/test/integration/test-00-commands-have-help
index bbd1475eb830285e60a450b2f458af42a7bfa924..f2317dbdf155dad19469049d6ddac9a278d06ced 100755 (executable)
--- a/test/integration/test-00-commands-have-help
+++ b/test/integration/test-00-commands-have-help
@@ -13,7 +13,7 @@ configarchitecture 'amd64'
 export LD_BIND_NOW=1
 
 checkversionmessage() {
 export LD_BIND_NOW=1
 
 checkversionmessage() {

-       testsuccess grep '^apt .* compiled on ' ${1}-help.output
+       testsuccess grep '^apt .* (' ${1}-help.output

 }
 
 checkhelpmessage() {
 }
 
 checkhelpmessage() {