Date: Sun, 28 Mar 2010 02:13:57 -0700 From: Garrett Cooper <gcooper@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org, freebsd-bugs@freebsd.org Subject: Re: bin/145100: [patch] pkg_add(1) - remove hardcoded versioning data from add/main.c Message-ID: <364299f41003280213x6f67ef45peb891f73fb4d140f@mail.gmail.com> In-Reply-To: <201003280850.o2S8o2v6038902@freefall.freebsd.org> References: <201003280844.o2S8ihqt007800@www.freebsd.org> <201003280850.o2S8o2v6038902@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--0016e68ee285ff239c0482d8d0ac Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On Sun, Mar 28, 2010 at 1:50 AM, <FreeBSD-gnats-submit@freebsd.org> wrote: > Thank you very much for your problem report. > It has the internal identification `bin/145100'. > The individual assigned to look at your > report is: freebsd-bugs. > > You can access the state of your problem report at any time > via this link: > > http://www.freebsd.org/cgi/query-pr.cgi?pr=3D145100 > >>Category: =A0 =A0 =A0 bin >>Responsible: =A0 =A0freebsd-bugs >>Synopsis: =A0 =A0 =A0 [patch] pkg_add(1) - remove hardcoded versioning da= ta from add/main.c >>Arrival-Date: =A0 Sun Mar 28 08:50:02 UTC 2010 Supported hierarchies are done like: /<machine>/packages-<release-lowercase> Corrected with this diff. Thanks, -Garrett --0016e68ee285ff239c0482d8d0ac Content-Type: text/plain; charset=US-ASCII; name="simplify-pkg-install-versioning.diff.txt" Content-Disposition: attachment; filename="simplify-pkg-install-versioning.diff.txt" Content-Transfer-Encoding: base64 X-Attachment-Id: f_g7bmugbi0 PT09PSAvL2RlcG90L3Byb2plY3RzL3NvYzIwMDcvZ2Nvb3Blci1wa2dfaW5zdGFsbC1lbmhhbmNl bWVudHMtc2ltcGxpZmllZC91c3Iuc2Jpbi9wa2dfaW5zdGFsbC9hZGQvbWFpbi5jIzMgLSAvc2Ny YXRjaC9mcmVlYnNkL3BlcmZvcmNlL3BrZ19pbnN0YWxsLWVuaGFuY2VtZW50cy91c3Iuc2Jpbi9w a2dfaW5zdGFsbC9hZGQvbWFpbi5jID09PT0KQEAgLTUyLDUxICs1Miw2IEBACiAKIGNoYXIJKnBy b2duYW1lCT0gTlVMTDsKIAotc3RydWN0IHsKLQlpbnQgbG93dmVyOwkvKiBMb3dlc3QgdmVyc2lv biBudW1iZXIgdG8gbWF0Y2ggKi8KLQlpbnQgaGl2ZXI7CS8qIEhpZ2hlc3QgdmVyc2lvbiBudW1i ZXIgdG8gbWF0Y2ggKi8KLQljb25zdCBjaGFyICpkaXJlY3Rvcnk7CS8qIERpcmVjdG9yeSBpdCBs aXZlcyBpbiAqLwotfSByZWxlYXNlc1tdID0gewotCXsgNDEwMDAwLCA0MTAwMDAsICIvcGFja2Fn ZXMtNC4xLXJlbGVhc2UiIH0sCi0JeyA0MjAwMDAsIDQyMDAwMCwgIi9wYWNrYWdlcy00LjItcmVs ZWFzZSIgfSwKLQl7IDQzMDAwMCwgNDMwMDAwLCAiL3BhY2thZ2VzLTQuMy1yZWxlYXNlIiB9LAot CXsgNDQwMDAwLCA0NDAwMDAsICIvcGFja2FnZXMtNC40LXJlbGVhc2UiIH0sCi0JeyA0NTAwMDAs IDQ1MDAwMCwgIi9wYWNrYWdlcy00LjUtcmVsZWFzZSIgfSwKLQl7IDQ2MDAwMCwgNDYwMDAxLCAi L3BhY2thZ2VzLTQuNi1yZWxlYXNlIiB9LAotCXsgNDYwMDAyLCA0NjAwOTksICIvcGFja2FnZXMt NC42LjItcmVsZWFzZSIgfSwKLQl7IDQ3MDAwMCwgNDcwMDk5LCAiL3BhY2thZ2VzLTQuNy1yZWxl YXNlIiB9LAotCXsgNDgwMDAwLCA0ODAwOTksICIvcGFja2FnZXMtNC44LXJlbGVhc2UiIH0sCi0J eyA0OTAwMDAsIDQ5MDA5OSwgIi9wYWNrYWdlcy00LjktcmVsZWFzZSIgfSwKLQl7IDQ5MTAwMCwg NDkxMDk5LCAiL3BhY2thZ2VzLTQuMTAtcmVsZWFzZSIgfSwKLQl7IDQ5MjAwMCwgNDkyMDk5LCAi L3BhY2thZ2VzLTQuMTEtcmVsZWFzZSIgfSwKLQl7IDUwMDAwMCwgNTAwMDk5LCAiL3BhY2thZ2Vz LTUuMC1yZWxlYXNlIiB9LAotCXsgNTAxMDAwLCA1MDEwOTksICIvcGFja2FnZXMtNS4xLXJlbGVh c2UiIH0sCi0JeyA1MDIwMDAsIDUwMjAwOSwgIi9wYWNrYWdlcy01LjItcmVsZWFzZSIgfSwKLQl7 IDUwMjAxMCwgNTAyMDk5LCAiL3BhY2thZ2VzLTUuMi4xLXJlbGVhc2UiIH0sCi0JeyA1MDMwMDAs IDUwMzA5OSwgIi9wYWNrYWdlcy01LjMtcmVsZWFzZSIgfSwKLQl7IDUwNDAwMCwgNTA0MDk5LCAi L3BhY2thZ2VzLTUuNC1yZWxlYXNlIiB9LAotCXsgNTA1MDAwLCA1MDUwOTksICIvcGFja2FnZXMt NS41LXJlbGVhc2UiIH0sCi0JeyA2MDAwMDAsIDYwMDA5OSwgIi9wYWNrYWdlcy02LjAtcmVsZWFz ZSIgfSwKLQl7IDYwMTAwMCwgNjAxMDk5LCAiL3BhY2thZ2VzLTYuMS1yZWxlYXNlIiB9LAotCXsg NjAyMDAwLCA2MDIwOTksICIvcGFja2FnZXMtNi4yLXJlbGVhc2UiIH0sCi0JeyA2MDMwMDAsIDYw MzA5OSwgIi9wYWNrYWdlcy02LjMtcmVsZWFzZSIgfSwKLQl7IDYwNDAwMCwgNjA0MDk5LCAiL3Bh Y2thZ2VzLTYuNC1yZWxlYXNlIiB9LAotCXsgNzAwMDAwLCA3MDAwOTksICIvcGFja2FnZXMtNy4w LXJlbGVhc2UiIH0sCi0JeyA3MDEwMDAsIDcwMTA5OSwgIi9wYWNrYWdlcy03LjEtcmVsZWFzZSIg fSwKLQl7IDcwMjAwMCwgNzAyMDk5LCAiL3BhY2thZ2VzLTcuMi1yZWxlYXNlIiB9LAotCXsgODAw MDAwLCA4MDA0OTksICIvcGFja2FnZXMtOC4wLXJlbGVhc2UiIH0sCi0JeyAzMDAwMDAsIDM5OTAw MCwgIi9wYWNrYWdlcy0zLXN0YWJsZSIgfSwKLQl7IDQwMDAwMCwgNDk5MDAwLCAiL3BhY2thZ2Vz LTQtc3RhYmxlIiB9LAotCXsgNTAyMTAwLCA1MDIxMjgsICIvcGFja2FnZXMtNS1jdXJyZW50IiB9 LAotCXsgNTAzMTAwLCA1OTkwMDAsICIvcGFja2FnZXMtNS1zdGFibGUiIH0sCi0JeyA2MDAxMDAs IDY5OTAwMCwgIi9wYWNrYWdlcy02LXN0YWJsZSIgfSwKLQl7IDcwMDEwMCwgNzk5MDAwLCAiL3Bh Y2thZ2VzLTctc3RhYmxlIiB9LAotCXsgODAwNTAwLCA4OTkwMDAsICIvcGFja2FnZXMtOC1zdGFi bGUiIH0sCi0JeyA5MDAwMDAsIDk5OTAwMCwgIi9wYWNrYWdlcy05LWN1cnJlbnQiIH0sCi0JeyAw LCA5OTk5OTk5LCAiL3BhY2thZ2VzLWN1cnJlbnQiIH0sCi0JeyAwLCAwLCBOVUxMIH0KLX07Ci0K IHN0YXRpYyBjaGFyICpnZXRwYWNrYWdlc2l0ZSh2b2lkKTsKIGludCBnZXRvc3JlbGRhdGUodm9p ZCk7CiAKQEAgLTMwMiw4ICsyNTcsOCBAQAogc3RhdGljIGNoYXIgKgogZ2V0cGFja2FnZXNpdGUo dm9pZCkKIHsKLSAgICBpbnQgcmVsZGF0ZSwgaTsKICAgICBzdGF0aWMgY2hhciBzaXRlcGF0aFtN QVhQQVRITEVOXTsKKyAgICBzaXplX3QgaTsKICAgICBzdHJ1Y3QgdXRzbmFtZSB1OwogCiAgICAg aWYgKGdldGVudigiUEFDS0FHRVNJVEUiKSkgewpAQCAtMzI3LDIwICsyODIsMjIgQEAKIAk+PSBz aXplb2Yoc2l0ZXBhdGgpKQogCXJldHVybiBOVUxMOwogCi0gICAgdW5hbWUoJnUpOwotICAgIGlm IChzdHJsY2F0KHNpdGVwYXRoLCB1Lm1hY2hpbmUsIHNpemVvZihzaXRlcGF0aCkpID49IHNpemVv ZihzaXRlcGF0aCkpCisgICAgaWYgKHVuYW1lKCZ1KSA9PSAtMSkgeworCXdhcm4oIiVzLiVzOiBj b3VsZCBub3QgZGV0ZXJtaW5lIHVuYW1lIGluZm9ybWF0aW9uIiwgcHJvZ25hbWUsCisJICAgIF9f ZnVuY19fKTsKKwlyZXR1cm4gTlVMTDsKKyAgICB9CisgICAgaWYgKHN0cmxjYXQoc2l0ZXBhdGgs IHUubWFjaGluZSwgc2l6ZW9mKHNpdGVwYXRoKSkgPj0gc2l6ZW9mKHNpdGVwYXRoKSB8fAorICAg ICAgICBzdHJsY2F0KHNpdGVwYXRoLCAiL3BhY2thZ2VzLSIsIHNpemVvZihzaXRlcGF0aCkpID49 IHNpemVvZihzaXRlcGF0aCkpCiAJcmV0dXJuIE5VTEw7CiAKLSAgICByZWxkYXRlID0gZ2V0b3Ny ZWxkYXRlKCk7Ci0gICAgZm9yKGkgPSAwOyByZWxlYXNlc1tpXS5kaXJlY3RvcnkgIT0gTlVMTDsg aSsrKSB7Ci0JaWYgKHJlbGRhdGUgPj0gcmVsZWFzZXNbaV0ubG93dmVyICYmIHJlbGRhdGUgPD0g cmVsZWFzZXNbaV0uaGl2ZXIpIHsKLQkgICAgaWYgKHN0cmxjYXQoc2l0ZXBhdGgsIHJlbGVhc2Vz W2ldLmRpcmVjdG9yeSwgc2l6ZW9mKHNpdGVwYXRoKSkKLQkJPj0gc2l6ZW9mKHNpdGVwYXRoKSkK LQkJcmV0dXJuIE5VTEw7Ci0JICAgIGJyZWFrOwotCX0KKyAgICBmb3IgKGkgPSAwOyB1LnJlbGVh c2VbaV0gIT0gJ1wwJzsgaSsrKSB7CisgICAgICAgIHUucmVsZWFzZVtpXSA9IHRvbG93ZXIodS5y ZWxlYXNlW2ldKTsKICAgICB9CiAKKyAgICBpZiAoc3RybGNhdChzaXRlcGF0aCwgdS5yZWxlYXNl LCBzaXplb2Yoc2l0ZXBhdGgpKSA+PSBzaXplb2Yoc2l0ZXBhdGgpKQorCXJldHVybiBOVUxMOwor CiAgICAgaWYgKHN0cmxjYXQoc2l0ZXBhdGgsICIvTGF0ZXN0LyIsIHNpemVvZihzaXRlcGF0aCkp ID49IHNpemVvZihzaXRlcGF0aCkpCiAJcmV0dXJuIE5VTEw7CiAK --0016e68ee285ff239c0482d8d0ac--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?364299f41003280213x6f67ef45peb891f73fb4d140f>