--- /opt/oscar/scripts/opd.orig	2004-06-14 14:09:40.000000000 -0700
+++ /opt/oscar/scripts/opd	2004-06-15 11:40:02.000000000 -0700
@@ -76,6 +76,7 @@
 my $opd_term = new Term::ReadLine 'OPD';
 
 my $argv_master_uri;
+my $argv_nomaster;
 my $argv_repository_uri;
 my $argv_force = 0;
 my $argv_noforce = 0;
@@ -175,6 +176,7 @@
     Getopt::Long::Configure("bundling", "require_order");
     my $ok = Getopt::Long::GetOptions("master|m=s" => \$argv_master_uri,
                                       "repository|r=s" => \$argv_repository_uri,
+				      "nomaster" => \$argv_nomaster,
 				      "force|f" => \$argv_force,
 				      "noforce|n" => \$argv_noforce,
 				      "wget" => \$argv_wget,
@@ -1572,7 +1574,8 @@
 # data such as the package listing filename, repository listing
 # filename, etc.
 
-read_repository_listing();
+read_repository_listing() unless $argv_nomaster;
+$package_filename ||= $repository_listing->{files}->{package_listing} ||= "/oscar_packages.xml";
 
 # Now act on whether we're in "parsable output" mode or interactive
 # mode
--- /opt/oscar/lib/Qt/OpderDownloadInfo.pm.orig	2004-06-14 14:09:22.000000000 -0700
+++ /opt/oscar/lib/Qt/OpderDownloadInfo.pm	2004-06-15 11:34:45.000000000 -0700
@@ -439,6 +439,8 @@
       delete $repositories{$currRepositoryURL};
       # Set up the QProcess with the "read repository" opd command
       my @args = ($opdcmd,'--parsable','-r',$currRepositoryURL);
+      push @args, "--nomaster"
+        if parent()->child('addRepositoryForm')->useRepositoriesExclusively;
       $readProc->setArguments(\@args);
       $readPhase = 2;
       $readString = "";