upload: fix FileNotFoundError when no superproject

Upload gets a FileNotFoundError if not using superproject because it
tries to access the superproject's repo_id before checking if
superproject was actually enabled.

Reorder the logic to check use_superproject first.

Change-Id: I65cd2adab481e799dd7bb75e1a83553ad6e34d8d
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/484401
Tested-by: Gavin Mak <gavinmak@google.com>
Commit-Queue: Gavin Mak <gavinmak@google.com>
Reviewed-by: Mike Frysinger <vapier@google.com>

1 files changed, 6 insertions, 3 deletions

diff --git a/subcmds/upload.py b/subcmds/upload.py
index 169a8b77..4f817ddf 100644
--- a/subcmds/upload.py
+++ b/subcmds/upload.py
@@ -627,9 +627,12 @@ Gerrit Code Review:  https://www.gerritcodereview.com/
         # If using superproject, add the root repo as a push option.
         manifest = branch.project.manifest
         push_options = list(opt.push_options)
-        sp = manifest.superproject
-        if sp and sp.repo_id and manifest.manifestProject.use_superproject:
-            push_options.append(f"custom-keyed-value=rootRepo:{sp.repo_id}")
+        if manifest.manifestProject.use_superproject:
+            sp = manifest.superproject
+            if sp:
+                r_id = sp.repo_id
+                if r_id:
+                    push_options.append(f"custom-keyed-value=rootRepo:{r_id}")
 
         branch.UploadForReview(
             people,