RHEL 9.0.0 Alpha bootstrap
The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/system-config-printer#158b07c1fd7425dc86f0054aef54550e4997b66f
This commit is contained in:
parent
c109f60360
commit
dad7d3952f
262
.gitignore
vendored
262
.gitignore
vendored
@ -0,0 +1,262 @@
|
||||
printconf-0.6.113.tar.bz2
|
||||
printconf-0.6.114.tar.bz2
|
||||
printconf-0.6.115.tar.bz2
|
||||
printconf-0.6.116.tar.bz2
|
||||
printconf-0.6.117.tar.bz2
|
||||
printconf-0.6.118.tar.bz2
|
||||
printconf-0.6.119.tar.bz2
|
||||
printconf-0.6.120.tar.bz2
|
||||
printconf-0.6.121.tar.bz2
|
||||
printconf-0.6.122.tar.bz2
|
||||
printconf-0.6.123.tar.bz2
|
||||
printconf-0.6.124.tar.bz2
|
||||
printconf-0.6.125.tar.bz2
|
||||
printconf-0.6.126.tar.bz2
|
||||
printconf-0.6.127.tar.bz2
|
||||
printconf-0.6.128.tar.bz2
|
||||
printconf-0.6.129.tar.bz2
|
||||
printconf-0.6.130.tar.bz2
|
||||
printconf-0.6.131.tar.bz2
|
||||
printconf-0.6.132.tar.bz2
|
||||
printconf-0.6.133.tar.bz2
|
||||
printconf-0.6.134.tar.bz2
|
||||
printconf-0.6.135.tar.bz2
|
||||
printconf-0.6.136.tar.bz2
|
||||
printconf-0.6.137.tar.bz2
|
||||
printconf-0.6.138.tar.bz2
|
||||
printconf-0.6.139.tar.bz2
|
||||
printconf-0.6.140.tar.bz2
|
||||
printconf-0.6.141.tar.bz2
|
||||
printconf-0.6.142.tar.bz2
|
||||
printconf-0.6.143.tar.bz2
|
||||
printconf-0.6.144.tar.bz2
|
||||
printconf-0.6.145.tar.bz2
|
||||
printconf-0.6.146.tar.bz2
|
||||
printconf-0.6.147.tar.bz2
|
||||
printconf-0.6.148.tar.bz2
|
||||
printconf-0.6.149.tar.bz2
|
||||
printconf-0.6.150.tar.bz2
|
||||
printconf-0.6.151.tar.bz2
|
||||
system-config-printer-0.7.4.tar.bz2
|
||||
pycups-1.9.7.tar.bz2
|
||||
pycups-1.9.8.tar.bz2
|
||||
system-config-printer-0.7.5.tar.bz2
|
||||
system-config-printer-0.7.6.tar.bz2
|
||||
pycups-1.9.9.tar.bz2
|
||||
system-config-printer-0.7.7.tar.bz2
|
||||
pycups-1.9.10.tar.bz2
|
||||
system-config-printer-0.7.8.tar.bz2
|
||||
pycups-1.9.11.tar.bz2
|
||||
system-config-printer-0.7.9.tar.bz2
|
||||
system-config-printer-0.7.10.tar.bz2
|
||||
system-config-printer-0.7.11.tar.bz2
|
||||
system-config-printer-0.7.12.tar.bz2
|
||||
system-config-printer-0.7.13.tar.bz2
|
||||
system-config-printer-0.7.14.tar.bz2
|
||||
system-config-printer-0.7.15.tar.bz2
|
||||
system-config-printer-0.7.16.tar.bz2
|
||||
system-config-printer-0.7.17.tar.bz2
|
||||
system-config-printer-0.7.18.tar.bz2
|
||||
system-config-printer-0.7.19.tar.bz2
|
||||
system-config-printer-0.7.20.tar.bz2
|
||||
pycups-1.9.12.tar.bz2
|
||||
system-config-printer-0.7.21.tar.bz2
|
||||
system-config-printer-0.7.22.tar.bz2
|
||||
system-config-printer-0.7.23.tar.bz2
|
||||
system-config-printer-0.7.24.tar.bz2
|
||||
system-config-printer-0.7.25.tar.bz2
|
||||
system-config-printer-0.7.26.tar.bz2
|
||||
system-config-printer-0.7.27.tar.bz2
|
||||
system-config-printer-0.7.28.tar.bz2
|
||||
system-config-printer-0.7.29.tar.bz2
|
||||
system-config-printer-0.7.30.tar.bz2
|
||||
system-config-printer-0.7.31.tar.bz2
|
||||
pycups-1.9.13.tar.bz2
|
||||
system-config-printer-0.7.32.tar.bz2
|
||||
pycups-1.9.14.tar.bz2
|
||||
system-config-printer-0.7.35.tar.bz2
|
||||
system-config-printer-0.7.36.tar.bz2
|
||||
system-config-printer-0.7.37.tar.bz2
|
||||
pycups-1.9.15.tar.bz2
|
||||
system-config-printer-0.7.38.tar.bz2
|
||||
system-config-printer-0.7.39.tar.bz2
|
||||
system-config-printer-0.7.40.tar.bz2
|
||||
pycups-1.9.16.tar.bz2
|
||||
system-config-printer-0.7.41.tar.bz2
|
||||
system-config-printer-0.7.42.tar.bz2
|
||||
system-config-printer-0.7.43.tar.bz2
|
||||
system-config-printer-0.7.44.tar.bz2
|
||||
system-config-printer-0.7.45.tar.bz2
|
||||
system-config-printer-0.7.46.tar.bz2
|
||||
system-config-printer-0.7.47.tar.bz2
|
||||
system-config-printer-0.7.49.tar.bz2
|
||||
system-config-printer-0.7.50.tar.bz2
|
||||
system-config-printer-0.7.51.tar.bz2
|
||||
system-config-printer-0.7.52.tar.bz2
|
||||
system-config-printer-0.7.53.tar.bz2
|
||||
system-config-printer-0.7.54.tar.bz2
|
||||
system-config-printer-0.7.55.tar.bz2
|
||||
system-config-printer-0.7.56.tar.bz2
|
||||
pycups-1.9.18.tar.bz2
|
||||
system-config-printer-0.7.57.tar.bz2
|
||||
system-config-printer-0.7.58.tar.bz2
|
||||
system-config-printer-0.7.59.tar.bz2
|
||||
pycups-1.9.19.tar.bz2
|
||||
system-config-printer-0.7.60.tar.bz2
|
||||
system-config-printer-0.7.61.tar.bz2
|
||||
system-config-printer-0.7.62.tar.bz2
|
||||
pycups-1.9.20.tar.bz2
|
||||
system-config-printer-0.7.63.tar.bz2
|
||||
system-config-printer-0.7.63.1.tar.bz2
|
||||
pycups-1.9.22.tar.bz2
|
||||
system-config-printer-0.7.65.tar.bz2
|
||||
system-config-printer-0.7.66.tar.bz2
|
||||
pycups-1.9.7.tar.bz2
|
||||
pycups-1.9.8.tar.bz2
|
||||
pycups-1.9.9.tar.bz2
|
||||
pycups-1.9.10.tar.bz2
|
||||
pycups-1.9.11.tar.bz2
|
||||
pycups-1.9.12.tar.bz2
|
||||
pycups-1.9.13.tar.bz2
|
||||
pycups-1.9.14.tar.bz2
|
||||
pycups-1.9.15.tar.bz2
|
||||
pycups-1.9.16.tar.bz2
|
||||
pycups-1.9.18.tar.bz2
|
||||
pycups-1.9.19.tar.bz2
|
||||
pycups-1.9.20.tar.bz2
|
||||
pycups-1.9.23.tar.bz2
|
||||
pycups-1.9.24.tar.bz2
|
||||
system-config-printer-0.7.67.tar.bz2
|
||||
system-config-printer-0.7.68.tar.bz2
|
||||
system-config-printer-0.7.69.tar.bz2
|
||||
system-config-printer-0.7.70.tar.bz2
|
||||
system-config-printer-0.7.71.tar.bz2
|
||||
system-config-printer-0.7.72.tar.bz2
|
||||
system-config-printer-0.7.73.tar.bz2
|
||||
pycups-1.9.25.tar.bz2
|
||||
system-config-printer-0.7.74.tar.bz2
|
||||
system-config-printer-0.7.74.1.tar.bz2
|
||||
pycups-1.9.26.tar.bz2
|
||||
pycups-1.9.27.tar.bz2
|
||||
system-config-printer-0.7.74.2.tar.bz2
|
||||
system-config-printer-0.7.74.3.tar.bz2
|
||||
system-config-printer-0.7.74.4.tar.bz2
|
||||
system-config-printer-0.7.75.tar.bz2
|
||||
system-config-printer-0.7.76.tar.bz2
|
||||
system-config-printer-0.7.77.tar.bz2
|
||||
pycups-1.9.29.tar.bz2
|
||||
pycups-1.9.30.tar.bz2
|
||||
pycups-1.9.31.tar.bz2
|
||||
system-config-printer-0.7.78.tar.bz2
|
||||
pycups-1.9.32.tar.bz2
|
||||
pycups-1.9.33.tar.bz2
|
||||
system-config-printer-0.7.79.tar.bz2
|
||||
pycups-1.9.34.tar.bz2
|
||||
system-config-printer-0.7.80.tar.bz2
|
||||
system-config-printer-0.7.81.tar.bz2
|
||||
pycups-1.9.35.tar.bz2
|
||||
system-config-printer-0.7.82.tar.bz2
|
||||
system-config-printer-0.7.82.1.tar.bz2
|
||||
pycups-1.9.36.tar.bz2
|
||||
pycups-1.9.37.tar.bz2
|
||||
system-config-printer-0.7.82.2.tar.bz2
|
||||
pycups-1.9.38.tar.bz2
|
||||
system-config-printer-0.9.90.tar.bz2
|
||||
pysmbc-1.0.0.tar.bz2
|
||||
system-config-printer-0.9.91.tar.bz2
|
||||
pysmbc-1.0.2.tar.bz2
|
||||
system-config-printer-0.9.92.tar.bz2
|
||||
system-config-printer-0.9.93.tar.bz2
|
||||
system-config-printer-1.0.0.tar.bz2
|
||||
pycups-1.9.39.tar.bz2
|
||||
pysmbc-1.0.3.tar.bz2
|
||||
system-config-printer-1.0.1.tar.bz2
|
||||
system-config-printer-1.0.2.tar.bz2
|
||||
pysmbc-1.0.4.tar.bz2
|
||||
pycups-1.9.40.tar.bz2
|
||||
system-config-printer-1.0.3.tar.bz2
|
||||
system-config-printer-1.0.4.tar.bz2
|
||||
pycups-1.9.41.tar.bz2
|
||||
system-config-printer-1.0.5.tar.bz2
|
||||
system-config-printer-1.0.6.tar.bz2
|
||||
pycups-1.9.42.tar.bz2
|
||||
pysmbc-1.0.5.tar.bz2
|
||||
system-config-printer-1.0.7.tar.bz2
|
||||
system-config-printer-1.0.8.tar.bz2
|
||||
pysmbc-1.0.6.tar.bz2
|
||||
system-config-printer-1.0.9.tar.bz2
|
||||
system-config-printer-1.0.10.tar.bz2
|
||||
system-config-printer-1.0.11.tar.bz2
|
||||
pycups-1.9.43.tar.bz2
|
||||
pycups-1.9.44.tar.bz2
|
||||
system-config-printer-1.0.12.tar.bz2
|
||||
system-config-printer-1.1.0.tar.bz2
|
||||
system-config-printer-1.1.1.tar.bz2
|
||||
pycups-1.9.45.tar.bz2
|
||||
system-config-printer-1.1.2.tar.bz2
|
||||
system-config-printer-1.1.3.tar.bz2
|
||||
system-config-printer-1.1.4.tar.bz2
|
||||
system-config-printer-1.1.5.tar.bz2
|
||||
system-config-printer-1.1.6.tar.bz2
|
||||
system-config-printer-1.1.7.tar.bz2
|
||||
pycups-1.9.46.tar.bz2
|
||||
system-config-printer-1.1.8.tar.bz2
|
||||
system-config-printer-1.1.10.tar.bz2
|
||||
system-config-printer-1.1.11.tar.xz
|
||||
system-config-printer-1.1.12.tar.xz
|
||||
system-config-printer-1.1.13.tar.xz
|
||||
system-config-printer-1.1.14.tar.xz
|
||||
system-config-printer-1.1.15.tar.xz
|
||||
pycups-1.9.47.tar.bz2
|
||||
system-config-printer-1.1.16.tar.xz
|
||||
pycups-1.9.48.tar.bz2
|
||||
system-config-printer-1.1.90.tar.xz
|
||||
system-config-printer-1.1.91.tar.xz
|
||||
system-config-printer-1.1.92.tar.xz
|
||||
system-config-printer-1.1.93.tar.xz
|
||||
system-config-printer-1.2.0.tar.xz
|
||||
pycups-1.9.49.tar.bz2
|
||||
system-config-printer-1.2.1.tar.xz
|
||||
system-config-printer-1.2.2.tar.xz
|
||||
pysmbc-1.0.7.tar.bz2
|
||||
pycups-1.9.50.tar.bz2
|
||||
system-config-printer-1.2.3.tar.xz
|
||||
pycups-1.9.51.tar.bz2
|
||||
/pysmbc-1.0.9.tar.bz2
|
||||
/system-config-printer-1.2.4.tar.xz
|
||||
/system-config-printer-1.2.5.tar.xz
|
||||
/system-config-printer-1.2.95.tar.xz
|
||||
/system-config-printer-1.2.96.tar.xz
|
||||
/system-config-printer-1.2.97.tar.xz
|
||||
/system-config-printer-1.3.0.tar.xz
|
||||
/system-config-printer-1.3.1.tar.xz
|
||||
/system-config-printer-1.3.2.tar.xz
|
||||
/system-config-printer-1.3.3.tar.xz
|
||||
/system-config-printer-1.3.4.tar.xz
|
||||
/system-config-printer-1.3.5.tar.xz
|
||||
/system-config-printer-1.3.6.tar.xz
|
||||
/system-config-printer-1.3.7.tar.xz
|
||||
/system-config-printer-1.3.8.tar.xz
|
||||
/system-config-printer-1.3.9.tar.xz
|
||||
/system-config-printer-1.3.10.tar.xz
|
||||
/system-config-printer-1.3.11.tar.xz
|
||||
/system-config-printer-1.3.12.tar.xz
|
||||
/system-config-printer-1.3.13.tar.xz
|
||||
/system-config-printer-1.4.0.tar.xz
|
||||
/system-config-printer-1.4.1.tar.xz
|
||||
/system-config-printer-1.4.2.tar.xz
|
||||
/system-config-printer-1.4.3.tar.xz
|
||||
/system-config-printer-1.4.4.tar.xz
|
||||
/system-config-printer-1.4.5.tar.xz
|
||||
/system-config-printer-1.4.6.tar.xz
|
||||
/system-config-printer-1.5.0.tar.xz
|
||||
/system-config-printer-1.5.1.tar.xz
|
||||
/system-config-printer-1.5.2.tar.xz
|
||||
/system-config-printer-1.5.3.tar.xz
|
||||
/system-config-printer-1.5.4.tar.xz
|
||||
/system-config-printer-1.5.5.tar.xz
|
||||
/system-config-printer-1.5.6.tar.xz
|
||||
/system-config-printer-1.5.7.tar.xz
|
||||
/system-config-printer-1.5.9.tar.gz
|
||||
/system-config-printer-1.5.11.tar.gz
|
||||
/system-config-printer-1.5.12.tar.gz
|
||||
48
0001-isAlive-is-removed-use-is_alive.patch
Normal file
48
0001-isAlive-is-removed-use-is_alive.patch
Normal file
@ -0,0 +1,48 @@
|
||||
From cf7a74217558b19aff7c21a724878bcc15dc4e38 Mon Sep 17 00:00:00 2001
|
||||
From: Zdenek Dohnal <zdohnal@redhat.com>
|
||||
Date: Mon, 5 Oct 2020 09:26:40 +0200
|
||||
Subject: [PATCH] isAlive() is removed, use is_alive()
|
||||
|
||||
---
|
||||
asyncipp.py | 2 +-
|
||||
timedops.py | 4 ++--
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/asyncipp.py b/asyncipp.py
|
||||
index 5bc160e0..61cd7213 100644
|
||||
--- a/asyncipp.py
|
||||
+++ b/asyncipp.py
|
||||
@@ -269,7 +269,7 @@ class IPPConnection:
|
||||
for binding in self.bindings:
|
||||
delattr (self, binding)
|
||||
|
||||
- if self.thread.isAlive ():
|
||||
+ if self.thread.is_alive ():
|
||||
debugprint ("Stopping worker thread")
|
||||
self.thread.stop ()
|
||||
GLib.timeout_add_seconds (1, self._reap_thread)
|
||||
diff --git a/timedops.py b/timedops.py
|
||||
index 8a8741c8..111d575f 100644
|
||||
--- a/timedops.py
|
||||
+++ b/timedops.py
|
||||
@@ -157,7 +157,7 @@ class OperationThread(threading.Thread):
|
||||
self.exception = e
|
||||
|
||||
def collect_result (self):
|
||||
- if self.isAlive ():
|
||||
+ if self.is_alive ():
|
||||
# We've been canceled.
|
||||
raise OperationCanceled()
|
||||
|
||||
@@ -212,7 +212,7 @@ class TimedOperation(Timed):
|
||||
return self.thread.collect_result ()
|
||||
|
||||
def _check_thread (self):
|
||||
- if self.thread.isAlive ():
|
||||
+ if self.thread.is_alive ():
|
||||
# Thread still running.
|
||||
return True
|
||||
|
||||
--
|
||||
2.26.2
|
||||
|
||||
71
0001-udev-configure-printer-Add-checks-for-NULL.patch
Normal file
71
0001-udev-configure-printer-Add-checks-for-NULL.patch
Normal file
@ -0,0 +1,71 @@
|
||||
diff --git a/NEWS b/NEWS
|
||||
index f4b774e..0b53aa8 100644
|
||||
--- a/NEWS
|
||||
+++ b/NEWS
|
||||
@@ -1,5 +1,6 @@
|
||||
1.5.13 changes
|
||||
--------------
|
||||
+- add checks for NULL in udev-configure-printer (Fedora #1761097)
|
||||
|
||||
1.5.12 changes
|
||||
--------------
|
||||
diff --git a/udev/udev-configure-printer.c b/udev/udev-configure-printer.c
|
||||
index 83092fc..8f6ce3d 100644
|
||||
--- a/udev/udev-configure-printer.c
|
||||
+++ b/udev/udev-configure-printer.c
|
||||
@@ -1285,7 +1285,8 @@ normalize_device_uri(const char *str_orig)
|
||||
{
|
||||
int i, j;
|
||||
int havespace = 0;
|
||||
- char *str;
|
||||
+ char *str = NULL;
|
||||
+ char *cropped_str = NULL;
|
||||
|
||||
if (str_orig == NULL)
|
||||
return NULL;
|
||||
@@ -1333,7 +1334,11 @@ normalize_device_uri(const char *str_orig)
|
||||
(strstr(str, "packard ") == str) ||
|
||||
(strstr(str, "apollo ") == str) ||
|
||||
(strstr(str, "usb ") == str))
|
||||
- str = strchr(str, ' ') + 1;
|
||||
+ {
|
||||
+ cropped_str = strdup(strchr(str, ' ') + 1);
|
||||
+ free(str);
|
||||
+ str = cropped_str;
|
||||
+ }
|
||||
|
||||
return str;
|
||||
}
|
||||
@@ -1411,7 +1416,7 @@ for_each_matching_queue (struct device_uris *device_uris,
|
||||
const char *printer_state_message = NULL;
|
||||
int state = 0;
|
||||
size_t i, l;
|
||||
- char *this_device_uri_n, *device_uri_n;
|
||||
+ char *this_device_uri_n = NULL, *device_uri_n = NULL;
|
||||
const char *ps1, *ps2, *pi1, *pi2;
|
||||
|
||||
while (attr && ippGetGroupTag (attr) != IPP_TAG_PRINTER)
|
||||
@@ -1507,13 +1512,21 @@ for_each_matching_queue (struct device_uris *device_uris,
|
||||
break;
|
||||
}
|
||||
}
|
||||
+ if (device_uri_n != NULL)
|
||||
+ {
|
||||
+ free(device_uri_n);
|
||||
+ device_uri_n = NULL;
|
||||
+ }
|
||||
}
|
||||
|
||||
firstqueue = 0;
|
||||
|
||||
skip:
|
||||
- free(device_uri_n);
|
||||
- free(this_device_uri_n);
|
||||
+ if (this_device_uri_n != NULL)
|
||||
+ {
|
||||
+ free(this_device_uri_n);
|
||||
+ this_device_uri_n = NULL;
|
||||
+ }
|
||||
if (!attr)
|
||||
break;
|
||||
}
|
||||
1
sources
Normal file
1
sources
Normal file
@ -0,0 +1 @@
|
||||
SHA512 (system-config-printer-1.5.12.tar.gz) = da7cbf913d3c33fb89c8e1b9a6a12b9ec133831bd89b2f28c771c4ecde697df0be975a45e92f30b2cd4562aafcf87f5d36a01c94d63c7c7107b72b0aecce3756
|
||||
BIN
system-config-printer-1.5.7.tar.xz.sig
Normal file
BIN
system-config-printer-1.5.7.tar.xz.sig
Normal file
Binary file not shown.
135
system-config-printer-getchildren-removed.patch
Normal file
135
system-config-printer-getchildren-removed.patch
Normal file
@ -0,0 +1,135 @@
|
||||
diff --git a/cupshelpers/openprinting.py b/cupshelpers/openprinting.py
|
||||
index c616d913..9bb4764c 100755
|
||||
--- a/cupshelpers/openprinting.py
|
||||
+++ b/cupshelpers/openprinting.py
|
||||
@@ -338,7 +338,7 @@ class OpenPrinting:
|
||||
packages = {}
|
||||
container = driver.find ('packages')
|
||||
if container is not None:
|
||||
- for arch in container.getchildren ():
|
||||
+ for arch in list(container):
|
||||
rpms = {}
|
||||
for package in arch.findall ('package'):
|
||||
rpm = {}
|
||||
@@ -351,7 +351,7 @@ class OpenPrinting:
|
||||
|
||||
repositories = package.find ('repositories')
|
||||
if repositories is not None:
|
||||
- for pkgsys in repositories.getchildren ():
|
||||
+ for pkgsys in list(repositories):
|
||||
rpm.setdefault('repositories', {})[pkgsys.tag] = pkgsys.text
|
||||
|
||||
rpms[package.attrib['file']] = rpm
|
||||
@@ -363,7 +363,7 @@ class OpenPrinting:
|
||||
ppds = []
|
||||
container = driver.find ('ppds')
|
||||
if container is not None:
|
||||
- for each in container.getchildren ():
|
||||
+ for each in list(container):
|
||||
ppds.append (each.text)
|
||||
|
||||
if ppds:
|
||||
diff --git a/cupshelpers/xmldriverprefs.py b/cupshelpers/xmldriverprefs.py
|
||||
index 4177e1c0..0d02950f 100644
|
||||
--- a/cupshelpers/xmldriverprefs.py
|
||||
+++ b/cupshelpers/xmldriverprefs.py
|
||||
@@ -27,7 +27,7 @@ from .cupshelpers import parseDeviceID
|
||||
|
||||
def PreferredDrivers (filename):
|
||||
preferreddrivers = xml.etree.ElementTree.XML (open (filename).read ())
|
||||
- return preferreddrivers.getchildren()
|
||||
+ return list(preferreddrivers)
|
||||
|
||||
class DeviceIDMatch:
|
||||
"""
|
||||
@@ -227,10 +227,10 @@ class DriverTypes:
|
||||
"""
|
||||
|
||||
types = []
|
||||
- for drivertype in drivertypes.getchildren ():
|
||||
+ for drivertype in list(drivertypes):
|
||||
t = DriverType (drivertype.attrib["name"])
|
||||
|
||||
- for child in drivertype.getchildren ():
|
||||
+ for child in list(drivertype):
|
||||
if child.tag == "ppdname":
|
||||
t.add_ppd_name (child.attrib["match"])
|
||||
elif child.tag == "attribute":
|
||||
@@ -238,7 +238,7 @@ class DriverTypes:
|
||||
child.attrib["match"])
|
||||
elif child.tag == "deviceid":
|
||||
deviceid_match = DeviceIDMatch ()
|
||||
- for field in child.getchildren ():
|
||||
+ for field in list(child):
|
||||
if field.tag == "field":
|
||||
deviceid_match.add_field (field.attrib["name"],
|
||||
field.attrib["match"])
|
||||
@@ -414,29 +414,29 @@ class PreferenceOrder:
|
||||
Load the policy from an XML file.
|
||||
"""
|
||||
|
||||
- for printer in preferreddrivers.getchildren ():
|
||||
+ for printer in list(preferreddrivers):
|
||||
ptype = PrinterType ()
|
||||
- for child in printer.getchildren ():
|
||||
+ for child in list(printer):
|
||||
if child.tag == "make-and-model":
|
||||
ptype.add_make_and_model (child.attrib["match"])
|
||||
elif child.tag == "deviceid":
|
||||
deviceid_match = DeviceIDMatch ()
|
||||
- for field in child.getchildren ():
|
||||
+ for field in list(child):
|
||||
if field.tag == "field":
|
||||
deviceid_match.add_field (field.attrib["name"],
|
||||
field.attrib["match"])
|
||||
ptype.add_deviceid_match (deviceid_match)
|
||||
|
||||
elif child.tag == "drivers":
|
||||
- for drivertype in child.getchildren ():
|
||||
+ for drivertype in list(child):
|
||||
ptype.add_drivertype_pattern (drivertype.text)
|
||||
|
||||
elif child.tag == "avoid":
|
||||
- for drivertype in child.getchildren ():
|
||||
+ for drivertype in list(child):
|
||||
ptype.add_avoidtype_pattern (drivertype.text)
|
||||
|
||||
elif child.tag == "blacklist":
|
||||
- for drivertype in child.getchildren ():
|
||||
+ for drivertype in list(child):
|
||||
ptype.add_blacklisted (drivertype.text)
|
||||
|
||||
self.ptypes.append (ptype)
|
||||
diff --git a/xml/validate.py b/xml/validate.py
|
||||
index 8fc201ec..ba16766d 100644
|
||||
--- a/xml/validate.py
|
||||
+++ b/xml/validate.py
|
||||
@@ -35,23 +35,23 @@ class Validator:
|
||||
filename = self._filename
|
||||
print ("Validating %s" % filename)
|
||||
preferreddrivers = xml.etree.ElementTree.XML (open (filename).read ())
|
||||
- (drivertypes, preferenceorder) = preferreddrivers.getchildren ()
|
||||
+ (drivertypes, preferenceorder) = list(preferreddrivers)
|
||||
validates = True
|
||||
|
||||
names = set()
|
||||
- for drivertype in drivertypes.getchildren ():
|
||||
+ for drivertype in list(drivertypes):
|
||||
name = drivertype.get ("name")
|
||||
names.add (name)
|
||||
|
||||
- for printer in preferenceorder.getchildren ():
|
||||
+ for printer in list(preferenceorder):
|
||||
types = []
|
||||
drivers = printer.find ("drivers")
|
||||
if drivers is not None:
|
||||
- types.extend (drivers.getchildren ())
|
||||
+ types.extend (list(drivers))
|
||||
|
||||
blacklist = printer.find ("blacklist")
|
||||
if blacklist is not None:
|
||||
- types.extend (blacklist.getchildren ())
|
||||
+ types.extend (list(blacklist))
|
||||
|
||||
for drivertype in types:
|
||||
pattern = drivertype.text.strip ()
|
||||
2480
system-config-printer.spec
Normal file
2480
system-config-printer.spec
Normal file
File diff suppressed because it is too large
Load Diff
41
upstream-key.gpg
Normal file
41
upstream-key.gpg
Normal file
@ -0,0 +1,41 @@
|
||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
Version: GnuPG v1.4.11 (GNU/Linux)
|
||||
|
||||
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
|
||||
yN+XBvYpzg==
|
||||
=uNLi
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
Loading…
Reference in New Issue
Block a user