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

dpkg-scanpackages: add new --medium option

This feature is supported in the dpkg-scanpackages implementation provided
by dpkg-multicd. Unfortunately it was using the "-m" option which got
granted to --multiversion in the official dpkg-scanpackages.

This option will only be useful for people wishing to create Packages.cd
files for use by the multicd dselect access method. Closes: #402527
Raphaël Hertzog лет назад: 17
Родитель
Сommit
5ed64b297e
3 измененных файлов с 13 добавлено и 1 удалено
  1. 3 0
      debian/changelog
  2. 5 0
      man/dpkg-scanpackages.1
  3. 5 1
      scripts/dpkg-scanpackages.pl

+ 3 - 0
debian/changelog

@@ -46,6 +46,9 @@ dpkg (1.15.5) UNRELEASED; urgency=low
     to a new vendor hook post-process-changelog-entry. Closes: #536066
   * Integrate dpkg-ftp into dselect. Add the required Replaces and Conflicts.
   * dpkg-scanpackages/dpkg-scansources now supports compressed override files.
+  * dpkg-scanpackages now supports a new --medium option as needed to
+    generate Packages.cd file for consumption by the multicd dselect access
+    method. Closes: #402527
 
   [ Updated dpkg translations ]
   * German (Sven Joachim).

+ 5 - 0
man/dpkg-scanpackages.1

@@ -91,6 +91,11 @@ scanning for all debs,
 .BR \-m ", " \-\-multiversion
 Include all found packages in the output.
 .TP
+.BR \-M ", " \-\-medium " \fIid\-string\fP"
+Add an X-Medium field containing the value \fIid\-string\fP. This field
+is required if you want to generate \fBPackages.cd\fP files for use
+by the multicd access method of dselect.
+.TP
 .BR \-h ", " \-\-help
 Show the usage message and exit.
 .TP

+ 5 - 1
scripts/dpkg-scanpackages.pl

@@ -32,11 +32,13 @@ my %options = (help            => sub { usage(); exit 0; },
 	       arch            => undef,
 	       multiversion    => 0,
 	       'extra-override'=> undef,
+               medium          => undef,
 	      );
 
 my $result = GetOptions(\%options,
                         'help|h|?', 'version', 'type|t=s', 'udeb|u!',
-                        'arch|a=s', 'multiversion|m!', 'extra-override|e=s');
+                        'arch|a=s', 'multiversion|m!', 'extra-override|e=s',
+                        'medium|M=s');
 
 sub version {
     printf _g("Debian %s version %s.\n"), $progname, $version;
@@ -54,6 +56,7 @@ Options:
   -m, --multiversion       allow multiple versions of a single package.
   -e, --extra-override <file>
                            use extra override file.
+  -M, --medium <medium>    add X-Medium field for dselect multicd access method
   -h, --help               show this help message.
       --version            show the version.
 "), $progname;
@@ -238,6 +241,7 @@ FILE:
             }
         }
 	$fields->{'Size'} = $size;
+        $fields->{'X-Medium'} = $options{medium} if defined $options{medium};
 	
 	push @{$packages{$p}}, $fields;
     }