Commit 8264506f authored by Didier Raboud's avatar Didier Raboud

Imported Upstream version 3.15.7

parent 0860e93b

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -1095,6 +1095,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \
ppd/hpijs/hp-laserjet_p1006-hpijs.ppd.gz \
ppd/hpijs/hp-color_laserjet_pro_mfp_m176n-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_1005_series-hpijs.ppd.gz \
ppd/hpijs/hp-deskjet_1110_series-hpijs.ppd.gz \
ppd/hpijs/hp-photosmart_d6100_series-hpijs.ppd.gz \
ppd/hpijs/hp-deskjet_672c-hpijs.ppd.gz \
ppd/hpijs/hp-color_laserjet_4730mfp-hpijs-pcl3.ppd.gz \
......@@ -1186,6 +1187,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \
ppd/hpijs/hp-laserjet_m4349_mfp-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-psc_1510_series-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_1020-hpijs.ppd.gz \
ppd/hpijs/hp-officejet_7510_series-hpijs.ppd.gz \
ppd/hpijs/hp-color_laserjet_cm1312nfi_mfp-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-laserjet_m4345_mfp-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-laserjet_p4014n-hpijs.ppd.gz \
......@@ -1331,6 +1333,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \
ppd/hpijs/hp-photosmart_8000_series-hpijs.ppd.gz \
ppd/hpijs/hp-photosmart_plus_b209a-m-hpijs.ppd.gz \
ppd/hpijs/hp-officejet_r60-hpijs.ppd.gz \
ppd/hpijs/hp-deskjet_3830_series-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_p2055d-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-deskjet_975c-hpijs.ppd.gz \
ppd/hpijs/hp-color_laserjet_cp6015-hpijs-pcl3.ppd.gz \
......@@ -1608,6 +1611,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \
ppd/hpijs/hp-psc_950vr-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_p4015n-hpijs.ppd.gz \
ppd/hpijs/hp-officejet_pro_l7300-hpijs.ppd.gz \
ppd/hpijs/hp-officejet_3830_series-hpijs.ppd.gz \
ppd/hpijs/hp-color_laserjet_4500-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-officejet_pro_k550-hpijs.ppd.gz \
ppd/hpijs/hp-deskjet_948c-hpijs.ppd.gz \
......@@ -1786,6 +1790,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \
ppd/hpcups/hp-deskjet_1010_series.ppd.gz \
ppd/hpcups/hp-deskjet_1050_j410_series.ppd.gz \
ppd/hpcups/hp-deskjet_1100.ppd.gz \
ppd/hpcups/hp-deskjet_1110_series.ppd.gz \
ppd/hpcups/hp-deskjet_1120.ppd.gz \
ppd/hpcups/hp-deskjet_1125.ppd.gz \
ppd/hpcups/hp-deskjet_1200c.ppd.gz \
......@@ -1826,6 +1831,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \
ppd/hpcups/hp-deskjet_3819.ppd.gz \
ppd/hpcups/hp-deskjet_3820.ppd.gz \
ppd/hpcups/hp-deskjet_3822.ppd.gz \
ppd/hpcups/hp-deskjet_3830_series.ppd.gz \
ppd/hpcups/hp-deskjet_3840.ppd.gz \
ppd/hpcups/hp-deskjet_3870.ppd.gz \
ppd/hpcups/hp-deskjet_3900.ppd.gz \
......@@ -2196,6 +2202,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \
ppd/hpcups/hp-officejet_100_mobile_l411.ppd.gz \
ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz \
ppd/hpcups/hp-officejet_2620_series.ppd.gz \
ppd/hpcups/hp-officejet_3830_series.ppd.gz \
ppd/hpcups/hp-officejet_4000_k210.ppd.gz \
ppd/hpcups/hp-officejet_4100_series.ppd.gz \
ppd/hpcups/hp-officejet_4105.ppd.gz \
......@@ -2240,6 +2247,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \
ppd/hpcups/hp-officejet_7300_series.ppd.gz \
ppd/hpcups/hp-officejet_7400_series.ppd.gz \
ppd/hpcups/hp-officejet_7500_e910.ppd.gz \
ppd/hpcups/hp-officejet_7510_series.ppd.gz \
ppd/hpcups/hp-officejet_7610_series.ppd.gz \
ppd/hpcups/hp-officejet_8040_series.ppd.gz \
ppd/hpcups/hp-officejet_9100_series-pcl3.ppd.gz \
......@@ -2902,6 +2910,7 @@ foomatic_ppd_printers = \
ppd/hpijs/hp-laserjet_p1006-hpijs.ppd.gz \
ppd/hpijs/hp-color_laserjet_pro_mfp_m176n-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_1005_series-hpijs.ppd.gz \
ppd/hpijs/hp-deskjet_1110_series-hpijs.ppd.gz \
ppd/hpijs/hp-photosmart_d6100_series-hpijs.ppd.gz \
ppd/hpijs/hp-deskjet_672c-hpijs.ppd.gz \
ppd/hpijs/hp-color_laserjet_4730mfp-hpijs-pcl3.ppd.gz \
......@@ -2993,6 +3002,7 @@ foomatic_ppd_printers = \
ppd/hpijs/hp-laserjet_m4349_mfp-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-psc_1510_series-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_1020-hpijs.ppd.gz \
ppd/hpijs/hp-officejet_7510_series-hpijs.ppd.gz \
ppd/hpijs/hp-color_laserjet_cm1312nfi_mfp-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-laserjet_m4345_mfp-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-laserjet_p4014n-hpijs.ppd.gz \
......@@ -3138,6 +3148,7 @@ foomatic_ppd_printers = \
ppd/hpijs/hp-photosmart_8000_series-hpijs.ppd.gz \
ppd/hpijs/hp-photosmart_plus_b209a-m-hpijs.ppd.gz \
ppd/hpijs/hp-officejet_r60-hpijs.ppd.gz \
ppd/hpijs/hp-deskjet_3830_series-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_p2055d-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-deskjet_975c-hpijs.ppd.gz \
ppd/hpijs/hp-color_laserjet_cp6015-hpijs-pcl3.ppd.gz \
......@@ -3415,6 +3426,7 @@ foomatic_ppd_printers = \
ppd/hpijs/hp-psc_950vr-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_p4015n-hpijs.ppd.gz \
ppd/hpijs/hp-officejet_pro_l7300-hpijs.ppd.gz \
ppd/hpijs/hp-officejet_3830_series-hpijs.ppd.gz \
ppd/hpijs/hp-color_laserjet_4500-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-officejet_pro_k550-hpijs.ppd.gz \
ppd/hpijs/hp-deskjet_948c-hpijs.ppd.gz \
......@@ -3855,6 +3867,7 @@ cups_ppd_printers = \
ppd/hpcups/hp-deskjet_1010_series.ppd.gz \
ppd/hpcups/hp-deskjet_1050_j410_series.ppd.gz \
ppd/hpcups/hp-deskjet_1100.ppd.gz \
ppd/hpcups/hp-deskjet_1110_series.ppd.gz \
ppd/hpcups/hp-deskjet_1120.ppd.gz \
ppd/hpcups/hp-deskjet_1125.ppd.gz \
ppd/hpcups/hp-deskjet_1200c.ppd.gz \
......@@ -3895,6 +3908,7 @@ cups_ppd_printers = \
ppd/hpcups/hp-deskjet_3819.ppd.gz \
ppd/hpcups/hp-deskjet_3820.ppd.gz \
ppd/hpcups/hp-deskjet_3822.ppd.gz \
ppd/hpcups/hp-deskjet_3830_series.ppd.gz \
ppd/hpcups/hp-deskjet_3840.ppd.gz \
ppd/hpcups/hp-deskjet_3870.ppd.gz \
ppd/hpcups/hp-deskjet_3900.ppd.gz \
......@@ -4266,6 +4280,7 @@ cups_ppd_printers = \
ppd/hpcups/hp-officejet_100_mobile_l411.ppd.gz \
ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz \
ppd/hpcups/hp-officejet_2620_series.ppd.gz \
ppd/hpcups/hp-officejet_3830_series.ppd.gz \
ppd/hpcups/hp-officejet_4000_k210.ppd.gz \
ppd/hpcups/hp-officejet_4100_series.ppd.gz \
ppd/hpcups/hp-officejet_4105.ppd.gz \
......@@ -4310,6 +4325,7 @@ cups_ppd_printers = \
ppd/hpcups/hp-officejet_7300_series.ppd.gz \
ppd/hpcups/hp-officejet_7400_series.ppd.gz \
ppd/hpcups/hp-officejet_7500_e910.ppd.gz \
ppd/hpcups/hp-officejet_7510_series.ppd.gz \
ppd/hpcups/hp-officejet_7610_series.ppd.gz \
ppd/hpcups/hp-officejet_8040_series.ppd.gz \
ppd/hpcups/hp-officejet_9100_series-pcl3.ppd.gz \
......
......@@ -107,6 +107,8 @@ EVENT_START_PRINT_JOB = 500 # sent by hp: backend
EVENT_END_PRINT_JOB = 501 # sent by hp: backend
EVENT_PRINT_FAILED_MISSING_PLUGIN = 502
ERROR_RUNNING_AS_ROOT = 503
EVENT_START_FAX_PRINT_JOB = 600 # sent by hpfax: backend
EVENT_END_FAX_PRINT_JOB = 601 # sent by hpfax: backend
......
......@@ -697,8 +697,8 @@ def dataModelHelper(dev, func, ui2):
dev.close()
return 0
def AlignType16Manual(dev, a, b, c, d, e, f, g, h, i):
log.debug("a=%s b=%s c=%s d=%s e=%s f=%s g=%s h=%s i=%s" % (a, b, c, d, e, f, g, h, i ))
def AlignType16Manual(dev, a, b, c, d, e, f, g, h, i, j):
log.debug("a=%s b=%s c=%s d=%s e=%s f=%s g=%s h=%s i=%s j=%s" % (a, b, c, d, e, f, g, h, i, j ))
func = dev.getEWSUrl_LEDM
data = status.StatusType10FetchUrl(func, "/Calibration/State")
......@@ -709,7 +709,7 @@ def AlignType16Manual(dev, a, b, c, d, e, f, g, h, i):
if "CalibrationValid" in data:
return
data = status.StatusType10FetchUrl(func, "/Calibration/State")
data = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!-- THIS DATA SUBJECT TO DISCLAIMER(S) INCLUDED WITH THE PRODUCT OF ORIGIN. -->\n<ManualSelectedPatterns xmlns=\"http://www.hp.com/schemas/imaging/con/cnx/markingagentcalibration/2009/04/08\" xmlns:locid=\"http://www.hp.com/schemas/imaging/con/ledm/localizationids/2007/10/31/\" xmlns:psdyn=\"http://www.hp.com/schemas/imaging/con/ledm/productstatdyn/2007/10/31\"><SelectedPattern><Identifier><Id>1</Id></Identifier><Choice><Identifier><Id>%s</Id></Identifier></Choice></SelectedPattern><SelectedPattern><Identifier><Id>2</Id></Identifier><Choice><Identifier><Id>%s</Id></Identifier></Choice></SelectedPattern><SelectedPattern><Identifier><Id>3</Id></Identifier><Choice><Identifier><Id>%s</Id></Identifier></Choice></SelectedPattern><SelectedPattern><Identifier><Id>4</Id></Identifier><Choice><Identifier><Id>%s</Id></Identifier></Choice></SelectedPattern><SelectedPattern><Identifier><Id>5</Id></Identifier><Choice><Identifier><Id>%s</Id></Identifier></Choice></SelectedPattern><SelectedPattern><Identifier><Id>6</Id></Identifier><Choice><Identifier><Id>%s</Id></Identifier></Choice></SelectedPattern><SelectedPattern><Identifier><Id>7</Id></Identifier><Choice><Identifier><Id>%s</Id></Identifier></Choice></SelectedPattern><SelectedPattern><Identifier><Id>8</Id></Identifier><Choice><Identifier><Id>%s</Id></Identifier></Choice></SelectedPattern><SelectedPattern><Identifier><Id>9</Id></Identifier><Choice><Identifier><Id>%s</Id></Identifier></Choice></SelectedPattern></ManualSelectedPattern>" % ( a, b, c, d, e, f, g, h, i )
data = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!-- THIS DATA SUBJECT TO DISCLAIMER(S) INCLUDED WITH THE PRODUCT OF ORIGIN. -->\n<ManualSelectedPatterns xmlns=\"http://www.hp.com/schemas/imaging/con/cnx/markingagentcalibration/2009/04/08\" xmlns:locid=\"http://www.hp.com/schemas/imaging/con/ledm/localizationids/2007/10/31/\" xmlns:psdyn=\"http://www.hp.com/schemas/imaging/con/ledm/productstatdyn/2007/10/31\"><SelectedPattern><Identifier><Id>1</Id></Identifier><Choice><Identifier><Id>%s</Id></Identifier></Choice></SelectedPattern><SelectedPattern><Identifier><Id>2</Id></Identifier><Choice><Identifier><Id>%s</Id></Identifier></Choice></SelectedPattern><SelectedPattern><Identifier><Id>3</Id></Identifier><Choice><Identifier><Id>%s</Id></Identifier></Choice></SelectedPattern><SelectedPattern><Identifier><Id>4</Id></Identifier><Choice><Identifier><Id>%s</Id></Identifier></Choice></SelectedPattern><SelectedPattern><Identifier><Id>5</Id></Identifier><Choice><Identifier><Id>%s</Id></Identifier></Choice></SelectedPattern><SelectedPattern><Identifier><Id>6</Id></Identifier><Choice><Identifier><Id>%s</Id></Identifier></Choice></SelectedPattern><SelectedPattern><Identifier><Id>7</Id></Identifier><Choice><Identifier><Id>%s</Id></Identifier></Choice></SelectedPattern><SelectedPattern><Identifier><Id>8</Id></Identifier><Choice><Identifier><Id>%s</Id></Identifier></Choice></SelectedPattern><SelectedPattern><Identifier><Id>9</Id></Identifier><Choice><Identifier><Id>%s</Id></Identifier></Choice></SelectedPattern></SelectedPattern><SelectedPattern><Identifier><Id>10</Id></Identifier><Choice><Identifier><Id>%s</Id></Identifier></Choice></SelectedPattern></ManualSelectedPattern>" % ( a, b, c, d, e, f, g, h, i, j )
data = "PUT %s HTTP/1.1\r\nHost: localhost\r\nUser-Agent: hp\r\nAccept: text/plain\r\nAccept-Language: en-us,en\r\nAccept-Charset:utf-8\r\nContent-Type: text/xml\r\nContent-Length: %s\r\n\r\n" % ( calibrationSession, len(data)) + data
data = status.StatusType10FetchUrl(func, calibrationSession, data)
......@@ -734,7 +734,7 @@ def AlignType16(dev, loadpaper_ui, align_ui):
if not loadpaper_ui():
return
dataModelHelper(dev, dev.getEWSUrl_LEDM, align_ui)
state, a, b, c, d, e, f, g, h, i = 0, 6, 6, 3, 3, 6, 6, 6, 6, 6
state, a, b, c, d, e, f, g, h, i, j = 0, 6, 6, 3, 3, 6, 6, 6, 6, 6, 6
ok = False
while state != -1:
if state == 0:
......@@ -745,7 +745,7 @@ def AlignType16(dev, loadpaper_ui, align_ui):
elif state == 1:
state = -1
ok, b = align_ui('B', 'h', 'kc', 3, 11)
ok, b = align_ui('B', 'h', 'kc', 3, 17)
if ok:
state = 2
......@@ -769,37 +769,43 @@ def AlignType16(dev, loadpaper_ui, align_ui):
elif state == 5:
state = -1
ok, e = align_ui('F', 'h', 'k', 3, 11)
ok, f = align_ui('F', 'h', 'k', 3, 11)
if ok:
state = 6
elif state == 6:
state = -1
ok, e = align_ui('G', 'h', 'k', 3, 11)
ok, g = align_ui('G', 'h', 'k', 3, 11)
if ok:
state = 7
elif state == 7:
state = -1
ok, e = align_ui('H', 'h', 'k', 3, 11)
ok, h = align_ui('H', 'h', 'k', 3, 11)
if ok:
state = 8
elif state == 8:
state = -1
ok, e = align_ui('I', 'h', 'k', 3, 11)
ok, i = align_ui('I', 'v', 'k', 3, 19)
if ok:
state = 9
elif state == 9:
state = -1
ok, j = align_ui('J', 'v', 'k', 3, 19)
if ok:
state = 10
elif state == 10:
state = -1
AlignType16Manual(dev, a, b, c, d, e, f, g, h, i)
AlignType16Manual(dev, a, b, c, d, e, f, g, h, i, j)
return ok
def AlignType16Phase1(dev, a, b, c, d, e, f, g, h, i):
AlignType16Manual(dev, a, b, c, d, e, f, g, h, i)
def AlignType16Phase1(dev, a, b, c, d, e, f, g, h, i, j):
AlignType16Manual(dev, a, b, c, d, e, f, g, h, i, j)
def AlignType14(dev, loadpaper_ui, align_ui, invalidpen_ui):
pattern = alignType14SetPattern(dev)
......
......@@ -114,6 +114,7 @@ TECH_CLASSES = [
"Hbpl1",
"Kapan",
"MimasTDR",
"Saipan15B",
]
TECH_CLASSES.sort()
......@@ -177,6 +178,7 @@ TECH_CLASS_PDLS = {
"Hbpl1" : 'hbpl1',
"Kapan" : 'pcl3',
"MimasTDR" : 'pcl3',
"Saipan15B" : 'pcl3',
}
PDL_TYPE_PCL = 0 # less preferred
......
......@@ -301,10 +301,8 @@ class Password(object):
distro_name = get_distro_name().lower()
if self.__authType == "sudo":
AuthType, AuthCmd = 'sudo', 'sudo %s'
elif distro_name == 'rhel':
AuthType, AuthCmd = 'su', 'su -c "%s"'
else: