Attachment 5089 Details for Bug 12496 – proper fix

[patch] proper fix

scan.diff (text/plain), 1.03 KB, created by Thierry Vignaud on 2014-04-02 06:27:53 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Vignaud

Created: 2014-04-02 06:27:53 CEST

Size: 1.03 KB

patch

obsolete

>--- /tmp/drakscanner	2014-04-02 06:26:36.651518457 +0200
>+++ /usr/libexec/drakscanner	2014-04-02 06:26:12.624889047 +0200
>@@ -41,25 +41,12 @@
> 
> $ugtk3::wm_icon = "scannerdrake";
> my $in = 'interactive'->vnew('su');
>-if (!files_exist(qw(/usr/bin/scanimage
>-		    /etc/sane.d/dll.conf)) ||
>-    (!files_exist(qw(/usr/bin/xsane)) &&
>-     !files_exist(qw(/usr/bin/skanlite)) &&
>-     !$in->do_pkgs->is_installed('scanner-gui'))) {
>-    if (!$in->ask_yesorno(N("Warning"), N("SANE packages need to be installed to use scanners.
>-
>-Do you want to install the SANE packages?"))) {
>-	$in->ask_warn(N("Warning"), 
>-		      N("Aborting Scannerdrake."));
>-	exit 0;
>-    }
>     if (!$in->do_pkgs->install('task-scanning')) {
> 	$in->ask_warn(N("Error"),
> 		      N("Could not install the packages needed to set up a scanner with Scannerdrake.") . " " .
> 		      N("Scannerdrake will not be started now."));
> 	exit 0;
>     }
>-}
> if ($::Manual) { manual(); quit() }
> my $wait = $in->wait_message(N("Please wait"),
> 			     N("Searching for configured scanners..."));

--- /tmp/drakscanner	2014-04-02 06:26:36.651518457 +0200
+++ /usr/libexec/drakscanner	2014-04-02 06:26:12.624889047 +0200
@@ -41,25 +41,12 @@
 
 $ugtk3::wm_icon = "scannerdrake";
 my $in = 'interactive'->vnew('su');
-if (!files_exist(qw(/usr/bin/scanimage
-		    /etc/sane.d/dll.conf)) ||
-    (!files_exist(qw(/usr/bin/xsane)) &&
-     !files_exist(qw(/usr/bin/skanlite)) &&
-     !$in->do_pkgs->is_installed('scanner-gui'))) {
-    if (!$in->ask_yesorno(N("Warning"), N("SANE packages need to be installed to use scanners.
-
-Do you want to install the SANE packages?"))) {
-	$in->ask_warn(N("Warning"), 
-		      N("Aborting Scannerdrake."));
-	exit 0;
-    }
     if (!$in->do_pkgs->install('task-scanning')) {
 	$in->ask_warn(N("Error"),
 		      N("Could not install the packages needed to set up a scanner with Scannerdrake.") . " " .
 		      N("Scannerdrake will not be started now."));
 	exit 0;
     }
-}
 if ($::Manual) { manual(); quit() }
 my $wait = $in->wait_message(N("Please wait"),
 			     N("Searching for configured scanners..."));

Actions: View | Diff

Attachments on bug 12496: 5089