- Pacman-dev - lists.archlinux.org

[pacman-dev] 回复: [PATCH] Give the frontend control over responses for print
by Ssfdust 16 Apr '13

16 Apr '13

已从三星手机发送 -------- 原始消息 -------- 主题：[pacman-dev] [PATCH] Give the frontend control over responses for print 发件人：Connor Behan <connor.behan(a)gmail.com> 收件人：pacman-dev(a)archlinux.org 抄送： There are currently 8 questions that libalpm may ask the user. Each of them has a "pacman default" and a "libalpm default". The pacman default is the response that gets used if the user presses enter without typing anything. Equivalently it is the response when --noconfirm is passed. The libalpm default is what happens when --print is passed and the question callback never even executes. This commit forces pacman to specify responses for --print and therefore never rely on the libalpm default. The following states how each question is handled: ALPM_QUESTION_INSTALL_IGNOREPKG: The pacman default is 1 and the libalpm default is 0. The latter was agreed to be a bug so we return 1 on print. ALPM_QUESTION_REPLACE_PKG: The pacman default is 1 and the libalpm default is 0. We return 0 on print. ALPM_QUESTION_CONFLICT_PKG: The pacman default is 0 and the libalpm default is 0. We return 0 on print even though print should not encounter this. ALPM_QUESTION_REMOVE_PKGS: The pacman default is 0 and the libalpm default is 0. We return 0 on print. ALPM_QUESTION_SELECT_PROVIDER: The pacman default is 0 and the libalpm default is 0. We return 0 on print. ALPM_QUESTION_LOCAL_NEWER: The pacman default is 1 and this is dead code so there is no libalpm default. We return 1 on print. ALPM_QUESTION_CORRUPTED_PKG: The pacman default is 1 and the libalpm default is 0. We return 0 on print even though print should not encounter this. ALPM_QUESTION_IMPORT_KEY: The pacman default is 1 and the libalpm default is 0. We return 0 on print even though print should not encounter this. Signed-off-by: Connor Behan <connor.behan(a)gmail.com> --- src/pacman/callback.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 71d9d04..711d116 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -309,6 +309,14 @@ void cb_question(alpm_question_t event, void *data1, void *data2, void *data3, int *response) { if(config->print) { + switch(event) { + case ALPM_QUESTION_INSTALL_IGNOREPKG: + case ALPM_QUESTION_LOCAL_NEWER: + *response = 1; + break; + default: + *response = 0; + } return; } switch(event) { -- 1.8.1.5

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.1.0-13-g597286e
by allan＠archlinux.org 16 Apr '13

16 Apr '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via 597286eb258f841dfc00f65474138fc6192f0092 (commit) via 695f0e443e18ca5d7b722bdf2c4695cc63c1af54 (commit) via 7e0f528274478e7d3057d71717596fdaa5e5bb79 (commit) via 2bf2700b744392ab3fb4e5295e3a2619b1ddfe28 (commit) via b7c994db8b049b87df5ec5d6cada84a36c60c47d (commit) via 3de8f8f1ccf103ae9737299b52407b4ebe51d75a (commit) via 32c91e28952f3b746da7513849a8f3c996aab807 (commit) via 95c68d26ef1fe9ccf7eafc1be4205964255c7f3f (commit) via 0f486adfec6d44f7578e526379078231aa300601 (commit) via f9280a0523d0c49039a0ad27718701c20d874ec3 (commit) via 0f05bfc340891ed6649168c888bb7c598d7f0d58 (commit) via 7b10519835eadec97487728516b1a712c4b896eb (commit) via b5a7734a7ecdd35f64f33eeed5252423ca005fd2 (commit) from 5caf143faaa64bd76c10c8e35dd0adbfd8619615 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 597286eb258f841dfc00f65474138fc6192f0092 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Apr 11 09:18:47 2013 -0400 paccache: avoid subshell in calling runcmd Avoids problems with one of the worst CLI tools ever created, su. Fixes FS#34656. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 695f0e443e18ca5d7b722bdf2c4695cc63c1af54 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Apr 11 15:46:51 2013 +1000 makepkg: fix svn repo extraction Copy SVN repos rather than using "svn export" to keep all anotation files in the repo for build scripts that use (e.g.) "svin info". Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7e0f528274478e7d3057d71717596fdaa5e5bb79 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Apr 11 11:56:06 2013 +1000 Do not use checkout directory for SVN config Using the checkout directory for the SVN config can result in clashes between config files and files from the SVN checkout. Instead, use a ".makepkg" directory within the checkout. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2bf2700b744392ab3fb4e5295e3a2619b1ddfe28 Author: Maxime Gauduin <alucryd(a)gmail.com> Date: Wed Apr 10 18:54:02 2013 +0200 Add support for all bzr URLs in the PKGBUILD source array Add support for all bzr URLs, including "lp:" URLs, in the source array. This, however, requires an internet connection and will fall back to the current behavior for offline builds. In that case, only the URL reported by 'bzr config parent_location' run inside the local repo can be used, and is outputted. Signed-off-by: Maxime Gauduin <alucryd(a)gmail.com> commit b7c994db8b049b87df5ec5d6cada84a36c60c47d Author: William Giokas <1007380(a)gmail.com> Date: Fri Mar 15 12:11:11 2013 -0500 makepkg: don't run remove_deps twice when unneeded remove_deps already has a check and won't run unless -r is specified, so if this was meant to remove dependencies of a failure no matter what, then it's not doing it, and with -r it is run twice on a failure for no real reason. Signed-off-by: William Giokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3de8f8f1ccf103ae9737299b52407b4ebe51d75a Author: Allan McRae <allan(a)archlinux.org> Date: Tue Apr 9 11:59:43 2013 +1000 Rework callback message to add translation Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 32c91e28952f3b746da7513849a8f3c996aab807 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Apr 8 22:00:04 2013 +1000 contrib/checkupdates: do not log Avoid the log file filling up with "[PACMAN] synchronizing package lists". Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 95c68d26ef1fe9ccf7eafc1be4205964255c7f3f Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Apr 2 19:53:45 2013 -0400 pacman: add -Qkk to usage() help Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0f486adfec6d44f7578e526379078231aa300601 Author: William Giokas <1007380(a)gmail.com> Date: Mon Apr 1 10:19:35 2013 +0000 contrib: Use sysconfdir instead of /etc Don't force people to see /etc. Signed-off-by: William Giokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f9280a0523d0c49039a0ad27718701c20d874ec3 Author: Daniel Wallace <danielwallace(a)gtmanfred.com> Date: Fri Apr 5 19:31:57 2013 -0400 zsh completion: make sure -Ss works if you put a type in pacman -Ss <regex> it doesn't work because it never passes through they pointer ->sync_search to set $state. All of the other iterations like this have a case, add one for -S*s* Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0f05bfc340891ed6649168c888bb7c598d7f0d58 Author: Simon Gomizelj <simongmzlj(a)gmail.com> Date: Mon Apr 1 19:46:29 2013 -0400 ctypes.h shouldn't be included twice Earnestly spotted this on #archlinux. Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7b10519835eadec97487728516b1a712c4b896eb Author: William Giokas <1007380(a)gmail.com> Date: Mon Apr 1 01:46:48 2013 -0500 doc: fix debug spelling mistake with -> when Signed-off-by: William Giokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b5a7734a7ecdd35f64f33eeed5252423ca005fd2 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Apr 5 10:12:04 2013 -0400 use off_t for table_row_t.size size went from off_t in _display_targets to int in add_transaction_sizes and back to off_t in humanize_size leading to potential overflows. Fixes FS#34616. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/checkupdates.sh.in | 2 +- contrib/paccache.sh.in | 4 ++-- contrib/zsh_completion.in | 14 ++++++++++---- doc/makepkg.conf.5.txt | 2 +- scripts/makepkg.sh.in | 42 ++++++++++++++++++++++++++++++++---------- src/pacman/callback.c | 10 +++++----- src/pacman/pacman.c | 3 +-- src/pacman/util.c | 4 ++-- 8 files changed, 54 insertions(+), 27 deletions(-) hooks/post-receive -- The official pacman repository

1 0

Re: [pacman-dev] pacman-4.2 plans?
by Mohammad_Alsaleh 15 Apr '13

15 Apr '13

On Tue, Apr 16, 2013 at 02:31:08AM +0300, Mohammad_Alsaleh wrote: > On Sun, Apr 14, 2013 at 09:58:24AM +1000, Allan McRae wrote: > > On 14/04/13 09:52, Anatol Pomozov wrote: > > > > > >> > What happens if the network connection is dropped while > > >> > packages are still downloading after package installation has started? > > > In this case only those packages that are already downloaded will be > > > installed. And because installation respects dependency order then > > > partial installation will not brick the system, no? > > > > > > > Sure it can... e.g. an soname bump in ncurses. ncurses gets updated > > but nothing else, bash is dead. > > > > Allan > > > > > > On that note. > > Directing more effort to get already existing features more wildly used > might be more useful than implementing new features/optimizations IMHO. > (namely, sodepends and debug packages). But that's an Arch discussion > not a Pacman one! > > Having said that, local queries are the only operations that feel slow > to me. So, finally making a decision about how to (fix) this would be > great. s/wildly/widely

1 0

[pacman-dev] debug package repositories
by William Giokas 15 Apr '13

15 Apr '13

All, With the inclusion of the debug option in pacman 4.1.0, I think it makes sense to do something with this in the official repositories. I've sifted through some bug reports asking for inclusion of the debug symbols in a separate package or repository officially for testing purposes. With [extra] and [community] approaching 1.5 and 2 megabytes respectively, I think that adding debug symbols directly into these repositories would be a bad idea as it would probably add ~50% to those databases, and I've already seen some people complain about the sizes. What I would propose (and I've implemented this locally fine) is to have a separate series of repositories named [$repo-debug] that only contain the -debug packages, allowing those that don't bother with testing or debugging to simply not include them in their pacman.conf, but if there is something that they want to run valgrind or whatever on, they can simply enable the right [*-debug] repo for that package, and once they are done debugging simply remove that repo from their list along with the package. For really large packages, this will save people a while lot of time recompiling dependencies for these symbols. I talked to ioni on the channel, and he said that your repo scripts do not have support for this. If it's too much of a hassle, putting them in the same repo wouldn't be that terrible, honestly. Thank you, -- William Giokas | KaiSforza GnuPG Key: 0x73CD09CF Fingerprint: F73F 50EF BBE2 9846 8306 E6B8 6902 06D8 73CD 09CF

2 1

[pacman-dev] [PATCH][RFC] Unit tests!
by Andrew Gregory 15 Apr '13

15 Apr '13

Exposing and catching bugs deep in the internals of alpm or pacman can be rather difficult with our current test suite, so I'd like to add a unit test suite. Here's the setup I've come up with so far: * Tests use the check framework [1] (it's in the repos) * Tests should include the source file (not the header) for whatever is being tested. This is necessary because it seems like most of the low hanging fruit (ie functions that don't interact with the user or filesystem) are static. * Test files must define a function "build_suite" that assembles their tests into a suite. * Test files are built as dynamic libraries which are automatically discovered and loaded by the test runner. Check organizes individual tests into suites and then cases and allows individual suites/cases to be selected with an environment variable. Right now my example setup has exactly one case per suite because that's easier, I'm thinking it would be better though to have one case per test so that individual functions can be tested separately. For instance, `CK_RUN_SUITE=util.c ./runner` would test everything in util.c, and `CK_RUN_CASE=util.c/_alpm_strip_newline ./runner` would test only that one function. I've included a test runner and a couple stub tests with a minimal Makefile as an example. With check installed, running `make check` in test/alpm/unit gives: $ make check ./runner Running suite(s): alpm alpm_list util.c 75%: Checks: 4, Failures: 1, Errors: 0 util_test.c:22:F:Core:check_alpm_strip_newline:0: Assertion 'output==expected' failed: output=="test", expected=="this will fail" make: *** [check] Error 1 [1] http://check.sourceforge.net/doc/check_html/index.html Andrew Gregory (1): add unit tests test/alpm/unit/Makefile | 16 +++++++++ test/alpm/unit/alpm_list_test.c | 76 +++++++++++++++++++++++++++++++++++++++++ test/alpm/unit/runner.c | 47 +++++++++++++++++++++++++ test/alpm/unit/util_test.c | 34 ++++++++++++++++++ 4 files changed, 173 insertions(+) create mode 100644 test/alpm/unit/Makefile create mode 100644 test/alpm/unit/alpm_list_test.c create mode 100644 test/alpm/unit/runner.c create mode 100644 test/alpm/unit/util_test.c -- 1.8.2.1

2 2

[pacman-dev] [PATCH] pmpkg: set default mode for files in sync packages
by Andrew Gregory 14 Apr '13

14 Apr '13

TarInfo objects default to mode 0644 while mkfile in util.py uses 0755, causing pacman warnings about differing permissions on tests involving package updates. Set the mode on TarInfo objects to 0755 unless the test specifies a different mode. Bug referenced in FS#30723. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- test/pacman/pmpkg.py | 2 ++ test/pacman/tests/mode001.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/test/pacman/pmpkg.py b/test/pacman/pmpkg.py index 988c73f..250d45b 100644 --- a/test/pacman/pmpkg.py +++ b/test/pacman/pmpkg.py @@ -160,6 +160,8 @@ def makepkg(self, path): info = tarfile.TarInfo(fileinfo["filename"]) if fileinfo["hasperms"]: info.mode = fileinfo["perms"] + else: + info.mode = 0755 if fileinfo["isdir"]: info.type = tarfile.DIRTYPE tar.addfile(info) diff --git a/test/pacman/tests/mode001.py b/test/pacman/tests/mode001.py index 4ec11e1..db886e7 100644 --- a/test/pacman/tests/mode001.py +++ b/test/pacman/tests/mode001.py @@ -9,4 +9,4 @@ self.addrule("PACMAN_RETCODE=0") for f in p.files: - self.addrule("FILE_MODE=%s|644" % f) + self.addrule("FILE_MODE=%s|755" % f) -- 1.8.2

2 3

[pacman-dev] code reuse for PKGBUILD
by Kent Fredric 12 Apr '13

12 Apr '13

So, I'm sort of new to Arch, but I've already found some things in how a few things work I have rather sizable miss-givings about, and see room for improvement. *~~~ BEGIN CONFUSING RANT HERE ~~~* *( or skip past it to the TL;DR )* The primary one at present is "No code re-use in PKGBUILD. Period" And this strikes me as a bad idea. I understand that having a PKGBUILD become not fully independent might be undesirable to some, but I'm hoping there is a pivotal middle-ground that can be useful. 1. Many PKGBUILD files are seriously outdated 2. Each and every Perl Module PKGBUILD requires the author to know *everything* about packaging Perl modules, and this is a somewhat hard thing to know: - version normalisation # I haven't seen anyone do it yet, and its the only sure-fire mechanism to get versions to play nicely together. - lots of boilerplate , cargo-cult copypasted around, see : https://aur.archlinux.org/packages/pe/perl-json-any/PKGBUILD Consider this for a moment: Gentoo, like Arch have been nuking '.packlist' files for some time, until recently it became apparent that some programs actually need those files to do their job. https://bugs.gentoo.org/show_bug.cgi?id=438660 This is "bad practice", and because the behaviour is not codified in some shared library that all perl module packages use, in order to "Fix" this problem on arch, it requires a considerable number of person-hours to vet the hundreds of perl PKGBUILDS to eliminate this behaviour. https://aur.archlinux.org/packages/pe/perl-devel-nytprof/PKGBUILD Another bad example of people reinventing all their own wheels, and doing all make/make test/make install during build. This behaviour should really be codified in a shared module. That way, when people realise the way the shared module has been doing things is for whatever reason, wrong, its simply a matter of fixing that, and every build past and present benefits from the change, with no additional effort on the PKGBUILD maintainers. What I hope to do is find some sort of consensus on how it would be best to add a little bit of code-reuse to pkgbuild, as this will, I feel, greatly improve maintenance of these files. Because *both* of those 2 PKGBUILD files I posted could have been easily refactored, and had *100%* of their independent code eliminated in favour of shared behaviour. extensions=('perl-module') _perl_distname=json-any _perl_ver='1.29' _perl_author=PERIGRIN pkgver='1.290.0' pkgrel='1' pkgdesc="Wrapper Class for the various JSON classes." arch=('any') options=('!emptydirs') depends=('perl-json>=2.02' 'perl-json-xs>=2.3' 'perl-yaml-syck') makedepends=() md5sums=('f7eea523d532668555456e4153334342') Notes: _perl_ver and pkgver are different due to my recommendation that upstream versions undergo a normalisation process prior to being used for arch versions. This is important, as perl versioning semantics are wildly different from the rest of the worlds. The average packager will not even realise how big a deal this is, but simple to say, perl versions are a nightmare: http://www.dagolden.com/index.php/369/version-numbers-should-be-boring/ On Gentoo, we've developed a tool to make it easier to convert perl versions to versions we can use in packages, and it basically "Just works". https://metacpan.org/module/Gentoo::PerlMod::Version license= is omitted, as this way, it can default to the most common license on CPAN, "The Perl5 License" -> license=('PerlArtistic' 'GPL') and can be overridden as needed. url= is omitted, as this can easily be generated from the _perl_distname value, and overridden only when necessary. This means you can either have the underlying module refer to pages on search.cpan.org, or metacpan.org source=() is also omitted, as the primary src URI can also be divined from combining _perl_distname , _perl_author and _perl_ver and you can usually leave out build(), check() and package(), as these phases are all very well known and have to meet a standard behaviour to operate with 'cpan' clients, so its quite straightforward to have a set of default behaviours. Implementation wise, my biggest question is "Where is 'perl-module' stored". The simplest option is a pacman distribution, such as 'pacman-extensions', that installs files in /usr/lib/pacman/extension/ , and makepkg/pacman can be made aware of this feature and load the modules on demand. For those who don't like the inherent issue where "PKGBUILD depends on code outside tar.gz", it could be engineered so that `makepkg -S` copies files from /usr/lib/pacman/extension/ into the built tree at /extensions/ , and then have some sort of mechanic that chooses between using the "system" version of the extension or the "bundled" version of the extension. With built packages, the behaviours from the extension would probably have to be cooked in to the dist ( somehow ), but thats an accepted caveat of how binary distribution usually works. *========= TL;DR TL;DR TL;DR TL;DR TL;DR =========* 1. I'm a noob to Arch 2. ... But I have substantial experience packaging perl modules for gentoo ( https://github.com/gentoo-perl/perl-experimental/graphs/contributors , https://www.ohloh.net/p/gentoo-perl- overlay/contributors/summary ) 3. And I strongly feel that in regard to packaging things, the PKGBUILD spec at present seems a little immature 4. And I strongly feel, that PKGBUILD could gain a great deal of improvement utility by having /some/ shared code mechanism 5. ... But I'm not quite sure what the best way to do this is 6. And I'm strongly against any ideas that involve developing a *Second* platform that simply emits files in the PKGBUILD format, or implementing competing products to `makepkg` 7. And I'd rather *not* have hard-inlining behaviour , I'm fine with the external behaviour being shipped independently, but if thats not universal, then I'd like to find a middleground In advance, thanks for your consideration =). -- Kent perl -e "print substr( \"edrgmaM SPA NOcomil.ic\\@tfrken\", \$_ * 3, 3 ) for ( 9,8,0,7,1,6,5,4,3,2 );" http://kent-fredric.fox.geek.nz

6 18

[pacman-dev] [PATCH] Do not use checkout directory for SVN config
by Allan McRae 11 Apr '13

11 Apr '13

Using the checkout directory for the SVN config can result in clashes between config files and files from the SVN checkout. Instead, use a ".makepkg" directory within the checkout. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Is the ".makepkg" name unique enough? We need to use the --config-dir flag to avoid affects of the users SVN config. Also, the config directory needs to be inside the source directory to avoid issues with multiple SVN checkouts in the same directory. scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 67ee22a..2bafb24 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -705,7 +705,7 @@ download_svn() { if [[ ! -d "$dir" ]] || dir_is_empty "$dir" ; then msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "svn" - if ! svn checkout --config-dir "$dir" "$url" "$dir"; then + if ! svn checkout --config-dir "$dir/.makepkg" "$url" "$dir"; then error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "svn" plain "$(gettext "Aborting...")" exit 1 -- 1.8.2.1

1 1

[pacman-dev] [PATCH] paccache: avoid subshell in calling runcmd
by Dave Reisner 11 Apr '13

11 Apr '13

Avoids problems with one of the worst CLI tools ever created, su. Fixes FS#34656. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- contrib/paccache.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/paccache.sh.in b/contrib/paccache.sh.in index c331273..64c3c53 100644 --- a/contrib/paccache.sh.in +++ b/contrib/paccache.sh.in @@ -308,9 +308,9 @@ totalsaved=$(@SIZECMD@ "${candidates[@]}" | awk '{ sum += $1 } END { print sum } # crush. kill. destroy. (( verbose )) && cmdopts+=(-v) if (( delete )); then - printf '%s\0' "${candidates[@]}" | runcmd xargs -0 rm "${cmdopts[@]}" + runcmd xargs -0a <(printf '%s\0' "${candidates[@]}") rm "${cmdopts[@]}" elif (( move )); then - printf '%s\0' "${candidates[@]}" | runcmd xargs -0 mv "${cmdopts[@]}" -t "$movedir" + runcmd xargs -0a <(printf '%s\0' "${candidates[@]}") mv "${cmdopts[@]}" -t "$movedir" fi summarize "$pkgcount" "${candidates[@]}" -- 1.8.2.1

2 1

[pacman-dev] [PATCH 2/2] Accept all bzr URLs in the source array
by Maxime Gauduin 11 Apr '13

11 Apr '13

From: Alucryd <alucryd(a)gmail.com> This check will run 'bzr info' on the distant URL provided in the source array and compare the branch root URL with the output of 'bzr config parent_location' run inside the local repo to make sure we are building from the right sources. Previously, the check was only run locally, as a result the local parent_location had to be used in the source array. makepkg will fallback to this behavior for offline builds. Signed-off-by: Maxime Gauduin <alucryd(a)gmail.com> --- scripts/makepkg.sh.in | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d5b9077..0ac4975 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -474,10 +474,21 @@ download_bzr() { fi elif (( ! HOLDVER )); then # Make sure we are fetching the right repo - if [[ "$url" != "$(bzr config parent_location -d $dir)" ]] ; then - error "$(gettext "%s is not a branch of %s")" "$dir" "$url" - plain "$(gettext "Aborting...")" - exit 1 + local distant_url="$(bzr info "$url" 2> /dev/null | grep 'branch root' | sed 's| branch root: ||')" + local local_url="$(bzr config parent_location -d "$dir")" + if [[ -n "$distant_url" ]]; then + if [[ "$distant_url" != "$local_url" ]]; then + error "$(gettext "%s is not a branch of %s")" "$dir" "$url" + plain "$(gettext "Aborting...")" + exit 1 + fi + else + if [[ "$url" != "$local_url" ]] ; then + error "$(gettext "%s is not a branch of %s")" "$dir" "$url" + error "$(gettext "The local URL is %s")" "$local_url" + plain "$(gettext "Aborting...")" + exit 1 + fi fi msg2 "$(gettext "Pulling %s ...")" "${displaylocation}" cd_safe "$dir" -- 1.8.2

5 9