| Message ID | 20230522174815.1110222-1-petar.koynov@ni.com |
|---|---|
| State | New |
| Headers | show |
| Series | [opkg-utils,V2] opkg-feed: Fix adding feeds with same name as architecture | expand |
ACK; looks good to me. I'll pull this tomorrow, if there are no objections. On 5/22/23 12:48, Petar Koynov wrote: > Attempting to add feeds with some special names that match > architecture names was returning an error: > "5 The named feed already exists" > Make sourceTypePattern in createFeedLineRegex only match > feed configuration lines src or dist > > Signed-off-by: Petar Koynov <petar.koynov@ni.com> > --- > opkg-feed | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/opkg-feed b/opkg-feed > index 25ef879..36d4463 100755 > --- a/opkg-feed > +++ b/opkg-feed > @@ -171,7 +171,7 @@ createFeedLineRegex() > # 1 = full source type with any quotes > # 2 = source type without quotes if quoted > # 3 = source type if unquoted > - sourceTypePattern='("([^"]*)"|(\S+))\s+'; > + sourceTypePattern='("([^"](src|dist)(/gz)?)"|(src|dist)(/gz)?)\s+'; > > # Feed name capture groups (4, 5, 6) > # 4 = full feed name with any quotes
Pulled to opkg-utils as 67994e62dc598282830385da75ba9b1abbbda941 [1]. [1] https://git.yoctoproject.org/opkg-utils/commit/?id=67994e62dc598282830385da75ba9b1abbbda941 Thanks! On 5/22/23 12:48, Petar Koynov wrote: > Attempting to add feeds with some special names that match > architecture names was returning an error: > "5 The named feed already exists" > Make sourceTypePattern in createFeedLineRegex only match > feed configuration lines src or dist > > Signed-off-by: Petar Koynov <petar.koynov@ni.com> > --- > opkg-feed | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/opkg-feed b/opkg-feed > index 25ef879..36d4463 100755 > --- a/opkg-feed > +++ b/opkg-feed > @@ -171,7 +171,7 @@ createFeedLineRegex() > # 1 = full source type with any quotes > # 2 = source type without quotes if quoted > # 3 = source type if unquoted > - sourceTypePattern='("([^"]*)"|(\S+))\s+'; > + sourceTypePattern='("([^"](src|dist)(/gz)?)"|(src|dist)(/gz)?)\s+'; > > # Feed name capture groups (4, 5, 6) > # 4 = full feed name with any quotes
diff --git a/opkg-feed b/opkg-feed index 25ef879..36d4463 100755 --- a/opkg-feed +++ b/opkg-feed @@ -171,7 +171,7 @@ createFeedLineRegex() # 1 = full source type with any quotes # 2 = source type without quotes if quoted # 3 = source type if unquoted - sourceTypePattern='("([^"]*)"|(\S+))\s+'; + sourceTypePattern='("([^"](src|dist)(/gz)?)"|(src|dist)(/gz)?)\s+'; # Feed name capture groups (4, 5, 6) # 4 = full feed name with any quotes
Attempting to add feeds with some special names that match architecture names was returning an error: "5 The named feed already exists" Make sourceTypePattern in createFeedLineRegex only match feed configuration lines src or dist Signed-off-by: Petar Koynov <petar.koynov@ni.com> --- opkg-feed | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)