1*4882a593SmuzhiyunFrom a52d763559d1017ca73d2a2933aba1c78ad354c6 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal@rzerosystems.com> 3*4882a593SmuzhiyunDate: Thu, 27 Jan 2022 16:32:25 -0600 4*4882a593SmuzhiyunSubject: [PATCH] unattended-upgrade: Remove distro_info usage to check devel 5*4882a593Smuzhiyun releases 6*4882a593SmuzhiyunMIME-Version: 1.0 7*4882a593SmuzhiyunContent-Type: text/plain; charset=UTF-8 8*4882a593SmuzhiyunContent-Transfer-Encoding: 8bit 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunThe distro-info python3 package is used to check if the release is a 11*4882a593Smuzhiyundevel release and choice if continue with unattended-upgrade for now 12*4882a593Smuzhiyunremove it because needs support into python3-distro-info [1]. 13*4882a593Smuzhiyun 14*4882a593Smuzhiyun[1] https://salsa.debian.org/debian/distro-info 15*4882a593Smuzhiyun 16*4882a593SmuzhiyunSigned-off-by: Aníbal Limón <anibal@rzerosystems.com> 17*4882a593Smuzhiyun 18*4882a593SmuzhiyunUpstream-Status: Inappropriate 19*4882a593Smuzhiyun--- 20*4882a593Smuzhiyun unattended-upgrade | 38 -------------------------------------- 21*4882a593Smuzhiyun 1 file changed, 38 deletions(-) 22*4882a593Smuzhiyun 23*4882a593Smuzhiyundiff --git a/unattended-upgrade b/unattended-upgrade 24*4882a593Smuzhiyunindex 802d4d5..3b4e83e 100755 25*4882a593Smuzhiyun--- a/unattended-upgrade 26*4882a593Smuzhiyun+++ b/unattended-upgrade 27*4882a593Smuzhiyun@@ -83,9 +83,6 @@ import apt 28*4882a593Smuzhiyun import apt_inst 29*4882a593Smuzhiyun import apt_pkg 30*4882a593Smuzhiyun 31*4882a593Smuzhiyun-import distro_info 32*4882a593Smuzhiyun- 33*4882a593Smuzhiyun- 34*4882a593Smuzhiyun # the reboot required flag file used by packages 35*4882a593Smuzhiyun REBOOT_REQUIRED_FILE = "/var/run/reboot-required" 36*4882a593Smuzhiyun KEPT_PACKAGES_FILE = "var/lib/unattended-upgrades/kept-back" 37*4882a593Smuzhiyun@@ -2061,41 +2058,6 @@ def run(options, # type: Options 38*4882a593Smuzhiyun if should_stop(): 39*4882a593Smuzhiyun return UnattendedUpgradesResult(False) 40*4882a593Smuzhiyun 41*4882a593Smuzhiyun- # check to see if want to auto-upgrade the devel release 42*4882a593Smuzhiyun- if apt_pkg.config.find("Unattended-Upgrade::DevRelease") == "auto": 43*4882a593Smuzhiyun- try: 44*4882a593Smuzhiyun- if DISTRO_ID.lower() == 'ubuntu': 45*4882a593Smuzhiyun- devel = (distro_info.UbuntuDistroInfo() . 46*4882a593Smuzhiyun- devel(result="object")) 47*4882a593Smuzhiyun- elif DISTRO_ID.lower() == 'debian': 48*4882a593Smuzhiyun- devel = (distro_info.DebianDistroInfo() . 49*4882a593Smuzhiyun- devel(result="object")) 50*4882a593Smuzhiyun- else: 51*4882a593Smuzhiyun- devel = (distro_info.DistroInfo(DISTRO_ID) . 52*4882a593Smuzhiyun- devel(result="object")) 53*4882a593Smuzhiyun- except Exception as e: 54*4882a593Smuzhiyun- logging.warning("Could not figure out development release: %s" % e) 55*4882a593Smuzhiyun- else: 56*4882a593Smuzhiyun- if ((devel.series == DISTRO_CODENAME 57*4882a593Smuzhiyun- and devel.release is not None 58*4882a593Smuzhiyun- and devel.release - date.today() > DEVEL_UNTIL_RELEASE)): 59*4882a593Smuzhiyun- syslog.syslog((_("Not running on this development " 60*4882a593Smuzhiyun- "release before %s") % 61*4882a593Smuzhiyun- (devel.release - DEVEL_UNTIL_RELEASE 62*4882a593Smuzhiyun- - datetime.timedelta(days=1)))) 63*4882a593Smuzhiyun- logging.warning(_("Not running on this development " 64*4882a593Smuzhiyun- "release before %s") % 65*4882a593Smuzhiyun- (devel.release - DEVEL_UNTIL_RELEASE 66*4882a593Smuzhiyun- - datetime.timedelta(days=1))) 67*4882a593Smuzhiyun- return UnattendedUpgradesResult(True) 68*4882a593Smuzhiyun- 69*4882a593Smuzhiyun- logging.debug("Running on the development release") 70*4882a593Smuzhiyun- elif "(development branch)" in DISTRO_DESC and not\ 71*4882a593Smuzhiyun- apt_pkg.config.find_b("Unattended-Upgrade::DevRelease", True): 72*4882a593Smuzhiyun- syslog.syslog(_("Not running on the development release.")) 73*4882a593Smuzhiyun- logging.info(_("Not running on the development release.")) 74*4882a593Smuzhiyun- return UnattendedUpgradesResult(True) 75*4882a593Smuzhiyun- 76*4882a593Smuzhiyun logging.info(_("Starting unattended upgrades script")) 77*4882a593Smuzhiyun 78*4882a593Smuzhiyun # check and get lock 79