"git ubuntu build" quiltification does not update series file

Bug #1734371 reported by Robie Basak on 2017-11-24
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
usd-importer
Undecided
Nish Aravamudan

Bug Description

In 7e79017 (actually a feature branch based off that), I'm trying to use "git ubuntu build" to test that quiltification has not regressed.

After working around bug 1734370, I find that I do get a build, but although git-ubuntu-fixup.patch has appeared, the series file has not been updated.

Consider this untriaged and untested: it's Friday evening and I want to make this note of this before context switching away next week. I may well have regressed it in my feature branch and it needs retesting against master.

I'm suspicious that the code handling this in build.py doesn't appear to add the series file for an update. I'm not sure if "git add -f" would cover it. But this needs testing and is only a suspicion.

If it helps to reproduce later, I used "git-ubuntu clone uvtool", made a change to an upstream file and committed it, and immediately tried "git-ubuntu build uvtool". This particular package is 3.0 (quilt) and already contained one patch.

Related branches

Robie Basak (racb) wrote :

Reproduced against 7e79017 in an artful VM, with only the following workaround applied. So this affects master and isn't a regression in my feature branch.

diff --git a/gitubuntu/build.py b/gitubuntu/build.py
index 072d3e7..3178e69 100644
--- a/gitubuntu/build.py
+++ b/gitubuntu/build.py
@@ -1004,11 +1004,12 @@ def do_build_lxd_exitstack(
             container_name,
         )

+ import time; time.sleep(20)
     for i in range(retries+1):
         try:
- _run_in_lxd(container_name, ['apt', 'update',])
+ _run_in_lxd(container_name, ['apt-get', 'update',])
             _run_in_lxd(container_name, [
- 'apt',
+ 'apt-get',
                 'install',
                 '-y',
                 'devscripts',
@@ -1018,7 +1019,7 @@ def do_build_lxd_exitstack(
             break
         except Exception as e:
             logging.error(
- "Failed to run apt in ephemeral build container "
+ "Failed to run apt-get in ephemeral build container "
                 "(attempt %d/%d)",
                 i+1, retries+1,
             )
@@ -1026,7 +1027,7 @@ def do_build_lxd_exitstack(
                 time.sleep(retry_backoffs[i])
     else:
         raise RuntimeError(
- "Failed to run apt in ephemeral build container"
+ "Failed to run apt-get in ephemeral build container"
         )

     try:

Robie Basak (racb) on 2017-11-28
tags: added: build
Nish Aravamudan (nacc) wrote :

Yeah I see this too. Will dig into it.

Nish Aravamudan (nacc) on 2017-12-04
Changed in usd-importer:
status: New → In Progress
assignee: nobody → Nish Aravamudan (nacc)
To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers