Commit f5c6afb8 authored by Julian Andres Klode's avatar Julian Andres Klode

Imported Upstream version 3.16.3

parent 42862c21

Too many changes to show.

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

......@@ -773,6 +773,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \
prnt/ps/hp-color_laserjet_cp2025x-ps.ppd.gz \
prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.gz \
prnt/ps/hp-color_laserjet_cm1017-ps.ppd.gz \
prnt/ps/hp-pagewide_pro_452_printer-ps.ppd.gz \
prnt/ps/hp-laserjet_3380-ps.ppd.gz \
prnt/ps/hp-designjet_t3500-ps.ppd.gz \
prnt/ps/hp-laserjet_8100_series-ps.ppd.gz \
......@@ -780,6 +781,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \
prnt/ps/hp-laserjet_2100_series-ps.ppd.gz \
prnt/ps/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz \
prnt/ps/hp-laserjet_3200m-ps.ppd.gz \
prnt/ps/hp-pagewide_pro_577_mfp-ps.ppd.gz \
prnt/ps/hp-laserjet_1320-ps.ppd.gz \
prnt/ps/hp-color_laserjet_mfp_m577-ps.ppd.gz \
prnt/ps/hp-designjet_z5400-postscript.ppd.gz \
......@@ -817,6 +819,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \
prnt/ps/hp-color_laserjet_pro_mfp_m477d-ps.ppd.gz \
prnt/ps/hp-laserjet_500_color_m551-ps.ppd.gz \
prnt/ps/hp-laserjet_4300-ps.ppd.gz \
prnt/ps/hp-pagewide_pro_477_mfp-ps.ppd.gz \
prnt/ps/hp-color_laserjet_cm1312nfi_mfp-ps.ppd.gz \
prnt/ps/hp-color_laserjet_3000-ps.ppd.gz \
prnt/ps/hp-designjet_z5200_postscript-ps.ppd.gz \
......@@ -838,6 +841,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \
prnt/ps/hp-laserjet_4200-ps.ppd.gz \
prnt/ps/hp-laserjet_5p-ps.ppd.gz \
prnt/ps/hp-laserjet_8150_mfp-ps.ppd.gz \
prnt/ps/hp-pagewide_pro_552_printer-ps.ppd.gz \
prnt/ps/hp-laserjet_2200-ps.ppd.gz \
prnt/ps/hp-color_laserjet_cp1514n-ps.ppd.gz \
prnt/ps/hp-designjet_t790ps_24in-ps.ppd.gz \
......@@ -1405,6 +1409,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \
ppd/hpijs/hp-laserjet_m3027_mfp-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-photosmart_c5300_series-hpijs.ppd.gz \
ppd/hpijs/hp-deskjet_2000_j210_series-hpijs.ppd.gz \
ppd/hpijs/hp-deskjet_5810_series-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_p2015dn_series-hpijs.ppd.gz \
ppd/hpijs/hp-color_laserjet_1600-hpijs.ppd.gz \
ppd/hpijs/hp-deskjet_6940_series-hpijs.ppd.gz \
......@@ -1490,6 +1495,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \
ppd/hpijs/hp-photosmart_a610_series-hpijs.ppd.gz \
ppd/hpijs/hp-deskjet_3050_j610_series-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_3200-hpijs.ppd.gz \
ppd/hpijs/hp-deskjet_5820_series-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_m1538dnf_mfp-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-officejet_7610_series-hpijs.ppd.gz \
ppd/hpijs/hp-deskjet_1010_series-hpijs.ppd.gz \
......@@ -1916,6 +1922,8 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \
ppd/hpcups/hp-deskjet_5652.ppd.gz \
ppd/hpcups/hp-deskjet_5700.ppd.gz \
ppd/hpcups/hp-deskjet_5800.ppd.gz \
ppd/hpcups/hp-deskjet_5810_series.ppd.gz \
ppd/hpcups/hp-deskjet_5820_series.ppd.gz \
ppd/hpcups/hp-deskjet_5850.ppd.gz \
ppd/hpcups/hp-deskjet_5900_series.ppd.gz \
ppd/hpcups/hp-deskjet_600.ppd.gz \
......@@ -3248,6 +3256,7 @@ foomatic_ppd_printers = \
ppd/hpijs/hp-laserjet_m3027_mfp-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-photosmart_c5300_series-hpijs.ppd.gz \
ppd/hpijs/hp-deskjet_2000_j210_series-hpijs.ppd.gz \
ppd/hpijs/hp-deskjet_5810_series-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_p2015dn_series-hpijs.ppd.gz \
ppd/hpijs/hp-color_laserjet_1600-hpijs.ppd.gz \
ppd/hpijs/hp-deskjet_6940_series-hpijs.ppd.gz \
......@@ -3333,6 +3342,7 @@ foomatic_ppd_printers = \
ppd/hpijs/hp-photosmart_a610_series-hpijs.ppd.gz \
ppd/hpijs/hp-deskjet_3050_j610_series-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_3200-hpijs.ppd.gz \
ppd/hpijs/hp-deskjet_5820_series-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_m1538dnf_mfp-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-officejet_7610_series-hpijs.ppd.gz \
ppd/hpijs/hp-deskjet_1010_series-hpijs.ppd.gz \
......@@ -3649,6 +3659,7 @@ foomatic_ps_printers = \
prnt/ps/hp-color_laserjet_cp2025x-ps.ppd.gz \
prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.gz \
prnt/ps/hp-color_laserjet_cm1017-ps.ppd.gz \
prnt/ps/hp-pagewide_pro_452_printer-ps.ppd.gz \
prnt/ps/hp-laserjet_3380-ps.ppd.gz \
prnt/ps/hp-designjet_t3500-ps.ppd.gz \
prnt/ps/hp-laserjet_8100_series-ps.ppd.gz \
......@@ -3656,6 +3667,7 @@ foomatic_ps_printers = \
prnt/ps/hp-laserjet_2100_series-ps.ppd.gz \
prnt/ps/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz \
prnt/ps/hp-laserjet_3200m-ps.ppd.gz \
prnt/ps/hp-pagewide_pro_577_mfp-ps.ppd.gz \
prnt/ps/hp-laserjet_1320-ps.ppd.gz \
prnt/ps/hp-color_laserjet_mfp_m577-ps.ppd.gz \
prnt/ps/hp-designjet_z5400-postscript.ppd.gz \
......@@ -3693,6 +3705,7 @@ foomatic_ps_printers = \
prnt/ps/hp-color_laserjet_pro_mfp_m477d-ps.ppd.gz \
prnt/ps/hp-laserjet_500_color_m551-ps.ppd.gz \
prnt/ps/hp-laserjet_4300-ps.ppd.gz \
prnt/ps/hp-pagewide_pro_477_mfp-ps.ppd.gz \
prnt/ps/hp-color_laserjet_cm1312nfi_mfp-ps.ppd.gz \
prnt/ps/hp-color_laserjet_3000-ps.ppd.gz \
prnt/ps/hp-designjet_z5200_postscript-ps.ppd.gz \
......@@ -3714,6 +3727,7 @@ foomatic_ps_printers = \
prnt/ps/hp-laserjet_4200-ps.ppd.gz \
prnt/ps/hp-laserjet_5p-ps.ppd.gz \
prnt/ps/hp-laserjet_8150_mfp-ps.ppd.gz \
prnt/ps/hp-pagewide_pro_552_printer-ps.ppd.gz \
prnt/ps/hp-laserjet_2200-ps.ppd.gz \
prnt/ps/hp-color_laserjet_cp1514n-ps.ppd.gz \
prnt/ps/hp-designjet_t790ps_24in-ps.ppd.gz \
......@@ -4032,6 +4046,8 @@ cups_ppd_printers = \
ppd/hpcups/hp-deskjet_5652.ppd.gz \
ppd/hpcups/hp-deskjet_5700.ppd.gz \
ppd/hpcups/hp-deskjet_5800.ppd.gz \
ppd/hpcups/hp-deskjet_5810_series.ppd.gz \
ppd/hpcups/hp-deskjet_5820_series.ppd.gz \
ppd/hpcups/hp-deskjet_5850.ppd.gz \
ppd/hpcups/hp-deskjet_5900_series.ppd.gz \
ppd/hpcups/hp-deskjet_600.ppd.gz \
......
......@@ -654,6 +654,7 @@ AGENT_LEVEL_TRIGGER_SUFFICIENT_4 = 4
AGENT_LEVEL_TRIGGER_MAY_BE_LOW = 5
AGENT_LEVEL_TRIGGER_PROBABLY_OUT = 6
AGENT_LEVEL_TRIGGER_ALMOST_DEFINITELY_OUT = 7
AGENT_LEVEL_UNKNOWN = 0xff
# "Computed" configurations (2-pen products)
AGENT_CONFIG_NONE = 0
......
......@@ -959,6 +959,7 @@ AGENT_healths = {AGENT_HEALTH_OK : 'ok',
AGENT_HEALTH_OVERTEMP : 'overtemp', # battery
AGENT_HEALTH_CHARGING : 'charging', # battery
AGENT_HEALTH_DISCHARGING : 'discharging', # battery
AGENT_HEALTH_UNKNOWN : 'unknown',
}
......
......@@ -255,10 +255,14 @@ class Password(object):
if self.__mode == INTERACTIVE_MODE:
self.__password = self.__get_password(pswd_msg)
else:
if self.getAuthType() == 'su':
self.__password = self.__get_password_ui(pswd_msg, "root")
else:
self.__password = self.__get_password_ui(pswd_msg, os.getenv("USER"))
try:
if self.getAuthType() == 'su':
self.__password = self.__get_password_ui(pswd_msg, "root")
else:
self.__password = self.__get_password_ui(pswd_msg, os.getenv("USER"))
except Exception as ex:
log.debug(ex)
break
cmd = self.getAuthCmd() % "true"
log.debug(cmd)
......
......@@ -1493,11 +1493,13 @@ pen_level10_xlate = { 'ok' : AGENT_LEVEL_TRIGGER_SUFFICIENT_0,
'out' : AGENT_LEVEL_TRIGGER_ALMOST_DEFINITELY_OUT,
'empty' : AGENT_LEVEL_TRIGGER_ALMOST_DEFINITELY_OUT,
'missing' : AGENT_LEVEL_TRIGGER_ALMOST_DEFINITELY_OUT,
'unknown' : AGENT_LEVEL_UNKNOWN,
}
pen_health10_xlate = { 'ok' : AGENT_HEALTH_OK,
'misinstalled' : AGENT_HEALTH_MISINSTALLED,
'missing' : AGENT_HEALTH_MISINSTALLED,
'unknown' : AGENT_HEALTH_UNKNOWN,
}
......@@ -1584,6 +1586,7 @@ def StatusType10Agents(func): # Low End Data Model
try:
type = e.find("ConsumableTypeEnum").text
state = e.find("ConsumableLifeState/ConsumableState").text
quantityState = e.find("ConsumableLifeState/MeasuredQuantityState").text
# level
if type == "ink" or type == "inkCartridge" or type == "toner" or type == "tonerCartridge":
......@@ -1591,7 +1594,9 @@ def StatusType10Agents(func): # Low End Data Model
if state != "missing":
try:
ink_level = int(e.find("ConsumablePercentageLevelRemaining").text)
if ink_level == 0:
if ink_level == 0 and quantityState == 'unknown':
state = "unknown"
elif ink_level == 0:
state = "empty"
elif ink_level <=10:
state = "low"
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for HP Linux Imaging and Printing 3.16.2.
# Generated by GNU Autoconf 2.68 for HP Linux Imaging and Printing 3.16.3.
#
# Report bugs to <3.16.2>.
# Report bugs to <3.16.3>.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
......@@ -246,7 +246,7 @@ fi
$as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
$as_echo "$0: Please tell bug-autoconf@gnu.org and 3.16.2 about your
$as_echo "$0: Please tell bug-autoconf@gnu.org and 3.16.3 about your
$0: system, including any error possibly output before this
$0: message. Then install a modern shell, or manually run
$0: the script under such a shell if you do have one."
......@@ -569,9 +569,9 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='HP Linux Imaging and Printing'
PACKAGE_TARNAME='hplip'
PACKAGE_VERSION='3.16.2'
PACKAGE_STRING='HP Linux Imaging and Printing 3.16.2'
PACKAGE_BUGREPORT='3.16.2'
PACKAGE_VERSION='3.16.3'
PACKAGE_STRING='HP Linux Imaging and Printing 3.16.3'
PACKAGE_BUGREPORT='3.16.3'
PACKAGE_URL=''
# Factoring default headers for most tests.
......@@ -1470,7 +1470,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures HP Linux Imaging and Printing 3.16.2 to adapt to many kinds of systems.
\`configure' configures HP Linux Imaging and Printing 3.16.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1540,7 +1540,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of HP Linux Imaging and Printing 3.16.2:";;
short | recursive ) echo "Configuration of HP Linux Imaging and Printing 3.16.3:";;
esac
cat <<\_ACEOF
......@@ -1638,7 +1638,7 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
Report bugs to <3.16.2>.
Report bugs to <3.16.3>.
_ACEOF
ac_status=$?
fi
......@@ -1701,7 +1701,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
HP Linux Imaging and Printing configure 3.16.2
HP Linux Imaging and Printing configure 3.16.3
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
......@@ -2168,7 +2168,7 @@ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
( $as_echo "## --------------------- ##
## Report this to 3.16.2 ##
## Report this to 3.16.3 ##
## --------------------- ##"
) | sed "s/^/$as_me: WARNING: /" >&2
;;
......@@ -2245,7 +2245,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by HP Linux Imaging and Printing $as_me 3.16.2, which was