← Back to branch summary

~ubuntu-core-dev/update-manager/main

« back to all changes in this revision

Viewing changes to UpdateManager/Core/utils.py

  • Committer: Benjamin Drung
  • Date: 2023-02-13 13:12:47 UTC
  • Revision ID: benjamin.drung@canonical.com-20230213131247-eskki7iklu6x8jci
Replace lsb_release call with reading /etc/os-release directly

Show diffs side-by-side

added added

removed removed

Lines of Context:
UpdateManager/Core/utils.py
24
24
import locale
25
25
import logging
26
26
import os
 
27
import platform
27
28
import re
28
29
import subprocess
29
30
import sys
196
197
            "META_RELEASE_FAKE_CODENAME environment) " % dist
197
198
        )
198
199
        return dist
199
 
    # then check the real one
200
 
    from subprocess import PIPE, Popen
201
200
 
202
 
    p = Popen(
203
 
        ["lsb_release", "-c", "-s"], stdout=PIPE, universal_newlines=True
204
 
    )
205
 
    res = p.wait()
206
 
    if res != 0:
207
 
        sys.stderr.write("lsb_release returned exitcode: %i\n" % res)
208
 
        return "unknown distribution"
209
 
    dist = p.stdout.readline().strip()
210
 
    p.stdout.close()
211
 
    return dist
 
201
    os_release = platform.freedesktop_os_release()
 
202
    return os_release.get("VERSION_CODENAME", "unknown distribution")
212
203
 
213
204
 
214
205
def get_dist_version():
221
212
            "META_RELEASE_FAKE_VERSION environment) " % desc
222
213
        )
223
214
        return desc
224
 
    # then check the real one
225
 
    from subprocess import PIPE, Popen
226
215
 
227
 
    p = Popen(
228
 
        ["lsb_release", "-r", "-s"], stdout=PIPE, universal_newlines=True
229
 
    )
230
 
    res = p.wait()
231
 
    if res != 0:
232
 
        sys.stderr.write("lsb_release returned exitcode: %i\n" % res)
233
 
        return "unknown distribution"
234
 
    desc = p.stdout.readline().strip()
235
 
    p.stdout.close()
236
 
    return desc
 
216
    os_release = platform.freedesktop_os_release()
 
217
    return os_release.get("VERSION_ID", "unknown distribution")
237
218
 
238
219
 
239
220
class HeadRequest(Request):