Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
UCC
UCC Snack Machine Server Code
Commits
d51a435a
Commit
d51a435a
authored
Apr 04, 2015
by
Mitchell Pomery
Committed by
Mark Tearle
Apr 05, 2015
Browse files
Minor bug fixes to get it working
parent
9d34b41f
Changes
2
Hide whitespace changes
Inline
Side-by-side
VendServer/OpenDispense.py
View file @
d51a435a
...
...
@@ -26,7 +26,7 @@ class OpenDispense(DispenseInterface):
def
authUserIdPin
(
self
,
userId
,
pin
):
try
:
# Get info from
info
=
pwd
.
getpwuid
(
userId
)
info
=
pwd
.
getpwuid
(
int
(
userId
)
)
except
KeyError
:
logging
.
info
(
'getting pin for uid %d: user not in password file'
%
userId
)
return
False
...
...
VendServer/VendServer.py
View file @
d51a435a
...
...
@@ -172,7 +172,7 @@ class VendServer():
def
scroll_options
(
self
,
username
,
mk
,
welcome
=
False
):
# If the user has just logged in, show them their balance
if
welcome
:
balance
=
dispense
.
getBalance
()
balance
=
self
.
dispense
.
getBalance
()
msg
=
[(
self
.
center
(
'WELCOME'
),
False
,
TEXT_SPEED
),
(
self
.
center
(
self
.
dispense
.
getUsername
()),
False
,
TEXT_SPEED
),
...
...
@@ -720,6 +720,7 @@ class VendServer():
return
"""
"""
if self.dispense.isDisabled():
logging.info('user '+self.vstatus.cur_user+' is disabled')
self.vstatus.mk.set_messages(
...
...
@@ -729,7 +730,7 @@ class VendServer():
self.reset_idler(3)
return
"""
self
.
vstatus
.
cur_pin
=
''
self
.
vstatus
.
mk
.
set_message
(
'PIN: '
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment