Skip to contentSkip to conversation

srt_create: Make sure series output is sorted

PATCH In review Tom Zanussi 2 participants 2 messages Apr 12, 2019 – Apr 15, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 srt_create: Make sure series output is sorted

Hi Daniel,

I actually used your stable-rt-tools srt tool this time to do the latest 3.18-rt update release - overall it works well and did the job nicely!

I did run into one serious problem in that the series file that gets created for the patches tarball lists the patches in essentially random order on my system, so using it to apply the series with quilt failed immediately. The patch below fixes the problem for me.

There were a few other things I ran into which boiled down to essentially lack of documentation and/or informative enough error messages, and one or two things having to do with my workflow on two separate machines that I'll have to think about. I'll write some patches addressing those and sent when I get the chance.

Anyway, thanks for the useful tool!

Tom

--

From: Tom Zanussi <[email protected]>

os.listdir() doesn't guarantee ordering, so using its output directly as input for the series file can result in a randomly ordered series that quilt can't apply.

---
 srt_create.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
srt_create.py +1 -1
index 7314988..90d1e1b 100644
@@ -47,7 +47,7 @@ def create_series(old_tag, new_tag, dirname):
     cmd(['git', 'format-patch', '-q', '-o', dirname,
          '{0}..{1}'.format(old_tag, new_tag)])
 
-    patches = [f for f in os.listdir(dirname)
+    patches = [f for f in sorted(os.listdir(dirname))
                if os.path.isfile(os.path.join(dirname, f))]
     with open(dirname + '/series', 'w') as file:
         for p in patches:
Signature · 1 line
2.14.1
#1 lore raw

Hi Tom,

Quoted 5 lines · Tom Zanussi

Hi Daniel,

I actually used your stable-rt-tools srt tool this time to do the latest 3.18-rt update release - overall it works well and did the job nicely!

Glad you tried it! Thanks!

Quoted 4 lines

I did run into one serious problem in that the series file that gets created for the patches tarball lists the patches in essentially random order on my system, so using it to apply the series with quilt failed immediately. The patch below fixes the problem for me.

Oh, something I haven't written a test yet for it :(

Quoted 5 lines

There were a few other things I ran into which boiled down to essentially lack of documentation and/or informative enough error messages, and one or two things having to do with my workflow on two separate machines that I'll have to think about. I'll write some patches addressing those and sent when I get the chance.

Sure, just send them. I am sure I forgot a few things to document or described it wrongly. Also I think the workflow could be improved. I am not so happy with the 'OLD_TAG NEW_TAG' arguments stuff. It would be cool if the tool would figure that out on itself.

Quoted 1 line

Anyway, thanks for the useful tool!

:)

Patch applied.

Thanks,
Daniel