This commit was manufactured by cvs2svn to create branch

'unlabeled-1.1.1'.

1 files changed, 9 insertions, 15 deletions

diff --git a/perl-install/standalone/printerdrake b/perl-install/standalone/printerdrake
index 4903e3bc4..3ccd01311 100755
--- a/perl-install/standalone/printerdrake
+++ b/perl-install/standalone/printerdrake
@@ -21,28 +21,22 @@
 use lib qw(/usr/lib/libDrakX);
 
 use interactive;
-use printer;
 use printerdrake;
-use c;
 
 local $_ = join '', @ARGV;
 
 /-h/ and die "usage: printerdrake [--beginner] [--expert] [--auto] [--noauto] [--skiptest] [--testing]\n";
 
-$::beginner = /-beginner/;
-$::expert = /-expert/;
-$::auto = /-auto/;
-$::noauto = /-noauto/;
-$::skiptest = /-skiptest/;
-$::testing = /-testing/;
+$::beginner = /--beginner/;
+$::expert = /--expert/;
+$::auto = /--auto/;
+$::noauto = /--noauto/;
+$::skiptest = /--skiptest/;
+$::testing = /--testing/;
 $::isStandalone = 1;
 
-my $f = "/usr/lib/rhs/rhs-printfilters";
--e $f or system("urpmi --auto rhs-printfilters");
--e $f or die "install rhs-printfilters first!\n";
+my $in = vnew interactive;
 
-my $in = vnew interactive('su');
+printerdrake::main('', printerdrake::getinfo(''), $in, sub { `urpmi --auto $_[0]` });
 
-printerdrake::main(eval { printer::getinfo('') } || {}, $in, sub { `urpmi --auto $_[0]` });
-
-$in->exit(0);
+exec 'true' if ref($in) =~ /gtk/; #- workaround for perl-GTK