gpkg: do not consider symlinks targets for size estimation

Symlinks size is already accounted for, so there is no need to account
for the pointed to file.
Moreover, previous code failed to handle permission error when using
ROOT= and having absolute symlinks pointing to running root.

Signed-off-by: Etienne Buira <[email protected]>
Bug: https://bugs.gentoo.org/942512
Signed-off-by: Zac Medico <[email protected]>

Author: Etienne Buira

NEWS

@@ -12,6 +12,8 @@ Bug fixes:
 * binarytree: Fix _inject_repo_revisions to ignore remote packages for which
   source repostories are missing, triggering KeyError (PR #1391).
 
+* gpkg: do not consider symlinks targets for size estimation (bug #942512).
+
 portage-3.0.66.1 (2024-09-18)
 --------------
 

lib/portage/gpkg.py

@@ -1960,14 +1960,10 @@ def _check_pre_image_files(self, root_dir, image_prefix="image"):
 
                 image_max_link_length = max(image_max_link_length, path_link_length)
 
-                try:
-                    file_size = os.path.getsize(f)
-                except FileNotFoundError:
-                    # Ignore file not found if symlink to non-existing file
-                    if os.path.islink(f):
-                        continue
-                    else:
-                        raise
+                if stat.S_ISLNK(file_stat.st_mode):
+                    continue
+
+                file_size = os.path.getsize(f)
                 image_total_size += file_size
                 image_max_file_size = max(image_max_file_size, file_size)
 
@@ -2055,14 +2051,10 @@ def _check_pre_quickpkg_files(
             image_max_link_length = max(image_max_link_length, path_link_length)
 
             if os.path.isfile(path):
-                try:
-                    file_size = os.path.getsize(path)
-                except FileNotFoundError:
-                    # Ignore file not found if symlink to non-existing file
-                    if os.path.islink(path):
-                        continue
-                    else:
-                        raise
+                if stat.S_ISLNK(file_stat.st_mode):
+                    continue
+
+                file_size = os.path.getsize(path)
                 image_total_size += file_size
                 if file_size > image_max_file_size:
                     image_max_file_size = file_size