Remove unnecessary, misnamed, undocumented and deprecated option --distrib

1 files changed, 13 insertions, 14 deletions

diff --git a/gendistrib b/gendistrib
index e950a4d..d405ad8 100755
--- a/gendistrib
+++ b/gendistrib
@@ -42,7 +42,6 @@ GetOptions(
     'compss=s' => \$urpmfiles{compss},
     'depslist=s' => \$urpmfiles{depslist},
     'destdir=s' => \my $destdir,
-    'distrib=s' => \my $rootdistrib,
     'hdlists=s' => \$urpmfiles{hdlists},
     'headersdir=s' => \$headers_dir,
     'help|h' => sub { usage(); exit 0; },
@@ -59,7 +58,7 @@ GetOptions(
     'v|version' => sub { warn "$0 version $VERSION\n"; exit 0 },
 );
 
-my @root = grep { $_ } ($rootdistrib, @ARGV);
+my @root = grep { $_ } @ARGV;
 
 @root > 0 or do { usage(); exit 1 };
 
@@ -185,8 +184,8 @@ foreach (0..$#hdlists) {
 
     #- try to find the right repository where can be found the directory
     #- listed in the hdlist file.
-    #- if the number of root is equal the number of medium, assume a medium
-    #- foreach root, else try to find a valid root containing the medium.
+    #- if the number of roots is equal to the number of media, assume one
+    #- media per root, else try to find a valid root containing the media.
     $r ||= $root[0];
     if (scalar(@hdlists) == scalar(@root)) {
 	$r = $root[$_];
@@ -423,6 +422,10 @@ gendistrib - generates a mirror tree for a distribution
 
 =over 4
 
+=item --blind
+
+Always rebuild indexes, without checking whether it's needed.
+
 =item --compss file
 
 Path of F<compss> file (defaults to F<media/media_info/compss>).
@@ -431,6 +434,12 @@ Path of F<compss> file (defaults to F<media/media_info/compss>).
 
 Path of F<depslist> file (defaults to F<media/media_info/depslist.ordered>).
 
+=item --destdir dir
+
+Create all new files in the specified directory. All subdirectories should
+exist. This option is mostly useful for testing, or while using a read-only
+repository.
+
 =item --provides file
 
 Path of F<provides> file (defaults to F<media/media_info/provides>)
@@ -443,12 +452,6 @@ Use the specified F<media.cfg> file (defaults to F<media/media_info/media.cfg>).
 
 Path of the F<hdlists> file (defaults to F<media/media_info/hdlists>)
 
-=item --destdir dir
-
-Create all new files in the specified directory. All subdirectories should
-exist. This option is mostly useful for testing, or while using a read-only
-repository.
-
 =item --headersdir dir
 
 Put temporary files in this directory (defaults to TMPDIR).
@@ -469,10 +472,6 @@ Stop and abort if an empty media is found.
 
 Don't search for missing dependencies.
 
-=item --blind
-
-Always rebuild indexes, without checking whether it's needed.
-
 =item --noclean
 
 Keep cache files.