"git ubuntu build" quiltification does not update series file
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| git-ubuntu |
Triaged
|
Undecided
|
Unassigned | ||
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-
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: Needs Fixing
- Server Team CI bot: Approve (continuous-integration)
- Christian Ehrhardt : Pending requested
- Andreas Hasenack: Pending requested
- git-ubuntu developers: Pending requested
-
Diff: 1849 lines (+783/-376)15 files modifiedbin/git-ubuntu (+6/-1)
gitubuntu/build.py (+209/-134)
gitubuntu/dsc.py (+37/-11)
gitubuntu/exportorig.py (+2/-4)
gitubuntu/git_repository.py (+155/-48)
gitubuntu/importer.py (+56/-29)
gitubuntu/lint.py (+7/-5)
gitubuntu/merge.py (+1/-1)
gitubuntu/run.py (+15/-0)
gitubuntu/versioning.py (+35/-0)
scripts/import-source-packages.py (+20/-25)
scripts/scriptutils.py (+202/-13)
scripts/source-package-walker.py (+20/-85)
scripts/update-repository-alias.py (+15/-15)
snap/snapcraft.yaml (+3/-5)
| Robie Basak (racb) wrote | #1 |
| tags: | added: build |
| Nish Aravamudan (nacc) wrote | #2 |
| Changed in usd-importer: | |
| status: | New → In Progress |
| assignee: | nobody → Nish Aravamudan (nacc) |
| Changed in usd-importer: | |
| status: | In Progress → Triaged |
| assignee: | Nish Aravamudan (nacc) → nobody |
| tags: | added: quiltify |
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/
index 072d3e7..3178e69 100644
--- a/gitubuntu/
+++ b/gitubuntu/
@@ -1004,11 +1004,12 @@ def do_build_
)
+ import time; time.sleep(20)
for i in range(retries+1):
try:
- _run_in_
+ _run_in_
- 'apt',
+ 'apt-get',
@@ -1018,7 +1019,7 @@ def do_build_
break
except Exception as e:
- "Failed to run apt in ephemeral build container "
+ "Failed to run apt-get in ephemeral build container "
)
@@ -1026,7 +1027,7 @@ def do_build_
else:
raise RuntimeError(
- "Failed to run apt in ephemeral build container"
+ "Failed to run apt-get in ephemeral build container"
)
try: