Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions iocage_lib/ioc_upgrade.py
Original file line number Diff line number Diff line change
Expand Up @@ -190,24 +190,6 @@ def upgrade_jail(self):
self.new_release
)

if f_rel.startswith('12'):
# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=239498
cp = su.Popen(
['pkg-static', '-j', self.jid, 'install', '-q', '-f', '-y', 'pkg'],
stdout=su.PIPE, stderr=su.PIPE, env=self.upgrade_env
)
_, stderr = cp.communicate()
if cp.returncode:
# Let's make this non-fatal as this is only being done as a convenience to user
iocage_lib.ioc_common.logit(
{
'level': 'ERROR',
'message': 'Unable to install pkg after upgrade'
},
_callback=self.callback,
silent=self.silent,
)

finally:
if tmp:
if not tmp.closed:
Expand Down