diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:54:03 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:57:19 +0100 |
commit | ae74c356d94b795eb07dfe9978788b49b70f5959 (patch) | |
tree | c13c6894b75f95d3a4dc4627efef508bb03dfba8 /pkgs/tools/misc/system-config-printer/detect_serverbindir.patch | |
parent | c9790126312119ce5a2a8ac946d9f086e7ea9f55 (diff) | |
parent | 53e0f8b1cdf36574bfede6e62e2ac2739c3ef804 (diff) | |
download | nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.gz nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.bz2 nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.lz nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.xz nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.zst nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.zip |
Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
Diffstat (limited to 'pkgs/tools/misc/system-config-printer/detect_serverbindir.patch')
-rw-r--r-- | pkgs/tools/misc/system-config-printer/detect_serverbindir.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/pkgs/tools/misc/system-config-printer/detect_serverbindir.patch b/pkgs/tools/misc/system-config-printer/detect_serverbindir.patch new file mode 100644 index 00000000000..2cd3058f233 --- /dev/null +++ b/pkgs/tools/misc/system-config-printer/detect_serverbindir.patch @@ -0,0 +1,17 @@ +diff --git a/cupshelpers/config.py.in b/cupshelpers/config.py.in +index 55abbfc..1244327 100644 +--- a/cupshelpers/config.py.in ++++ b/cupshelpers/config.py.in +@@ -22,3 +22,12 @@ + prefix="@prefix@" + sysconfdir="@sysconfdir@" + cupsserverbindir="@cupsserverbindir@" ++ ++try: ++ with open("/etc/cups/cups-files.conf") as config: ++ for cfgline in config: ++ args = cfgline.split(" ") ++ if len(args) == 2 and args[0] == "ServerBin": ++ cupsserverbindir = args[1].strip() ++except OSError: ++ pass |