Tools used by the Ubuntu QA Team

Merge ~alexmurray/ubuntu-qa-tools:uvt-fix-python-3-12-deprecation-warnings into ubuntu-qa-tools:master

  1. Git
  2. lp:~alexmurray/ubuntu-qa-tools
  3. uvt-fix-python-3-12-deprecation-warnings
  4. Merge into master
Proposed by Alex Murray
Status: Merged
Merged at revision: ce6e2da761c38f929e0df735990f1a6c2c29c4f3
Proposed branch: ~alexmurray/ubuntu-qa-tools:uvt-fix-python-3-12-deprecation-warnings
Merge into: ubuntu-qa-tools:master
Diff against target: 53 lines (+9/-4) (has conflicts)
1 file modified
vm-tools/uvt (+9/-4)
Conflict in vm-tools/uvt
Reviewer Review Type Date Requested Status
Jorge Sancho Larraz Approve
Marc Deslauriers Approve
Review via email: mp+461223@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jorge Sancho Larraz (jslarraz) wrote :

Hey Alex,

It seems there is a merge conflict that needs to be addressed.

Besides that, it seems to work fine for me.

review: Needs Fixing
Revision history for this message
Alex Murray (alexmurray) wrote :

Hmm that seems to be an artefact of Launchpad - I can't see any conflict locally.

Revision history for this message
Marc Deslauriers (mdeslaur) wrote :

Yeah, pulling your branch doesn't show the conflict for me either...

The rest LGTM.

review: Approve
Revision history for this message
Jorge Sancho Larraz (jslarraz) wrote :

Unless I'm totally wrong, I think it conflicts with the version we currently have in master because of change in my commit https://git.launchpad.net/ubuntu-qa-tools/commit/?id=1ecb4ceb258f28499f4ea4bd246c9a38aed7a9de

It is something you can just fix when merging but I wanted to point it out. As I said, it works fine besides that so feel free to merge it directly if you want

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/vm-tools/uvt b/vm-tools/uvt
2index 1de4d26..3ce32b3 100755
3--- a/vm-tools/uvt
4+++ b/vm-tools/uvt
5@@ -2263,7 +2263,7 @@ def create_grub_cfg(temp_dir, iso_type, release_num, latest_release):
6 grub_name = "boot/grub/grub.cfg"
7
8 if iso_type == "server" and float(release_num) >= 20.10:
9- grub_contents = '''
10+ grub_contents = r'''
11 set timeout=1
12 loadfont unicode
13
14@@ -2279,7 +2279,7 @@ menuentry "vmtools" {
15 elif iso_type == "desktop" and float(release_num) >= 23.04:
16 # The desktop installer keeps everything after the --- as the
17 # default grub options, so order is important
18- grub_contents = '''
19+ grub_contents = r'''
20 set timeout=1
21 loadfont unicode
22
23@@ -2808,7 +2808,7 @@ sed -i "s/XKBOPTIONS=\".*\"/XKBOPTIONS=\"%(options)s\"/" %(keyboard)s
24 if 'vm_src_mirror' in uvt_conf:
25 tmp_ssrc=uvt_conf['vm_src_mirror']
26
27- late_contents += '''
28+ late_contents += r'''
29 mv /etc/apt/sources.list /etc/apt/sources.list.ori
30 echo deb %(tmp_m)s %(release)s main restricted universe multiverse > /etc/apt/sources.list
31 echo deb %(tmp_m)s %(release)s-updates main restricted universe multiverse >> /etc/apt/sources.list
32@@ -2826,7 +2826,7 @@ echo deb-src %(tmp_ssrc)s %(release)s-security main restricted universe multiver
33
34 if 'vm_mirror_fallback' in uvt_conf:
35 tmp_mf = uvt_conf['vm_mirror_fallback']
36- late_contents += '''
37+ late_contents += r'''
38 echo deb %(tmp_mf)s %(release)s main restricted universe multiverse > /etc/apt/sources.list.d/fallback-sources.list
39 echo deb %(tmp_mf)s %(release)s-updates main restricted universe multiverse >> /etc/apt/sources.list.d/fallback-sources.list
40 echo \#deb %(tmp_mf)s %(release)s-proposed main restricted universe multiverse >> /etc/apt/sources.list.d/fallback-sources.list
41@@ -3456,7 +3456,12 @@ def load_uvt_config():
42
43 # Replace environment variables to be compatible with old shell vm-new
44 for k in config:
45+<<<<<<< vm-tools/uvt
46 config[k] = os.path.expandvars(config[k])
47+=======
48+ if "$HOME" in config[k]:
49+ config[k] = re.sub(r"\$HOME", os.path.expanduser("~"), config[k])
50+>>>>>>> vm-tools/uvt
51
52 # Set default directories
53 if config.get('vm_dir_iso', "") == "":

Subscribers

People subscribed via source and target branches