DELTA 469451 0 35 SVN=V>2ENDREP DELTA SVN]_]]diff --git a/libpkg/pkg.c b/libpkg/pkg.c index 0c472b39..b4ee9ec3 100644 --- libpkg/pkg.c +++ libpkg/pkg.c @@ -1668,7 +1668,7 @@ pkg_is_config_file(struct pkg *p, const char *path, return (false); kh_find(pkg_config_files, p->config_files, path, *cfile); - if (cfile == NULL) { + if (*cfile == NULL) { *file = NULL; return (false); } ENDREP id: 9-290111.0.r477662/425 type: file pred: 9-290111.0.r469451/551 count: 200 text: 477662 0 21 2324 52c8f491ffb0d650d0ae3cd7e6f68dc7 96040cffc498aa0e8131a65bb5c13330f4967868 477661-a8ke/_4 props: 300914 71 103 0 bb58aa814bbdf5f7c1ab04a05656f5a5 cpath: /head/ports-mgmt/pkg/Makefile copyroot: 0 / id: 5-477662.0.r477662/723 type: file count: 0 text: 477662 46 366 349 23df6cc88272b328c2c98d1ed77ff4c8 eb415098c4f9bf60806a972e5dae9689dc3b1e96 477661-a8ke/_7 props: 300936 2259 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/ports-mgmt/pkg/files/patch-1702 copyroot: 0 / PLAIN K 22 extra-patch-docs_pkg.8 V 27 file 6-362699.0.r384028/395 K 10 patch-1663 V 27 file 5-469451.0.r469451/849 K 10 patch-1702 V 27 file 5-477662.0.r477662/723 K 19 patch-javavmwrapper V 27 file 5-419360.0.r422083/482 END ENDREP id: 5-335210.0.r477662/1234 type: dir pred: 5-335210.0.r469451/1312 count: 37 text: 477662 1000 221 0 f89f0425dc3b1593be2814198f34cb40 cpath: /head/ports-mgmt/pkg/files copyroot: 0 / PLAIN K 8 Makefile V 27 file 9-290111.0.r477662/425 K 8 distinfo V 27 file c-290111.0.r461849/529 K 5 files V 27 dir 5-335210.0.r477662/1234 K 9 pkg-descr V 25 file e-290111.0.r470601/0 K 9 pkg-plist V 28 file 6-293981.0.r434755/1150 END ENDREP id: 8-290111.0.r477662/1663 type: dir pred: 8-290111.0.r470601/539 count: 218 text: 477662 1418 232 0 8efeb9e1c54eb3ef8420b215d3d319a2 cpath: /head/ports-mgmt/pkg copyroot: 0 / PLAIN K 8 Makefile V 28 file 3-183782.0.r464994/1102 K 15 bsdadminscripts V 34 dir 4-162547.0-441068.r441068/3213 K 16 bsdadminscripts2 V 36 dir 4-162547.1-441068.r450473/105916 K 6 chucky V 29 dir 4-325275.0.r426827/709346 K 14 create-rb-port V 27 dir 4-425111.0.r437801/1035 K 12 dialog4ports V 27 dir 4-314119.0.r418433/1058 K 19 dialog4ports-static V 26 dir 6-327356.0.r341616/544 K 10 distilator V 30 dir 4-263291.0.r474242/1173973 K 13 fastest_sites V 28 dir 4-209737.0.r464165/86317 K 20 freebsd-bugzilla-cli V 27 dir 4-393188.0.r449448/1175 K 8 genpatch V 29 dir 4-386647.0.r439129/652186 K 8 genplist V 29 dir 2-190440.0.r460452/504561 K 8 hs-porte V 30 dir 4-222410.0.r473611/1124781 K 9 jailaudit V 27 dir 2-149353.0.r423367/1347 K 7 lsknobs V 30 dir 4-206131.0.r412348/2437241 K 9 managepkg V 30 dir 2-141993.0.r415738/1172851 K 9 mkreadmes V 30 dir 4-292578.0.r431996/1106617 K 7 octopkg V 30 dir 4-391418.0.r475857/1989300 K 20 p5-FreeBSD-Portindex V 30 dir 2-122069.0.r412348/2437968 K 16 p5-FreeBSD-Ports V 28 dir 2-47770.0.r458755/325284 K 26 p5-FreeBSD-Ports-INDEXhash V 30 dir 4-212731.0.r470993/3681388 K 10 packagekit V 31 dir ha-254099.0.r473503/1973672 K 8 pchecker V 27 dir 4-292125.0.r451354/1018 K 3 pkg V 27 dir 8-290111.0.r477662/1663 K 9 pkg-devel V 33 dir 8-290111.0-319432.r470212/730 K 9 pkg-plist V 36 dir 4-286386.0-374060.r470213/506551 K 12 pkg-provides V 27 dir 4-459945.0.r476364/1112 K 10 pkg-rmleaf V 27 dir 4-318266.0.r470416/2024 K 11 pkg_cleanup V 27 dir 4-204988.0.r396165/1426 K 13 pkg_cutleaves V 26 dir 2-89898.0.r458380/1202 K 8 pkg_jail V 27 dir 4-251482.0.r477314/1282 K 11 pkg_replace V 27 dir 2-175972.0.r471209/1109 K 12 pkg_rmleaves V 29 dir 2-125307.0.r415500/107020 K 10 pkg_search V 27 dir 2-203382.0.r425206/1245 K 8 pkg_tree V 26 dir 2-48688.0.r426928/1567 K 10 pkgcompare V 29 dir 4-371655.0.r458739/907494 K 10 pkgs_which V 26 dir 4-270739.0.r472157/510 K 20 port-authoring-tools V 30 dir 2-110096.0.r412348/2440105 K 21 port-index-uniquifier V 26 dir 4-423733.0.r424147/489 K 22 port-maintenance-tools V 30 dir 9-110096.0.r412348/2440750 K 6 portal V 30 dir 4-409243.0.r475857/1990005 K 8 portconf V 26 dir 2-164795.0.r382960/643 K 13 portdowngrade V 25 dir 2-94875.0.r452198/507 K 7 portell V 29 dir g-72810.0.r455210/2439209 K 7 portest V 29 dir 4-410637.0.r444980/524780 K 8 portfind V 27 dir 4-378721.0.r431610/1525 K 9 portgraph V 27 dir 4-464994.0.r464994/2387 K 8 portless V 30 dir g-165086.0.r412348/2444172 K 8 portlint V 24 dir d-6943.0.r476593/812 K 10 portmaster V 27 dir 2-156552.0.r475149/1383 K 7 portrac V 30 dir 4-241334.0.r475857/1990711 K 11 ports-tools V 29 dir 4-432868.0.r462871/694905 K 9 portscout V 27 dir 2-182924.0.r453234/2119 K 10 portsearch V 26 dir 2-155006.0.r446950/927 K 10 portshaker V 27 dir 4-256205.0.r471361/1071 K 17 portshaker-config V 26 dir 4-256206.0.r419773/948 K 14 portsreinstall V 27 dir 4-288022.0.r473723/2726 K 9 porttools V 26 dir e-83314.0.r460454/1653 K 8 porttree V 27 dir 4-285177.0.r473212/1537 K 15 portupdate-scan V 27 dir 2-203636.0.r356507/3015 K 11 portupgrade V 26 dir 2-39990.0.r463994/1442 K 17 portupgrade-devel V 26 dir f-39990.0.r463994/2464 K 9 poudriere V 27 dir 4-290206.0.r471280/1094 K 15 poudriere-devel V 34 dir 4-290206.0-302633.r471282/1304 K 7 psearch V 30 dir 2-156281.0.r340722/5457691 K 11 py-pytoport V 30 dir 4-404629.0.r472884/2021886 K 7 py-skog V 29 dir 4-405112.0.r467537/433749 K 8 symports V 29 dir 4-236535.0.r369161/414426 K 5 synth V 27 dir 4-405749.0.r471098/1105 K 9 tinderbox V 29 dir i-152082.0.r477060/212967 K 12 wanted-ports V 30 dir 4-256557.0.r412348/2454932 END ENDREP id: 1-5132.0.r477662/5474 type: dir pred: 1-5132.0.r477314/5096 count: 3735 text: 477662 1841 3620 0 d62b760e795e4b8afe93c4ed969833ab cpath: /head/ports-mgmt copyroot: 0 / PLAIN K 10 .arcconfig V 26 file 1-354154.0.r422906/41 K 14 .gitattributes V 26 file 1-411777.0.r467740/54 K 11 .gitauthors V 26 file 1-467739.0.r474743/79 K 10 .gitignore V 26 file 1-348322.0.r458023/77 K 11 .gitmessage V 27 file 3-457790.0.r457790/987 K 7 CHANGES V 29 file 1-99373.0.r473503/169671 K 15 CONTRIBUTING.md V 27 file 1-348323.0.r348323/344 K 9 COPYRIGHT V 26 file 1-146787.0.r470957/47 K 4 GIDs V 28 file 1-168311.0.r477056/5888 K 8 Keywords V 27 dir 1-314142.0.r419368/1305 K 5 LEGAL V 25 file 1-748.0.r476231/5318 K 5 MOVED V 26 file 1-69878.0.r477641/424 K 8 Makefile V 21 file 1-6.0.r460340/56 K 2 Mk V 22 dir 1-5.0.r477299/1956 K 6 README V 24 file 1-2408.0.r469089/62 K 9 Templates V 25 dir 1-2932.0.r477111/1631 K 5 Tools V 26 dir 3-15302.0.r477615/3047 K 4 UIDs V 28 file 4-168311.0.r477056/6171 K 8 UPDATING V 28 file 1-102685.0.r477115/2112 K 13 accessibility V 26 dir 1-42583.0.r476761/2909 K 6 arabic V 27 dir 1-38973.0.r473396/50714 K 9 archivers V 25 dir 1-242.0.r477641/14586 K 5 astro V 24 dir 1-301.0.r477654/8775 K 5 audio V 25 dir 1-148.0.r477628/47580 K 4 base V 27 dir 1-420954.0.r477638/1406 K 10 benchmarks V 24 dir 1-62.0.r476952/14436 K 7 biology V 26 dir 1-9066.0.r477371/10297 K 3 cad V 25 dir 1-276.0.r477484/46031 K 7 chinese V 25 dir 1-3770.0.r476886/6394 K 5 comms V 24 dir 1-76.0.r477534/12596 K 10 converters V 26 dir 1-1561.0.r477532/11069 K 9 databases V 25 dir 1-771.0.r477660/60722 K 9 deskutils V 26 dir 1-2098.0.r477661/18791 K 5 devel V 25 dir 1-73.0.r477659/347357 K 3 dns V 26 dir 1-6145.0.r477643/15867 K 7 editors V 23 dir 4-6.0.r477625/14637 K 9 emulators V 25 dir 1-181.0.r477611/10339 K 7 finance V 26 dir 1-4110.0.r477495/13214 K 6 french V 27 dir 1-25673.0.r477484/51575 K 3 ftp V 24 dir 1-199.0.r477326/7245 K 5 games V 25 dir 1-104.0.r477655/66765 K 6 german V 27 dir 1-7451.0.r477492/350844 K 8 graphics V 24 dir 1-94.0.r477557/65953 K 6 hebrew V 28 dir 3-31142.0.r473396/140449 K 9 hungarian V 29 dir 1p-38973.0.r473396/141864 K 3 irc V 23 dir 1-42.0.r477542/7084 K 8 japanese V 25 dir 1-410.0.r476806/16394 K 4 java V 26 dir 1-2798.0.r477203/15991 K 6 korean V 28 dir 1-5873.0.r473503/1470502 K 4 lang V 24 dir 1-15.0.r477642/34053 K 4 mail V 24 dir 1-57.0.r477630/44551 K 4 math V 25 dir 1-162.0.r477632/47431 K 4 misc V 24 dir 7-35.0.r477650/36069 K 10 multimedia V 25 dir d-333.0.r477647/26925 K 3 net V 24 dir 1-22.0.r477649/82641 K 6 net-im V 28 dir 15-11144.0.r477644/15022 K 8 net-mgmt V 26 dir r-1011.0.r477620/25924 K 7 net-p2p V 26 dir g-29106.0.r477432/7192 K 4 news V 26 dir 1-145.0.r476184/742085 K 4 palm V 27 dir 1-6646.0.r477371/664338 K 6 polish V 27 dir tv-38973.0.r477094/2195 K 10 ports-mgmt V 25 dir 1-5132.0.r477662/5474 K 10 portuguese V 28 dir 1-17842.0.r473396/164623 K 5 print V 24 dir 1-79.0.r477652/14676 K 7 russian V 27 dir 1-1559.0.r477492/353737 K 7 science V 26 dir n-5356.0.r477639/13941 K 8 security V 25 dir 1-269.0.r477656/72789 K 6 shells V 22 dir w-6.0.r476938/3910 K 8 sysutils V 25 dir b-339.0.r477657/76455 K 8 textproc V 26 dir 1-322.0.r477603/102386 K 9 ukrainian V 28 dir g-39704.0.r473396/168943 K 10 vietnamese V 26 dir 1-4812.0.r474818/35506 K 3 www V 26 dir 1-114.0.r477644/238437 K 3 x11 V 24 dir 1-16.0.r477215/28049 K 10 x11-clocks V 26 dir 1-931.0.r477371/916579 K 11 x11-drivers V 27 dir 1-157567.0.r476807/4774 K 6 x11-fm V 24 dir 1-691.0.r477439/5220 K 9 x11-fonts V 25 dir 1-543.0.r477417/11951 K 11 x11-servers V 28 dir 1n-710.0.r476013/1370294 K 10 x11-themes V 27 dir 1-14410.0.r477582/12599 K 12 x11-toolkits V 25 dir 1-120.0.r477608/17531 K 6 x11-wm V 23 dir 1-40.0.r477581/8203 END ENDREP id: 2-1.0.r477662/9267 type: dir pred: 2-1.0.r477661/22586 count: 471337 text: 477662 5647 3607 0 4f4bff078d78529c4c9037b612a949b3 props: 458023 3927 157 0 4d85142843815bcc29c89469bccb873c cpath: /head copyroot: 0 / minfo-cnt: 1 PLAIN K 8 branches V 23 dir 0-1.0.r477651/51831 K 4 head V 22 dir 2-1.0.r477662/9267 K 8 projects V 24 dir 0-377393.0.r441387/0 K 8 svnadmin V 22 dir 3-1.0.r476974/1202 K 4 tags V 24 dir 8-1.0.r471851/179907 END ENDREP id: 0.0.r477662/9716 type: dir pred: 0.0.r477661/23038 count: 477662 text: 477662 9497 206 0 66b4cf46d09bdc7f124283a9e8ec3741 props: 341041 7130 346 0 8b695b9f61597e4917effffba3bbfaa3 cpath: / copyroot: 0 / minfo-cnt: 42 9-290111.0.t477661-a8ke modify-file true false /head/ports-mgmt/pkg/Makefile _5.0.t477661-a8ke add-file true true /head/ports-mgmt/pkg/files/patch-1702 9716 9938