* [Buildroot] [PATCH 1/1] support/scripts/check-uniq-files: Only report each package once
@ 2018-12-11 14:05 Einar Jon Gunnarsson
2018-12-30 22:02 ` Yann E. MORIN
0 siblings, 1 reply; 5+ messages in thread
From: Einar Jon Gunnarsson @ 2018-12-11 14:05 UTC (permalink / raw)
To: buildroot
Rebuilding the same package should not trigger
a 'touched by more than one package' warning
Signed-off-by: Einar Jon Gunnarsson <tolvupostur@gmail.com>
---
support/scripts/check-uniq-files | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/support/scripts/check-uniq-files b/support/scripts/check-uniq-files
index fbc6b5d..03faa71 100755
--- a/support/scripts/check-uniq-files
+++ b/support/scripts/check-uniq-files
@@ -28,7 +28,8 @@ def main():
with open(args.packages_file_list[0], 'rb') as pkg_file_list:
for line in pkg_file_list.readlines():
pkg, _, file = line.rstrip(b'\n').partition(b',')
- file_to_pkg[file].append(pkg)
+ if not pkg in file_to_pkg[file]:
+ file_to_pkg[file].append(pkg)
for file in file_to_pkg:
if len(file_to_pkg[file]) > 1:
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [Buildroot] [PATCH 1/1] support/scripts/check-uniq-files: Only report each package once
2018-12-11 14:05 [Buildroot] [PATCH 1/1] support/scripts/check-uniq-files: Only report each package once Einar Jon Gunnarsson
@ 2018-12-30 22:02 ` Yann E. MORIN
2019-01-02 12:12 ` Yann E. MORIN
0 siblings, 1 reply; 5+ messages in thread
From: Yann E. MORIN @ 2018-12-30 22:02 UTC (permalink / raw)
To: buildroot
On 2018-12-11 15:05 +0100, Einar Jon Gunnarsson spake thusly:
> Rebuilding the same package should not trigger
> a 'touched by more than one package' warning
>
> Signed-off-by: Einar Jon Gunnarsson <tolvupostur@gmail.com>
> ---
> support/scripts/check-uniq-files | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/support/scripts/check-uniq-files b/support/scripts/check-uniq-files
> index fbc6b5d..03faa71 100755
> --- a/support/scripts/check-uniq-files
> +++ b/support/scripts/check-uniq-files
> @@ -28,7 +28,8 @@ def main():
> with open(args.packages_file_list[0], 'rb') as pkg_file_list:
> for line in pkg_file_list.readlines():
> pkg, _, file = line.rstrip(b'\n').partition(b',')
> - file_to_pkg[file].append(pkg)
> + if not pkg in file_to_pkg[file]:
> + file_to_pkg[file].append(pkg)
I think the proper way would be to change file_to_pkg[file] to be a set
rather than a list. Care to test the following, instead:
diff --git a/support/scripts/check-uniq-files b/support/scripts/check-uniq-files
index fbc6b5d6e7..eb92724e42 100755
--- a/support/scripts/check-uniq-files
+++ b/support/scripts/check-uniq-files
@@ -24,11 +24,11 @@ def main():
sys.stderr.write('No type was provided\n')
return False
- file_to_pkg = defaultdict(list)
+ file_to_pkg = defaultdict(set)
with open(args.packages_file_list[0], 'rb') as pkg_file_list:
for line in pkg_file_list.readlines():
pkg, _, file = line.rstrip(b'\n').partition(b',')
- file_to_pkg[file].append(pkg)
+ file_to_pkg[file].add(pkg)
for file in file_to_pkg:
if len(file_to_pkg[file]) > 1:
Regards,
Yann E. MORIN.
> for file in file_to_pkg:
> if len(file_to_pkg[file]) > 1:
> --
> 2.7.4
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 5+ messages in thread* [Buildroot] [PATCH 1/1] support/scripts/check-uniq-files: Only report each package once
2018-12-30 22:02 ` Yann E. MORIN
@ 2019-01-02 12:12 ` Yann E. MORIN
2019-01-08 10:06 ` Einar Jón
0 siblings, 1 reply; 5+ messages in thread
From: Yann E. MORIN @ 2019-01-02 12:12 UTC (permalink / raw)
To: buildroot
Einar, All,
On 2018-12-30 23:02 +0100, Yann E. MORIN spake thusly:
> On 2018-12-11 15:05 +0100, Einar Jon Gunnarsson spake thusly:
> > Rebuilding the same package should not trigger
> > a 'touched by more than one package' warning
In fact, commit d3dca1e993 (core/pkg-generic: only save latest package
list) should have already fixed that case, no?
That commit has even been backported to the 2018.02.x branch already, as
commit a2b029afe5.
If you are using a version of Buildroot that is older than that, then
please update. If you still have the issue after updating to a version
that has either one of the aforementionned commits, then please report
the issue again.
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] support/scripts/check-uniq-files: Only report each package once
2019-01-02 12:12 ` Yann E. MORIN
@ 2019-01-08 10:06 ` Einar Jón
2019-01-08 21:18 ` Yann E. MORIN
0 siblings, 1 reply; 5+ messages in thread
From: Einar Jón @ 2019-01-08 10:06 UTC (permalink / raw)
To: buildroot
my bad. Not an issue on master.
On Wed, 2 Jan 2019 at 13:12, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
>
> Einar, All,
>
> On 2018-12-30 23:02 +0100, Yann E. MORIN spake thusly:
> > On 2018-12-11 15:05 +0100, Einar Jon Gunnarsson spake thusly:
> > > Rebuilding the same package should not trigger
> > > a 'touched by more than one package' warning
>
> In fact, commit d3dca1e993 (core/pkg-generic: only save latest package
> list) should have already fixed that case, no?
>
> That commit has even been backported to the 2018.02.x branch already, as
> commit a2b029afe5.
>
> If you are using a version of Buildroot that is older than that, then
> please update. If you still have the issue after updating to a version
> that has either one of the aforementionned commits, then please report
> the issue again.
I was using 2018.02, but I tested this on the buildroot git repo
before submitting.
I must have had an older version checked out for the testing.
I've now updated to 2018.08 and this is no longer an issue.
Sorry about that.
>
> Regards,
> Yann E. MORIN.
>
> --
> .-----------------.--------------------.------------------.--------------------.
> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
> | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
> '------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] support/scripts/check-uniq-files: Only report each package once
2019-01-08 10:06 ` Einar Jón
@ 2019-01-08 21:18 ` Yann E. MORIN
0 siblings, 0 replies; 5+ messages in thread
From: Yann E. MORIN @ 2019-01-08 21:18 UTC (permalink / raw)
To: buildroot
Einar, All,
On 2019-01-08 11:06 +0100, Einar J?n spake thusly:
> my bad. Not an issue on master.
No problem! It at least made me look at it again and came up with an
alternate solution. Thanks for the report! :-)
> On Wed, 2 Jan 2019 at 13:12, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> > On 2018-12-30 23:02 +0100, Yann E. MORIN spake thusly:
> > > On 2018-12-11 15:05 +0100, Einar Jon Gunnarsson spake thusly:
> > > > Rebuilding the same package should not trigger
> > > > a 'touched by more than one package' warning
> >
> > In fact, commit d3dca1e993 (core/pkg-generic: only save latest package
> > list) should have already fixed that case, no?
[--SNIP--]
> I was using 2018.02, but I tested this on the buildroot git repo
> before submitting.
> I must have had an older version checked out for the testing.
> I've now updated to 2018.08 and this is no longer an issue.
> Sorry about that.
No worries.
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-01-08 21:18 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-11 14:05 [Buildroot] [PATCH 1/1] support/scripts/check-uniq-files: Only report each package once Einar Jon Gunnarsson
2018-12-30 22:02 ` Yann E. MORIN
2019-01-02 12:12 ` Yann E. MORIN
2019-01-08 10:06 ` Einar Jón
2019-01-08 21:18 ` Yann E. MORIN
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox