Permalink
Browse files

Detect _lp as valid cups group in configure script

  • Loading branch information...
simoncadman committed Mar 9, 2014
1 parent 3a60869 commit dc555b9f42228eeeadf403ca2250c684ee9595a6
Showing with 23 additions and 10 deletions.
  1. +1 −1 backend.py
  2. +9 −1 configure
  3. +6 −1 configure.in
  4. +1 −1 deleteaccount.py
  5. +1 −1 dynamicppd.py
  6. +1 −1 listcloudprinters.py
  7. +1 −1 listdrivefiles.py
  8. +1 −1 reportissues.py
  9. +1 −1 setupcloudprint.py
  10. +1 −1 upgrade.py
View
@@ -32,7 +32,7 @@
Utils.SetupLogging()
# line below is replaced on commit
- CCPVersion = "20140309 221542"
+ CCPVersion = "20140309 222809"
Utils.ShowVersion(CCPVersion)
requestors, storage = Auth.SetupAuth(False)
View
@@ -586,6 +586,7 @@ PACKAGE_URL=''
ac_subst_vars='LTLIBOBJS
LIBOBJS
+ulpgroupexists
cupsgroupexists
lpgroupexists
cupsdatapath
@@ -1862,7 +1863,14 @@ if test "${cupsgroup}" = ""; then
cupsgroupexists=`grep -w -c cups /etc/group`
if test "${cupsgroupexists}" = "0"; then
- as_fn_error $? "cannot identify cups group, specify with --cupsgroup=something" "$LINENO" 5
+ ulpgroupexists=`grep -w -c _lp /etc/group`
+
+ if test "${ulpgroupexists}" = "0"; then
+ as_fn_error $? "cannot identify cups group, specify with --cupsgroup=something" "$LINENO" 5
+ else
+ cupsgroup="_lp"
+
+ fi
else
cupsgroup="cups"
View
@@ -20,7 +20,12 @@ if test "${cupsgroup}" = ""; then
if test "${lpgroupexists}" = "0"; then
AC_SUBST(cupsgroupexists, [`grep -w -c cups /etc/group`])
if test "${cupsgroupexists}" = "0"; then
- AC_MSG_ERROR([cannot identify cups group, specify with --cupsgroup=something])
+ AC_SUBST(ulpgroupexists, [`grep -w -c _lp /etc/group`])
+ if test "${ulpgroupexists}" = "0"; then
+ AC_MSG_ERROR([cannot identify cups group, specify with --cupsgroup=something])
+ else
+ AC_SUBST(cupsgroup, "_lp")
+ fi
else
AC_SUBST(cupsgroup, "cups")
fi
View
@@ -24,7 +24,7 @@
Utils.SetupLogging()
# line below is replaced on commit
- CCPVersion = "20140309 221542"
+ CCPVersion = "20140309 222809"
Utils.ShowVersion(CCPVersion)
while True:
View
@@ -29,7 +29,7 @@
Utils.SetupLogging()
# line below is replaced on commit
- CCPVersion = "20140309 221542"
+ CCPVersion = "20140309 222809"
Utils.ShowVersion(CCPVersion)
def showUsage():
View
@@ -24,7 +24,7 @@
Utils.SetupLogging()
# line below is replaced on commit
- CCPVersion = "20140309 221542"
+ CCPVersion = "20140309 222809"
Utils.ShowVersion(CCPVersion)
requestors, storage = Auth.SetupAuth(True)
View
@@ -23,7 +23,7 @@
Utils.SetupLogging()
# line below is replaced on commit
- CCPVersion = "20140309 221542"
+ CCPVersion = "20140309 222809"
Utils.ShowVersion(CCPVersion)
requestors, storage = Auth.SetupAuth(True, permissions=['https://www.googleapis.com/auth/cloudprint', 'https://www.googleapis.com/auth/drive.readonly'])
View
@@ -29,7 +29,7 @@
Utils.SetupLogging()
# line below is replaced on commit
- CCPVersion = "20140309 221542"
+ CCPVersion = "20140309 222809"
Utils.ShowVersion(CCPVersion)
requestors, storage = Auth.SetupAuth(True)
View
@@ -23,7 +23,7 @@
Utils.SetupLogging()
# line below is replaced on commit
- CCPVersion = "20140309 221542"
+ CCPVersion = "20140309 222809"
Utils.ShowVersion(CCPVersion)
unattended = False
View
@@ -26,7 +26,7 @@
Utils.SetupLogging()
# line below is replaced on commit
- CCPVersion = "20140309 221542"
+ CCPVersion = "20140309 222809"
Utils.ShowVersion(CCPVersion)
if not os.path.exists("/etc/cloudprint.conf"):

0 comments on commit dc555b9

Please sign in to comment.