Просмотр исходного кода

Remove obsolete priorities support

Guillem Jover лет назад: 17
Родитель
Сommit
c8d3938be1
4 измененных файлов с 13 добавлено и 16 удалено
  1. 7 8
      README.feature-removal-schedule
  2. 1 0
      debian/changelog
  3. 5 2
      lib/dpkg-db.h
  4. 0 6
      lib/parsehelp.c

+ 7 - 8
README.feature-removal-schedule

@@ -25,14 +25,6 @@ Why:
  These fields have been superseded by either other fields with better names
  or values in other fields.
 
-What: recommended, contrib, base (priority)
-Status: obsolete
-When: lenny+1
-Warning: none
-Why:
- These priorities have been superseded by either other fields or values in
- other fields.
-
 What: -u, --udeb (dpkg-scanpackages option)
 Status: deprecated
 When: lenny+1
@@ -101,3 +93,10 @@ Why:
  This option has been a no-op for so long, that there's no traces on git
  history of its usage.
 
+What: recommended, contrib, base (priority)
+Status: removed
+When: 1.15.1
+Why:
+ These priorities have been superseded by either other fields or values in
+ other fields.
+

+ 1 - 0
debian/changelog

@@ -108,6 +108,7 @@ dpkg (1.15.1) UNRELEASED; urgency=low
     Closes: #528171
   * Remove obsolete --largemem and --smallmem dpkg options.
   * Remove obsolete --force-auto-select dpkg option.
+  * Remove obsolete priorities support from dpkg.
 
   [ Frank Lichtenheld ]
   * Dpkg::Version: Remove unnecessary function next_elem which just

+ 5 - 2
lib/dpkg-db.h

@@ -164,8 +164,11 @@ struct pkginfo { /* pig */
     stat_installed
   } status;
   enum pkgpriority {
-    pri_required, pri_important, pri_standard, pri_recommended,
-    pri_optional, pri_extra, pri_contrib,
+    pri_required,
+    pri_important,
+    pri_standard,
+    pri_optional,
+    pri_extra,
     pri_other, pri_unknown, pri_unset=-1
   } priority;
   const char *otherpriority;

+ 0 - 6
lib/parsehelp.c

@@ -92,16 +92,10 @@ const struct namevalue priorityinfos[]= {  /* Note !  These must be in order ! *
   { "required",                       pri_required,     8 },
   { "important",                      pri_important,    9 },
   { "standard",                       pri_standard,     8 },
-  /* XXX: obsolete. */
-  { "recommended",                    pri_recommended,  11 },
   { "optional",                       pri_optional,     8 },
   { "extra",                          pri_extra,        5 },
-  /* XXX: keep? */
-  { "contrib",                        pri_contrib,      7 },
   { "this is a bug - please report",  pri_other,        28 },
   { "unknown",                        pri_unknown,      7 },
-  /* XXX: alias, remove. */
-  { "base",                           pri_required,     4 },
   {  NULL                                                 }
 };