DELTA 402401 0 22 SVN99 C卽D1ENDREP DELTA SVN俉俌俉俉--- src/share/poudriere/common.sh.orig 2015-11-30 17:25:11 UTC +++ src/share/poudriere/common.sh @@ -1847,7 +1847,7 @@ jail_stop() { fi msg "Umounting file systems" destroyfs ${MASTERMNT} jail || : - rm -rfx ${MASTERMNT}/../ + rm -rf ${MASTERMNT}/../ export STATUS=0 # Don't override if there is a failure to grab the last status. ENDREP DELTA SVN乮乲乮乮--- src/share/poudriere/include/fs.sh.orig 2015-11-30 17:25:11 UTC +++ src/share/poudriere/include/fs.sh @@ -181,6 +181,6 @@ destroyfs() { rmdir ${mnt} else chflags -R noschg ${mnt} - rm -rfx ${mnt} + rm -rf ${mnt} fi } ENDREP DELTA 402402 0 69 SVN== L唒M1ENDREP DELTA SVN俉俌俉俉--- src/share/poudriere/common.sh.orig 2015-11-30 17:26:13 UTC +++ src/share/poudriere/common.sh @@ -1856,7 +1856,7 @@ jail_stop() { fi msg "Umounting file systems" destroyfs ${MASTERMNT} jail || : - rm -rfx ${MASTERMNT}/../ + rm -rf ${MASTERMNT}/../ export STATUS=0 # Don't override if there is a failure to grab the last status. ENDREP DELTA SVN乮乲乮乮--- src/share/poudriere/include/fs.sh.orig 2015-11-30 17:26:08 UTC +++ src/share/poudriere/include/fs.sh @@ -181,6 +181,6 @@ destroyfs() { rmdir ${mnt} else chflags -R noschg ${mnt} - rm -rfx ${mnt} + rm -rf ${mnt} fi } ENDREP id: 5-290206.0.r402690/1366 type: file pred: 5-290206.0.r402401/229 count: 75 text: 402690 0 22 825 cd75eebff7bbdcc6620ef346092a1d00 a19f73a878cb940f53f631851bc7f677bd2b7864 402689-8mpu/_4 props: 300914 71 103 0 bb58aa814bbdf5f7c1ab04a05656f5a5 cpath: /head/ports-mgmt/poudriere/Makefile copyroot: 0 / id: 6-402690.0.r402690/1669 type: file count: 0 text: 402690 47 360 343 ada1926b67924dd625e774d9066c345b 7474fb7251b6f36059f6b482ee96efce1a2db63b 402689-8mpu/_8 props: 300936 2259 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/ports-mgmt/poudriere/files/patch-src_share_poudriere_common.sh copyroot: 0 / id: 9-402690.0.r402690/1978 type: file count: 0 text: 402690 420 250 233 331463e4d725c0905b98d8634766a237 26cf5c3d3f94000a40b98b6aacd72bdc9b8091b2 402689-8mpu/_a props: 300936 2259 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/ports-mgmt/poudriere/files/patch-src_share_poudriere_include_fs.sh copyroot: 0 / PLAIN K 35 patch-src_share_poudriere_common.sh V 28 file 6-402690.0.r402690/1669 K 39 patch-src_share_poudriere_include_fs.sh V 28 file 9-402690.0.r402690/1978 END ENDREP id: 5-402690.0.r402690/2463 type: dir count: 0 text: 402690 2292 158 0 60753a0329938ac68cf98386b930800c cpath: /head/ports-mgmt/poudriere/files copyroot: 0 / PLAIN K 8 Makefile V 28 file 5-290206.0.r402690/1366 K 8 distinfo V 27 file 8-290206.0.r402401/531 K 5 files V 27 dir 5-402690.0.r402690/2463 K 9 pkg-descr V 28 file a-290206.0.r373856/2647 K 9 pkg-plist V 27 file 6-353572.0.r397005/833 END ENDREP id: 4-290206.0.r402690/2870 type: dir pred: 4-290206.0.r402401/1040 count: 82 text: 402690 2622 235 0 996396291a69f9eeb9d3ada160a7eff3 cpath: /head/ports-mgmt/poudriere copyroot: 0 / id: 5-290206.0-302633.r402690/3054 type: file pred: 5-290206.0-302633.r402402/443 count: 162 text: 402690 683 22 957 6caf5366f7e6db85efd9dadef387a8ab d28207eb92044b9a55f9ceda18c83988502558ef 402689-8mpu/_c props: 300914 71 103 0 bb58aa814bbdf5f7c1ab04a05656f5a5 cpath: /head/ports-mgmt/poudriere-devel/Makefile copyroot: 302633 /head/ports-mgmt/poudriere-devel id: e-402690.0-302633.r402690/3416 type: file count: 0 text: 402690 730 360 343 256bf036323bfcc538a540dfec0b0452 bfec2a61c39294e1371fe41413cdb174dbab8b55 402689-8mpu/_g props: 300936 2259 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_common.sh copyroot: 302633 /head/ports-mgmt/poudriere-devel id: h-402690.0-302633.r402690/3775 type: file count: 0 text: 402690 1103 250 233 f0bd006a260b83b373376085e5bf19ca 69be609787d3f19bae78c30097902ecfde0845b3 402689-8mpu/_i props: 300936 2259 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_include_fs.sh copyroot: 302633 /head/ports-mgmt/poudriere-devel PLAIN K 35 patch-src_share_poudriere_common.sh V 35 file e-402690.0-302633.r402690/3416 K 39 patch-src_share_poudriere_include_fs.sh V 35 file h-402690.0-302633.r402690/3775 END ENDREP id: d-402690.0-302633.r402690/4324 type: dir count: 0 text: 402690 4139 172 0 984e8668b43bbaedb63133bee597736d cpath: /head/ports-mgmt/poudriere-devel/files copyroot: 302633 /head/ports-mgmt/poudriere-devel PLAIN K 8 Makefile V 35 file 5-290206.0-302633.r402690/3054 K 8 distinfo V 34 file 8-290206.0-302633.r402402/802 K 5 files V 34 dir d-402690.0-302633.r402690/4324 K 9 pkg-descr V 35 file a-290206.0-302633.r368566/1317 K 9 pkg-plist V 35 file 6-348866.0-302633.r402402/1164 END ENDREP id: 4-290206.0-302633.r402690/4816 type: dir pred: 4-290206.0-302633.r402402/1762 count: 170 text: 402690 4532 271 0 748e159a3ae1697c9066ff1fe624f208 cpath: /head/ports-mgmt/poudriere-devel copyroot: 302633 /head/ports-mgmt/poudriere-devel PLAIN K 8 Makefile V 30 file 3-183782.0.r400630/284685 K 6 chucky V 27 dir 4-325275.0.r385643/3102 K 12 dialog4ports V 29 dir 4-314119.0.r399346/841771 K 19 dialog4ports-static V 26 dir 6-327356.0.r341616/544 K 10 distilator V 27 dir 4-263291.0.r376406/1046 K 13 fastest_sites V 29 dir 4-209737.0.r386097/995819 K 7 fbsdmon V 29 dir 4-290366.0.r384126/522475 K 20 freebsd-bugzilla-cli V 26 dir 4-393188.0.r401246/729 K 8 genpatch V 29 dir 4-386647.0.r398833/265835 K 8 genplist V 26 dir 2-190440.0.r352174/541 K 8 hs-porte V 30 dir 4-222410.0.r394918/1228394 K 9 jailaudit V 29 dir 2-149353.0.r374163/396592 K 11 kpackagekit V 29 dir 4-255504.0.r379358/696454 K 7 lsknobs V 26 dir 4-206131.0.r382961/523 K 9 managepkg V 29 dir 2-141993.0.r398833/266496 K 9 mkreadmes V 28 dir 4-292578.0.r394716/71118 K 7 octopkg V 26 dir 4-391418.0.r393881/985 K 20 p5-FreeBSD-Portindex V 27 dir 2-122069.0.r399617/1054 K 16 p5-FreeBSD-Ports V 29 dir 2-47770.0.r386312/1945825 K 26 p5-FreeBSD-Ports-INDEXhash V 30 dir 4-212731.0.r373448/5126949 K 10 packagekit V 27 dir ha-254099.0.r393874/661 K 14 packagekit-qt4 V 28 dir hs-254099.0.r372504/5128 K 8 pchecker V 26 dir 4-292125.0.r370270/971 K 3 pkg V 27 dir 8-290111.0.r402334/1092 K 9 pkg-devel V 34 dir 8-290111.0-319432.r402333/1243 K 9 pkg-plist V 33 dir 4-286386.0-374060.r401044/632 K 10 pkg-rmleaf V 26 dir 4-318266.0.r374209/568 K 11 pkg_cleanup V 27 dir 4-204988.0.r396165/1426 K 13 pkg_cutleaves V 25 dir 2-89898.0.r397055/938 K 8 pkg_jail V 27 dir 4-251482.0.r400158/5248 K 11 pkg_replace V 27 dir 2-175972.0.r375005/1027 K 12 pkg_rmleaves V 26 dir 2-125307.0.r345688/986 K 10 pkg_search V 28 dir 2-203382.0.r362126/17147 K 8 pkg_tree V 26 dir 2-48688.0.r390724/3696 K 10 pkgcompare V 27 dir 4-371655.0.r385643/4103 K 10 pkgs_which V 27 dir 4-270739.0.r345430/2090 K 20 port-authoring-tools V 26 dir 2-110096.0.r382935/562 K 22 port-maintenance-tools V 26 dir 9-110096.0.r388302/473 K 8 portconf V 26 dir 2-164795.0.r382960/643 K 13 portdowngrade V 25 dir 2-94875.0.r357538/535 K 7 portell V 28 dir g-72810.0.r387082/745679 K 8 portfind V 27 dir 4-378721.0.r378721/2338 K 8 portless V 26 dir g-165086.0.r350067/878 K 8 portlint V 25 dir d-6943.0.r400154/2333 K 10 portmaster V 26 dir 2-156552.0.r399007/524 K 7 portrac V 26 dir 4-241334.0.r397882/599 K 9 portscout V 28 dir 2-182924.0.r401037/12098 K 10 portsearch V 30 dir 2-155006.0.r386312/1946552 K 10 portshaker V 26 dir 4-256205.0.r385796/626 K 17 portshaker-config V 26 dir 4-256206.0.r397809/515 K 14 portsreinstall V 27 dir 4-288022.0.r378749/1093 K 9 porttools V 26 dir e-83314.0.r400865/1071 K 8 porttree V 29 dir 4-285177.0.r397461/439098 K 15 portupdate-scan V 27 dir 2-203636.0.r356507/3015 K 11 portupgrade V 26 dir 2-39990.0.r387621/1241 K 17 portupgrade-devel V 26 dir f-39990.0.r386370/1114 K 9 poudriere V 27 dir 4-290206.0.r402690/2870 K 15 poudriere-devel V 34 dir 4-290206.0-302633.r402690/4816 K 7 psearch V 30 dir 2-156281.0.r340722/5457691 K 8 symports V 29 dir 4-236535.0.r369161/414426 K 9 tinderbox V 26 dir i-152082.0.r395710/724 K 15 tinderbox-devel V 27 dir x-152082.0.r396996/1799 K 12 wanted-ports V 27 dir 4-256557.0.r374209/1220 K 3 xps V 27 dir 4-223946.0.r385643/6097 END ENDREP id: 1-5132.0.r402690/8270 type: dir pred: 1-5132.0.r402402/5216 count: 3186 text: 402690 5057 3200 0 c1226fc5df014ee0fcd98a1f56da757f cpath: /head/ports-mgmt copyroot: 0 / PLAIN K 10 .arcconfig V 26 file 1-354154.0.r391201/64 K 10 .gitignore V 26 file 1-348322.0.r376072/79 K 7 CHANGES V 27 file 1-99373.0.r400846/2247 K 15 CONTRIBUTING.md V 27 file 1-348323.0.r348323/344 K 9 COPYRIGHT V 26 file 1-146787.0.r375875/49 K 4 GIDs V 28 file 1-168311.0.r401837/2297 K 8 Keywords V 27 dir 1-314142.0.r399974/1114 K 5 LEGAL V 25 file 1-748.0.r400622/2897 K 5 MOVED V 27 file 1-69878.0.r402654/1580 K 8 Makefile V 22 file 1-6.0.r365265/122 K 2 Mk V 22 dir 1-5.0.r402458/2644 K 6 README V 25 file 1-2408.0.r340854/956 K 9 Templates V 24 dir 1-2932.0.r400392/749 K 5 Tools V 26 dir 3-15302.0.r397867/3222 K 4 UIDs V 28 file 4-168311.0.r401837/2578 K 8 UPDATING V 29 file 1-102685.0.r402642/16658 K 13 accessibility V 27 dir 1-42583.0.r401900/10690 K 6 arabic V 26 dir 1-38973.0.r401516/1273 K 9 archivers V 25 dir 1-242.0.r402663/11634 K 5 astro V 25 dir 1-301.0.r402562/22450 K 5 audio V 25 dir 1-148.0.r402619/44889 K 10 benchmarks V 24 dir 1-62.0.r402562/67850 K 7 biology V 25 dir 1-9066.0.r402567/5627 K 3 cad V 25 dir 1-276.0.r402562/76773 K 7 chinese V 26 dir 1-3770.0.r402562/83108 K 5 comms V 24 dir 1-76.0.r402647/11067 K 10 converters V 27 dir 1-1561.0.r402562/101670 K 9 databases V 25 dir 1-771.0.r402675/53397 K 9 deskutils V 27 dir 1-2098.0.r402562/168669 K 5 devel V 25 dir 1-73.0.r402677/286591 K 3 dns V 26 dir 1-6145.0.r402680/10838 K 7 editors V 23 dir 4-6.0.r402637/36272 K 9 emulators V 24 dir 1-181.0.r402659/9850 K 7 finance V 27 dir 1-4110.0.r402562/489622 K 6 french V 28 dir 1-25673.0.r402562/491226 K 3 ftp V 26 dir 1-199.0.r402562/496429 K 5 games V 25 dir 1-104.0.r402666/58109 K 6 german V 27 dir 1-7451.0.r402562/555846 K 8 graphics V 24 dir 1-94.0.r402669/55077 K 6 hebrew V 28 dir 3-31142.0.r400704/134089 K 9 hungarian V 29 dir 1p-38973.0.r400704/135609 K 3 irc V 25 dir 1-42.0.r402586/476413 K 8 japanese V 25 dir 1-410.0.r402456/15801 K 4 java V 25 dir 1-2798.0.r402336/6561 K 6 korean V 27 dir 1-5873.0.r400848/647845 K 4 lang V 24 dir 1-15.0.r402685/17531 K 4 mail V 24 dir 1-57.0.r402689/38055 K 4 math V 25 dir 1-162.0.r402682/37423 K 4 misc V 24 dir 7-35.0.r402610/36657 K 10 multimedia V 25 dir d-333.0.r402665/23710 K 3 net V 24 dir 1-22.0.r402684/70706 K 6 net-im V 29 dir 15-11144.0.r402450/569226 K 8 net-mgmt V 26 dir r-1011.0.r402555/18517 K 7 net-p2p V 26 dir g-29106.0.r402681/6155 K 4 news V 24 dir 1-145.0.r402191/4321 K 4 palm V 25 dir 1-6646.0.r402271/1784 K 6 polish V 27 dir tv-38973.0.r402375/2769 K 10 ports-mgmt V 25 dir 1-5132.0.r402690/8270 K 10 portuguese V 28 dir 1-17842.0.r400704/158615 K 5 print V 25 dir 1-79.0.r402450/583487 K 7 russian V 25 dir 1-1559.0.r402330/5362 K 7 science V 27 dir n-5356.0.r402586/612106 K 8 security V 25 dir 1-269.0.r402678/59142 K 6 shells V 22 dir w-6.0.r402674/3374 K 8 sysutils V 25 dir b-339.0.r402679/60659 K 8 textproc V 25 dir 1-322.0.r402676/91238 K 9 ukrainian V 28 dir g-39704.0.r400704/163411 K 10 vietnamese V 28 dir 1-4812.0.r401096/1216886 K 3 www V 26 dir 1-114.0.r402655/134264 K 3 x11 V 25 dir 1-16.0.r402613/314373 K 10 x11-clocks V 27 dir 1-931.0.r401096/1405481 K 11 x11-drivers V 27 dir 1-157567.0.r402459/3522 K 6 x11-fm V 27 dir 1-691.0.r401096/1408148 K 9 x11-fonts V 25 dir 1-543.0.r402125/11414 K 11 x11-servers V 25 dir 1n-710.0.r400485/1821 K 10 x11-themes V 27 dir 1-14410.0.r402443/10813 K 12 x11-toolkits V 25 dir 1-120.0.r402365/14565 K 6 x11-wm V 23 dir 1-40.0.r402631/9104 END ENDREP id: 2-1.0.r402690/11877 type: dir pred: 2-1.0.r402689/41655 count: 400168 text: 402690 8443 3421 0 95047de5650a3b815a62b2218efd6f17 props: 7322 2587 45 0 7a04b33bf8e35fd5c3d111baaf403dc5 cpath: /head copyroot: 0 / PLAIN K 8 branches V 23 dir 0-1.0.r402617/49051 K 4 head V 23 dir 2-1.0.r402690/11877 K 8 projects V 30 dir 0-377393.0.r378744/3577692 K 8 svnadmin V 22 dir 3-1.0.r402266/1244 K 4 tags V 22 dir 8-1.0.r393564/5019 END ENDREP id: 0.0.r402690/12316 type: dir pred: 0.0.r402689/42095 count: 402690 text: 402690 12092 211 0 ef78dd2e7b8911a5399e01fcbc2a8a5d props: 341041 7130 346 0 8b695b9f61597e4917effffba3bbfaa3 cpath: / copyroot: 0 / minfo-cnt: 29 5-290206.0-302633.t402689-8mpu modify-file true false /head/ports-mgmt/poudriere-devel/Makefile _d.0-302633.t402689-8mpu add-dir false false /head/ports-mgmt/poudriere-devel/files _e.0-302633.t402689-8mpu add-file true true /head/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_common.sh _h.0-302633.t402689-8mpu add-file true true /head/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_include_fs.sh 5-290206.0.t402689-8mpu modify-file true false /head/ports-mgmt/poudriere/Makefile _5.0.t402689-8mpu add-dir false false /head/ports-mgmt/poudriere/files _6.0.t402689-8mpu add-file true true /head/ports-mgmt/poudriere/files/patch-src_share_poudriere_common.sh _9.0.t402689-8mpu add-file true true /head/ports-mgmt/poudriere/files/patch-src_share_poudriere_include_fs.sh 12316 12540