Forráskód Böngészése

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

Guillem Jover 10 éve
szülő
commit
931a690aed
5 módosított fájl, 9 hozzáadás és 18 törlés
  1. 1 0
      debian/changelog
  2. 8 8
      doc/README.feature-removal-schedule
  3. 0 8
      src/enquiry.c
  4. 0 1
      src/main.c
  5. 0 1
      src/main.h

+ 1 - 0
debian/changelog

@@ -8,6 +8,7 @@ dpkg (1.18.11) UNRELEASED; urgency=medium
     Thanks to Javier Serrano Polo <javier@jasp.net>. Closes: #833964
     Thanks to Javier Serrano Polo <javier@jasp.net>. Closes: #833964
   * Obsolete dpkg-deb bzip2 and lzma compression methods by emitting errors.
   * Obsolete dpkg-deb bzip2 and lzma compression methods by emitting errors.
   * Remove obsolete dpkg-deb --old and --new options.
   * Remove obsolete dpkg-deb --old and --new options.
+  * Remove obsolete dpkg --print-installation-architecture option.
   * Perl modules:
   * Perl modules:
     - Obsolete Source-Version substvar in Dpkg::Substvars by emitting errors.
     - Obsolete Source-Version substvar in Dpkg::Substvars by emitting errors.
   * Packaging:
   * Packaging:

+ 8 - 8
doc/README.feature-removal-schedule

@@ -10,14 +10,6 @@ Why:
  backwards compatibility but will be removed once all packages have the
  backwards compatibility but will be removed once all packages have the
  debian/source/format file. This is unlikely to happen before 1.17.x.
  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)
 What --forget-old-unavail (dpkg option)
 Status: obsolete
 Status: obsolete
 When: 1.16.x
 When: 1.16.x
@@ -172,3 +164,11 @@ Why:
  These options are not future-proof, and do not give the caller any
  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
  guarantee of what exact format version will be used to produce the
  output file. They were replaced with a new --deb-format option.
  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'.

+ 0 - 8
src/enquiry.c

@@ -574,14 +574,6 @@ printarch(const char *const *argv)
   return 0;
   return 0;
 }
 }
 
 
-int
-printinstarch(const char *const *argv)
-{
-  warning(_("obsolete option '--%s'; please use '--%s' instead"),
-          "print-installation-architecture", "print-architecture");
-  return printarch(argv);
-}
-
 int
 int
 print_foreign_arches(const char *const *argv)
 print_foreign_arches(const char *const *argv)
 {
 {

+ 0 - 1
src/main.c

@@ -690,7 +690,6 @@ static const struct cmdinfo cmdinfos[]= {
   ACTION( "add-architecture",                0,  act_arch_add,             arch_add        ),
   ACTION( "add-architecture",                0,  act_arch_add,             arch_add        ),
   ACTION( "remove-architecture",             0,  act_arch_remove,          arch_remove     ),
   ACTION( "remove-architecture",             0,  act_arch_remove,          arch_remove     ),
   ACTION( "print-architecture",              0,  act_printarch,            printarch   ),
   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( "print-foreign-architectures",     0,  act_printforeignarches,   print_foreign_arches ),
   ACTION( "predep-package",                  0,  act_predeppackage,        predeppackage   ),
   ACTION( "predep-package",                  0,  act_predeppackage,        predeppackage   ),
   ACTION( "compare-versions",                0,  act_cmpversions,          cmpversions     ),
   ACTION( "compare-versions",                0,  act_cmpversions,          cmpversions     ),

+ 0 - 1
src/main.h

@@ -101,7 +101,6 @@ enum action {
 	act_arch_add,
 	act_arch_add,
 	act_arch_remove,
 	act_arch_remove,
 	act_printarch,
 	act_printarch,
-	act_printinstarch,
 	act_printforeignarches,
 	act_printforeignarches,
 
 
 	act_assertpredep,
 	act_assertpredep,