Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Stop raising NoAllowedOriginError when marking packages to upgrade/in… #191

Merged
merged 1 commit into from Apr 18, 2019
Merged

Stop raising NoAllowedOriginError when marking packages to upgrade/in… #191

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 1 addition & 5 deletions unattended-upgrade
View file
Open in desktop
Expand Up @@ -222,7 +222,6 @@ class UnattendedUpgradesCache(apt.Cache):
adjusted than only the one's in the final changes set.
"""
new_pkgs_to_adjust = [] # List[str]
pkgs_with_no_allowed_origin = []

# adjust candidates in advance if needed
for pkg_name in self._cached_candidate_pkgnames:
Expand Down Expand Up @@ -281,7 +280,7 @@ class UnattendedUpgradesCache(apt.Cache):
continue
new_pkgs_to_adjust.append(marked_pkg)
except NoAllowedOriginError:
pkgs_with_no_allowed_origin.append(marked_pkg)
pass

if new_pkgs_to_adjust:
new_pkg_adjusted = False
Expand All @@ -291,9 +290,6 @@ class UnattendedUpgradesCache(apt.Cache):
new_pkg_adjusted = True
if new_pkg_adjusted:
self.call_adjusted(function, pkg, **kwargs)
else:
if pkgs_with_no_allowed_origin:
raise NoAllowedOriginError

def mark_upgrade_adjusted(self, pkg, **kwargs):
self.call_adjusted(apt.package.Package.mark_upgrade, pkg, **kwargs)
Expand Down