Merge pull request #10 from mchf/master

Merged SLE-12-SP2

package/yast2-scanner.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Apr  3 08:33:51 UTC 2017 - mfilka@suse.com
+
+- bnc#1026027
+  - dropped calls to insserv related to HP's obsoleted services.
+- 3.2.0
+
 -------------------------------------------------------------------
 Tue Jun  7 11:15:38 UTC 2016 - igonzalezsosa@suse.com
 

package/yast2-scanner.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-scanner
-Version:        3.1.3
+Version:        3.2.0
 Release:        0
 Group:		System/YaST
 

src/modules/Scanner.rb

@@ -266,8 +266,6 @@ def main
       @activate_backend_commandline = "/usr/lib/YaST2/bin/activate_scanner_backend"
       @deactivate_backend_commandline = "/usr/lib/YaST2/bin/deactivate_scanner_backend"
       @test_backend_commandline = "/usr/lib/YaST2/bin/test_scanner_backend"
-      @setup_ptal_scanner_service_commandline = "/usr/lib/YaST2/bin/setup_ptal_scanner_service"
-      @setup_hplip_scanner_service_commandline = "/usr/lib/YaST2/bin/setup_hplip_scanner_service"
       @network_scanning_config_filename = "/var/lib/YaST2/network_scanning_config.ycp"
       @determine_network_scanning_config_commandline = Ops.add(
         "/usr/lib/YaST2/bin/determine_network_scanner_config YCP >",
@@ -2077,17 +2075,6 @@ def ActivateBackend(backend_name, database_index, user_confirmation)
             end
           end
         end
-        # No conflicting print queue was found or
-        # a conflicting print queue was found but the user forced to proceed.
-        # Since HPLIP version 2.8.4 there are no longer any startup daemons.
-        # The hplip init script was adapted to provide backward compatibility:
-        # It still exists to avoid that printer/scanner setup tools fail
-        # when they try to enable the "hplip" service but all it does
-        # is to stop a possibly running hpssd.
-        # All what /usr/lib/YaST2/bin/setup_hplip_scanner_service still does
-        # is to disable both ptal and hplip completely if such a service exists.
-        # There is no need to care about the exit code because it exits successfully in any case:
-        ExecuteBashCommand(@setup_hplip_scanner_service_commandline)
       end
       # The hpoj backend (from the package hp-officeJet) requires the PTAL service to be up and running.
       # Before starting the PTAL service works it must have been initialized.
@@ -2120,19 +2107,6 @@ def ActivateBackend(backend_name, database_index, user_confirmation)
               return false
             end
           end
-          # No conflicting print queue was found or
-          # a conflicting print queue was found but the user forced to proceed:
-          if !ExecuteBashCommand(@setup_ptal_scanner_service_commandline)
-            Popup.ErrorDetails(
-              # Only a simple message because this error does not happen on a normal system
-              # (i.e. a system which is not totally broken or totally messed up).
-              # Do not change or translate "PTAL", it is a subsystem name.
-              _("Failed to set up the PTAL system."),
-              Ops.get_string(@result, "stderr", "")
-            )
-            Progress.Title(_("Aborted"))
-            return false
-          end
         end
       end
       # Activate the backend via bash script:

tools/Makefile.am

@@ -8,8 +8,6 @@ ybin_SCRIPTS =					\
 	activate_scanner_backend		\
 	deactivate_scanner_backend		\
 	test_scanner_backend			\
-	setup_ptal_scanner_service		\
-	setup_hplip_scanner_service		\
 	determine_network_scanner_config	\
 	setup_network_scanner_config