summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2003-02-28 01:00:36 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2003-02-28 01:00:36 +0000
commit65a233d0370511236e8879136caaa2cd4d307c1e (patch)
treed9f823e67bdc6ca79b276d912c52b1c90ffc66cf /perl-install
parenta7f6e83d669be2b2b8649ab198159972e890072e (diff)
downloaddrakx-backup-do-not-use-65a233d0370511236e8879136caaa2cd4d307c1e.tar
drakx-backup-do-not-use-65a233d0370511236e8879136caaa2cd4d307c1e.tar.gz
drakx-backup-do-not-use-65a233d0370511236e8879136caaa2cd4d307c1e.tar.bz2
drakx-backup-do-not-use-65a233d0370511236e8879136caaa2cd4d307c1e.tar.xz
drakx-backup-do-not-use-65a233d0370511236e8879136caaa2cd4d307c1e.zip
- Fixed confScanner() deleting the config file in some cases.
- Removed PDQ from share/rpmsrate
Diffstat (limited to 'perl-install')
-rwxr-xr-xperl-install/scanner.pm3
-rw-r--r--perl-install/share/rpmsrate2
2 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/scanner.pm b/perl-install/scanner.pm
index 7f843bc3e..08ac062a8 100755
--- a/perl-install/scanner.pm
+++ b/perl-install/scanner.pm
@@ -48,9 +48,10 @@ sub confScanner {
next if $line =~ /\$VENDOR/;
$line =~ s/\$PRODUCT/$product/g if $product;
next if $line =~ /\$PRODUCT/;
- $line =~ /^(\S+)LINE\s+(.*?)$/;
+ $line =~ /^(\S*)LINE\s+(.*?)$/;
my $linetype = $1;
$line = $2;
+ next if !$line;
if (!$linetype or
($linetype eq "USB" and ($port =~ /usb/i or $vendor)) or
($linetype eq "PARPORT" and !$vendor and
diff --git a/perl-install/share/rpmsrate b/perl-install/share/rpmsrate
index 7f9815725..3ac18325b 100644
--- a/perl-install/share/rpmsrate
+++ b/perl-install/share/rpmsrate
@@ -550,7 +550,7 @@ INSTALL
autologin ntp cups-drivers samba ncpfs hpoj ucd-snmp libptal0
libhpojip0 libsnmp0 xojpanel libsane-hpoj0
ipchains shorewall iptables printer-utils rlpr samba-client
- xpp pdq printer-testpages nmap scli net-tools
+ xpp printer-testpages nmap scli net-tools
autologin ntp ipchains
cups lpr printer-utils printer-testpages gimpprint xpp
foomatic-db-engine foomatic-filters foomatic-db