Skip to content
Permalink
Browse files

BF/RF: Fixes sync problem occuring when user was not actively logged in.

If a project was opened, but the user had not logged in, and tried to sync,
the user was asked to create a project, even though the project existed.
The failed sync then resulted in the user being logged in and the sync
working on the next attempt. This fix attempts to log the user in on a sync
if the user is known, or in the case of multiple users where the namespace
is not indicative of the user account, uses the project name to determine
membership to known user and which known user should be logged in. Also
increases number of items listed to 100 when retrieving user projects from
Pavlovia. Fixes and refactors warning messages.

# Conflicts:
#	psychopy/projects/pavlovia.py
  • Loading branch information...
peircej committed Feb 18, 2019
1 parent e4a68af commit 460889e5d7459f97612aa675ea15b73bc6139287
Showing with 1 addition and 1 deletion.
  1. +1 −1 psychopy/projects/pavlovia.py
@@ -933,7 +933,7 @@ def stageFiles(self, files=None, infoStream=None):
'The `files` provided to PavloviaProject.stageFiles '
'should be a list not a {}'.format(type(files)))
try:
self.repo.git.add(files)
self.repo.git.add(files)

This comment has been minimized.

@dvbridges

dvbridges Feb 21, 2019

Contributor

peircej , looks like an indentation error in the latest release - might affect staging?

This comment has been minimized.

@dvbridges

dvbridges Feb 21, 2019

Contributor

Nevermind this, it was there in the zipped source code but not in the actual release.

except git.exc.GitCommandError:
if infoStream:
infoStream.SetValue(traceback.format_exc())

0 comments on commit 460889e

Please sign in to comment.
You can’t perform that action at this time.