dpkg: Remove obsolete --print-installation-architecture option

5 files changed, 9 insertions, 18 deletions

diff --git a/debian/changelog b/debian/changelog
index b2d4217fa..0d488dc54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ dpkg (1.18.11) UNRELEASED; urgency=medium
     Thanks to Javier Serrano Polo <javier@jasp.net>. Closes: #833964
   * Obsolete dpkg-deb bzip2 and lzma compression methods by emitting errors.
   * Remove obsolete dpkg-deb --old and --new options.
+  * Remove obsolete dpkg --print-installation-architecture option.
   * Perl modules:
     - Obsolete Source-Version substvar in Dpkg::Substvars by emitting errors.
   * Packaging:
diff --git a/doc/README.feature-removal-schedule b/doc/README.feature-removal-schedule
index 9b00250fd..9cae4ce9b 100644
--- a/doc/README.feature-removal-schedule
+++ b/doc/README.feature-removal-schedule
@@ -10,14 +10,6 @@ Why:
  backwards compatibility but will be removed once all packages have the
  debian/source/format file. This is unlikely to happen before 1.17.x.
 
-What: --print-installation-architecture (dpkg option)
-Status: obsolete
-When: 1.15.x
-Warning: program
-Why:
- Obsoleted long time ago (2005-01-22). Remaining packages should switch to
- use 'dpkg --print-architecture'.
-
 What --forget-old-unavail (dpkg option)
 Status: obsolete
 When: 1.16.x
@@ -172,3 +164,11 @@ Why:
  These options are not future-proof, and do not give the caller any
  guarantee of what exact format version will be used to produce the
  output file. They were replaced with a new --deb-format option.
+
+What: --print-installation-architecture (dpkg option)
+Status: removed
+When: 1.18.11
+Warning: program
+Why:
+ Obsoleted long time ago (2005-01-22). Remaining packages should switch to
+ use 'dpkg --print-architecture'.
diff --git a/src/enquiry.c b/src/enquiry.c
index 9f71863bf..f3f92c405 100644
--- a/src/enquiry.c
+++ b/src/enquiry.c
@@ -575,14 +575,6 @@ printarch(const char *const *argv)
 }
 
 int
-printinstarch(const char *const *argv)
-{
-  warning(_("obsolete option '--%s'; please use '--%s' instead"),
-          "print-installation-architecture", "print-architecture");
-  return printarch(argv);
-}
-
-int
 print_foreign_arches(const char *const *argv)
 {
   struct dpkg_arch *arch;
diff --git a/src/main.c b/src/main.c
index 122a28f3f..ccf277770 100644
--- a/src/main.c
+++ b/src/main.c
@@ -690,7 +690,6 @@ static const struct cmdinfo cmdinfos[]= {
   ACTION( "add-architecture",                0,  act_arch_add,             arch_add        ),
   ACTION( "remove-architecture",             0,  act_arch_remove,          arch_remove     ),
   ACTION( "print-architecture",              0,  act_printarch,            printarch   ),
-  ACTION( "print-installation-architecture", 0,  act_printinstarch,        printinstarch  ),
   ACTION( "print-foreign-architectures",     0,  act_printforeignarches,   print_foreign_arches ),
   ACTION( "predep-package",                  0,  act_predeppackage,        predeppackage   ),
   ACTION( "compare-versions",                0,  act_cmpversions,          cmpversions     ),
diff --git a/src/main.h b/src/main.h
index cddf45e0a..15ee278a4 100644
--- a/src/main.h
+++ b/src/main.h
@@ -101,7 +101,6 @@ enum action {
 	act_arch_add,
 	act_arch_remove,
 	act_printarch,
-	act_printinstarch,
 	act_printforeignarches,
 
 	act_assertpredep,