Attachment 6183 Details for Bug 15549 – patch to avoid needless reinstall of libsane-hpaio package

patch to avoid needless reinstall of libsane-hpaio package

avoid-reinstall-of-libsane-hpaio.patch (text/plain), 2.10 KB, created by Martin Whitaker on 2015-04-04 14:43:20 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Whitaker

Created: 2015-04-04 14:43:20 CEST

Size: 2.10 KB

patch

obsolete

>--- newprinter.py.orig	2015-04-03 22:19:08.122468445 +0100
>+++ newprinter.py	2015-04-03 22:33:53.230491448 +0100
>@@ -1206,19 +1206,25 @@
> 
>                 self.nextnptab_rerun = False
> 
>-                if page_nr == 1 or page_nr == 2:
>-                    if (self.nextnptab_rerun == False and
>-                        hasattr (self.device, 'hp_scannable') and
>-                        self.device.hp_scannable and
>-                        not os.access ("/etc/sane.d/dll.d/hpaio", os.R_OK) and
>-                        not os.access ("/etc/sane.d/dll.d/hplip", os.R_OK)):
>-                        debugprint ("No HPLIP sane backend so "
>-                                    "attempting install")
>-                        try:
>-                            pk = installpackage.PackageKit ()
>-                            pk.InstallPackageName (0, 0, "libsane-hpaio")
>-                        except:
>-                            pass
>+# For Mageia, this doesn't work for three reasons:
>+#   - the lib{64}sane-hpaio1 package adds hpaio to etc/sane.d/dll.conf, rather
>+#     than creating a file in etc/sane.d/dll.d
>+#   - the package name is lib{64}sane-hpaio1, not libsane-hpaio
>+#   - packagekit doesn't currently work (bug 14479)
>+# However, mga_printer_custom.py takes care of installing this package.
>+#                if page_nr == 1 or page_nr == 2:
>+#                    if (self.nextnptab_rerun == False and
>+#                        hasattr (self.device, 'hp_scannable') and
>+#                        self.device.hp_scannable and
>+#                        not os.access ("/etc/sane.d/dll.d/hpaio", os.R_OK) and
>+#                        not os.access ("/etc/sane.d/dll.d/hplip", os.R_OK)):
>+#                        debugprint ("No HPLIP sane backend so "
>+#                                    "attempting install")
>+#                        try:
>+#                            pk = installpackage.PackageKit ()
>+#                            pk.InstallPackageName (0, 0, "libsane-hpaio")
>+#                        except:
>+#                            pass
> 
>                 ppdname = None
>                 self.id_matched_ppdnames = []

--- newprinter.py.orig	2015-04-03 22:19:08.122468445 +0100
+++ newprinter.py	2015-04-03 22:33:53.230491448 +0100
@@ -1206,19 +1206,25 @@
 
                 self.nextnptab_rerun = False
 
-                if page_nr == 1 or page_nr == 2:
-                    if (self.nextnptab_rerun == False and
-                        hasattr (self.device, 'hp_scannable') and
-                        self.device.hp_scannable and
-                        not os.access ("/etc/sane.d/dll.d/hpaio", os.R_OK) and
-                        not os.access ("/etc/sane.d/dll.d/hplip", os.R_OK)):
-                        debugprint ("No HPLIP sane backend so "
-                                    "attempting install")
-                        try:
-                            pk = installpackage.PackageKit ()
-                            pk.InstallPackageName (0, 0, "libsane-hpaio")
-                        except:
-                            pass
+# For Mageia, this doesn't work for three reasons:
+#   - the lib{64}sane-hpaio1 package adds hpaio to etc/sane.d/dll.conf, rather
+#     than creating a file in etc/sane.d/dll.d
+#   - the package name is lib{64}sane-hpaio1, not libsane-hpaio
+#   - packagekit doesn't currently work (bug 14479)
+# However, mga_printer_custom.py takes care of installing this package.
+#                if page_nr == 1 or page_nr == 2:
+#                    if (self.nextnptab_rerun == False and
+#                        hasattr (self.device, 'hp_scannable') and
+#                        self.device.hp_scannable and
+#                        not os.access ("/etc/sane.d/dll.d/hpaio", os.R_OK) and
+#                        not os.access ("/etc/sane.d/dll.d/hplip", os.R_OK)):
+#                        debugprint ("No HPLIP sane backend so "
+#                                    "attempting install")
+#                        try:
+#                            pk = installpackage.PackageKit ()
+#                            pk.InstallPackageName (0, 0, "libsane-hpaio")
+#                        except:
+#                            pass
 
                 ppdname = None
                 self.id_matched_ppdnames = []

Actions: View

Attachments on bug 15549: 6179 | 6183 | 6184 | 6185 | 6189