Skip to content

Commit 460889e

Browse files
committed
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
1 parent e4a68af commit 460889e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

psychopy/projects/pavlovia.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -933,7 +933,7 @@ def stageFiles(self, files=None, infoStream=None):
933933
'The `files` provided to PavloviaProject.stageFiles '
934934
'should be a list not a {}'.format(type(files)))
935935
try:
936-
self.repo.git.add(files)
936+
self.repo.git.add(files)
937937
except git.exc.GitCommandError:
938938
if infoStream:
939939
infoStream.SetValue(traceback.format_exc())

0 commit comments

Comments
 (0)