- Pacman-dev - lists.archlinux.org

[pacman-dev] libalpm fails on a filesystem with a large blocksize
by Astro Xe 13 Jun '15

13 Jun '15

Hello, ''pacman --debug --root dir -S util-linux'' fails on a 2 GB NFS (1,9 GB free): "Partition /root/dir too full: 12385 blocks needed, 3802 blocks free" statvfs() reports f_bsize = 524288, f_bfree = 3855, so the "blocks free" estimate is correct, taking the cushion into account. A little debugging shows that the "blocks needed" overestimate comes from calculate_installed_size @ lib/libalpm/diskspace.c which, basically, rounds every file's size up to a multiple of the block size. In my case, having a huge block size, it is indeed summing 1 block per file. Is it possible to work around this problem, and how? Thanks

3 3

[pacman-dev] [PATCH 1/2] repo-add: Generate unarmored DB signature
by Johannes Löthberg 13 Jun '15

13 Jun '15

Pacman cannot handle armored signatures, so use gpg's --no-armor flag to force an unarmored signature. --- scripts/repo-add.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 3ece8d5..7e242ce 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -264,7 +264,7 @@ create_signature() { if [[ -n $GPGKEY ]]; then SIGNWITHKEY="-u ${GPGKEY}" fi - gpg --detach-sign --use-agent ${SIGNWITHKEY} "$dbfile" &>/dev/null || ret=$? + gpg --detach-sign --use-agent --no-armor ${SIGNWITHKEY} "$dbfile" &>/dev/null || ret=$? if (( ! ret )); then msg2 "$(gettext "Created signature file '%s'")" "${dbfile##*/.tmp.}.sig" -- 2.4.1

2 6

[pacman-dev] [PATCH 1/2] makepkg-template: ignore duplicates per option
by Dominik Fischer 09 Jun '15

09 Jun '15

When templates recursively include other templates, a diamond problem, similar to multiple inheritance, may occur. It is illustrated in the test case. As templates may consist of arbitrary code, it may be unwanted to execute a template twice. This patch provides a solution to some simple cases of this problem by completely ignoring every template occurrence but the first for each template name. Signed-off-by: Dominik Fischer <d.f.fischer(a)web.de> --- doc/makepkg-template.1.txt | 6 ++++++ scripts/makepkg-template.pl.in | 12 ++++++++++++ .../makepkg-template-tests/diamond-input/PKGBUILD | 5 +++++ .../diamond-input/PKGBUILD.expanded | 13 +++++++++++++ .../diamond-input/templates/base-1.template | 1 + .../diamond-input/templates/first-include-1.template | 1 + .../diamond-input/templates/second-include-1.template | 1 + .../diamond-input/testcase-config | 18 ++++++++++++++++++ 8 files changed, 57 insertions(+) create mode 100644 test/scripts/makepkg-template-tests/diamond-input/PKGBUILD create mode 100644 test/scripts/makepkg-template-tests/diamond-input/PKGBUILD.expanded create mode 100644 test/scripts/makepkg-template-tests/diamond-input/templates/base-1.template create mode 100644 test/scripts/makepkg-template-tests/diamond-input/templates/first-include-1.template create mode 100644 test/scripts/makepkg-template-tests/diamond-input/templates/second-include-1.template create mode 100644 test/scripts/makepkg-template-tests/diamond-input/testcase-config diff --git a/doc/makepkg-template.1.txt b/doc/makepkg-template.1.txt index 03b2a38..bd2355c 100644 --- a/doc/makepkg-template.1.txt +++ b/doc/makepkg-template.1.txt @@ -76,6 +76,12 @@ Options given multiple times in which case files found in directory given last will take precedence. +*-t, \--no-duplicates*:: + Do not include any template twice, even when templates recursively include + other templates. Only the first occurrence of each template will be + expanded, all further references to the same name, also with different + version numbers, will be ignored. + Example PKGBUILD ---------------- diff --git a/scripts/makepkg-template.pl.in b/scripts/makepkg-template.pl.in index 9877796..e9f6e08 100755 --- a/scripts/makepkg-template.pl.in +++ b/scripts/makepkg-template.pl.in @@ -33,6 +33,8 @@ my %opts = ( my $template_name_charset = qr/[[:alnum:]+_.@-]/; my $template_marker = qr/# template/; +my %seen = (); + # runtime loading to avoid dependency on cpan since this is the only non-core module my $loaded_gettext = can_load(modules => {'Locale::gettext' => undef}); if ($loaded_gettext) { @@ -96,6 +98,15 @@ sub parse_template_line { sub load_template { my ($values) = @_; + if ($opts{dups}) { + # omit already included templates. + if (exists $seen{$values->{name}}) { + return ""; + } else { + $seen{$values->{name}} = (); + } + } + my $ret = ""; my $template_name = "$values->{name}"; @@ -205,6 +216,7 @@ GetOptions( "output|o=s" => \$opts{output}, "newest|n" => \$opts{newest}, "template-dir=s@" => \$opts{template_dir}, + "no-duplicates|t" => \$opts{dups}, ) or usage(1); $opts{output} = $opts{input} unless $opts{output}; diff --git a/test/scripts/makepkg-template-tests/diamond-input/PKGBUILD b/test/scripts/makepkg-template-tests/diamond-input/PKGBUILD new file mode 100644 index 0000000..6bb4fa5 --- /dev/null +++ b/test/scripts/makepkg-template-tests/diamond-input/PKGBUILD @@ -0,0 +1,5 @@ +pkgname=foo +pkgver=1 + +# template input; name=first-include; version=1; +# template input; name=second-include; version=1; diff --git a/test/scripts/makepkg-template-tests/diamond-input/PKGBUILD.expanded b/test/scripts/makepkg-template-tests/diamond-input/PKGBUILD.expanded new file mode 100644 index 0000000..8077581 --- /dev/null +++ b/test/scripts/makepkg-template-tests/diamond-input/PKGBUILD.expanded @@ -0,0 +1,13 @@ +pkgname=foo +pkgver=1 + +# template start; name=first-include; version=1; +# template start; name=base; version=1; +package() {} +# template end; +# template end; +# template start; name=second-include; version=1; +# template start; name=base; version=1; +package() {} +# template end; +# template end; diff --git a/test/scripts/makepkg-template-tests/diamond-input/templates/base-1.template b/test/scripts/makepkg-template-tests/diamond-input/templates/base-1.template new file mode 100644 index 0000000..056096f --- /dev/null +++ b/test/scripts/makepkg-template-tests/diamond-input/templates/base-1.template @@ -0,0 +1 @@ +package() {} diff --git a/test/scripts/makepkg-template-tests/diamond-input/templates/first-include-1.template b/test/scripts/makepkg-template-tests/diamond-input/templates/first-include-1.template new file mode 100644 index 0000000..9916370 --- /dev/null +++ b/test/scripts/makepkg-template-tests/diamond-input/templates/first-include-1.template @@ -0,0 +1 @@ +# template input; name=base; version=1; diff --git a/test/scripts/makepkg-template-tests/diamond-input/templates/second-include-1.template b/test/scripts/makepkg-template-tests/diamond-input/templates/second-include-1.template new file mode 100644 index 0000000..9916370 --- /dev/null +++ b/test/scripts/makepkg-template-tests/diamond-input/templates/second-include-1.template @@ -0,0 +1 @@ +# template input; name=base; version=1; diff --git a/test/scripts/makepkg-template-tests/diamond-input/testcase-config b/test/scripts/makepkg-template-tests/diamond-input/testcase-config new file mode 100644 index 0000000..65bb8d0 --- /dev/null +++ b/test/scripts/makepkg-template-tests/diamond-input/testcase-config @@ -0,0 +1,18 @@ +arguments+=(-t) +expected_exitcode=0 + +IFS="" read -d '' expected_output <<'EOF' +EOF + +IFS="" read -d '' expected_result <<'EOF' +pkgname=foo +pkgver=1 + +# template start; name=first-include; version=1; +# template start; name=base; version=1; +package() {} +# template end; +# template end; +# template start; name=second-include; version=1; +# template end; +EOF -- 2.4.2

3 4

[pacman-dev] [PATCH] util.c: table_display: Fix incorrect docstring
by Johannes Löthberg 09 Jun '15

09 Jun '15

Commit 7b8f8753 removed the title parameter but forgot to remove it from the docstring. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- src/pacman/util.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 5d68360..7c6a8c0 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -612,7 +612,6 @@ static size_t table_calc_widths(const alpm_list_t *header, /** Displays the list in table format * - * @param title the tables title * @param header the column headers. column count is determined by the nr * of headers * @param rows the rows to display as a list of lists of strings. the outer -- 2.4.2

1 0

[pacman-dev] [PATCH] makepkg-template.1: Clarify which file version-less markers use
by Wieland Hoffmann 08 Jun '15

08 Jun '15

The old text could be interpreted such that makepkg-template compares the version numbers of the templates to find the most recent one. Rephrase this to make it explicit that "$template_name.template" is used. --- doc/makepkg-template.1.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/makepkg-template.1.txt b/doc/makepkg-template.1.txt index 03b2a38..99637d4 100644 --- a/doc/makepkg-template.1.txt +++ b/doc/makepkg-template.1.txt @@ -47,8 +47,8 @@ and end markers and the template code on the first run. Template files should be stored in one directory and filenames should be "$template_name-$version.template" with a symlink "$template_name.template" pointing to the most recent template. If the version is not set in the marker, -'makepkg-template' will automatically use the most recent version of the -template, otherwise the specified version will be used. This allows for easier +'makepkg-template' will automatically use the target of "$template_name.template", +otherwise the specified version will be used. This allows for easier verification of untrusted PKGBUILDs if the template is trusted. You verify the non-template code and then use a command similar to this: -- 2.4.2

2 1

[pacman-dev] [PATCH v2] makepkg: Add flag for printing SRCINFO to stdout
by Johannes Löthberg 25 May '15

25 May '15

This commit adds a makepkg option to generate and print the SRCINFO file for a PKGBUILD, required by the new AUR, to stdout. AUR 4.0 will use Git instead of source tarballs for uploading packages, so making makepkg capable of printing the SRCINFO would simplify package management, instead of having to extract it from a source tarball. It is also useful for scripting other things, so that instead of having to parse PKGBUILDs, one can make makepkg generate the SRCINFO and then you can parse that instead, which is much simpler and less error-prone. --- Now with documentation and justification! doc/makepkg.8.txt | 3 +++ scripts/makepkg.sh.in | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 41df30e..4323fd3 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -207,6 +207,9 @@ Options List the packages that would be produced without building. Listed package names do not include PKGEXT. +*\--printsrcinfo*:: + Generate and print the SRCINFO file to stdout. + Additional Features ------------------- makepkg supports building development versions of packages without having to diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c74e84a..2613b31 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1723,6 +1723,7 @@ usage() { printf -- "$(gettext " --nosign Do not create a signature for the package")\n" printf -- "$(gettext " --packagelist Only list packages that would be produced, without PKGEXT")\n" printf -- "$(gettext " --pkg <list> Only build listed packages from a split package")\n" + printf -- "$(gettext " --printsrcinfo Print the generated SRCINFO and exit")\n" printf -- "$(gettext " --sign Sign the resulting package with %s")\n" "gpg" printf -- "$(gettext " --skipchecksums Do not verify checksums of the source files")\n" printf -- "$(gettext " --skipinteg Do not perform any verification checks on source files")\n" @@ -1768,7 +1769,7 @@ OPT_SHORT="AcCdefFghiLmop:rRsSV" OPT_LONG=('allsource' 'check' 'clean' 'cleanbuild' 'config:' 'force' 'geninteg' 'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'noarchive' 'nobuild' 'nocolor' 'nocheck' 'nodeps' 'noextract' 'noprepare' 'nosign' 'packagelist' - 'pkg:' 'repackage' 'rmdeps' 'sign' 'skipchecksums' 'skipinteg' + 'pkg:' 'printsrcinfo' 'repackage' 'rmdeps' 'sign' 'skipchecksums' 'skipinteg' 'skippgpcheck' 'source' 'syncdeps' 'verifysource' 'version') # Pacman Options @@ -1813,6 +1814,7 @@ while true; do -p) shift; BUILDFILE=$1 ;; --pkg) shift; IFS=, read -ra p <<<"$1"; PKGLIST+=("${p[@]}"); unset p ;; --packagelist) PACKAGELIST=1 IGNOREARCH=1;; + --printsrcinfo) PRINTSRCINFO=1 ;; -r|--rmdeps) RMDEPS=1 ;; -R|--repackage) REPKG=1 ;; --sign) SIGNPKG='y' ;; @@ -2099,6 +2101,11 @@ if (( PACKAGELIST )); then exit 0 fi +if (( PRINTSRCINFO )); then + write_srcinfo + exit 0 +fi + if (( ! PKGVERFUNC )); then check_build_status fi -- 2.4.1

1 0

[pacman-dev] [PATCH] makepkg: Add flag for printing SRCINFO to stdout
by Johannes Löthberg 24 May '15

24 May '15

--- scripts/makepkg.sh.in | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c74e84a..2613b31 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1723,6 +1723,7 @@ usage() { printf -- "$(gettext " --nosign Do not create a signature for the package")\n" printf -- "$(gettext " --packagelist Only list packages that would be produced, without PKGEXT")\n" printf -- "$(gettext " --pkg <list> Only build listed packages from a split package")\n" + printf -- "$(gettext " --printsrcinfo Print the generated SRCINFO and exit")\n" printf -- "$(gettext " --sign Sign the resulting package with %s")\n" "gpg" printf -- "$(gettext " --skipchecksums Do not verify checksums of the source files")\n" printf -- "$(gettext " --skipinteg Do not perform any verification checks on source files")\n" @@ -1768,7 +1769,7 @@ OPT_SHORT="AcCdefFghiLmop:rRsSV" OPT_LONG=('allsource' 'check' 'clean' 'cleanbuild' 'config:' 'force' 'geninteg' 'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'noarchive' 'nobuild' 'nocolor' 'nocheck' 'nodeps' 'noextract' 'noprepare' 'nosign' 'packagelist' - 'pkg:' 'repackage' 'rmdeps' 'sign' 'skipchecksums' 'skipinteg' + 'pkg:' 'printsrcinfo' 'repackage' 'rmdeps' 'sign' 'skipchecksums' 'skipinteg' 'skippgpcheck' 'source' 'syncdeps' 'verifysource' 'version') # Pacman Options @@ -1813,6 +1814,7 @@ while true; do -p) shift; BUILDFILE=$1 ;; --pkg) shift; IFS=, read -ra p <<<"$1"; PKGLIST+=("${p[@]}"); unset p ;; --packagelist) PACKAGELIST=1 IGNOREARCH=1;; + --printsrcinfo) PRINTSRCINFO=1 ;; -r|--rmdeps) RMDEPS=1 ;; -R|--repackage) REPKG=1 ;; --sign) SIGNPKG='y' ;; @@ -2099,6 +2101,11 @@ if (( PACKAGELIST )); then exit 0 fi +if (( PRINTSRCINFO )); then + write_srcinfo + exit 0 +fi + if (( ! PKGVERFUNC )); then check_build_status fi -- 2.4.1

3 5

[pacman-dev] [PATCH] Match providers when showing optdep install status
by Lukas Fleischer 20 May '15

20 May '15

Use alpm_find_satisfier() instead of alpm_db_get_pkg() when retrieving the install status of a package to make sure we spot providers as well. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- src/pacman/package.c | 3 ++- src/pacman/util.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index 33184bd..2fd0a9c 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -57,11 +57,12 @@ static void deplist_display(const char *title, static void optdeplist_display(alpm_pkg_t *pkg, unsigned short cols) { alpm_list_t *i, *text = NULL; + alpm_db_t *localdb = alpm_get_localdb(config->handle); for(i = alpm_pkg_get_optdepends(pkg); i; i = alpm_list_next(i)) { alpm_depend_t *optdep = i->data; char *depstring = alpm_dep_compute_string(optdep); if(alpm_pkg_get_origin(pkg) == ALPM_PKG_FROM_LOCALDB) { - if(alpm_db_get_pkg(alpm_get_localdb(config->handle), optdep->name)) { + if(alpm_find_satisfier(alpm_db_get_pkgcache(localdb), optdep->name)) { const char *installed = _(" [installed]"); depstring = realloc(depstring, strlen(depstring) + strlen(installed) + 1); strcpy(depstring + strlen(depstring), installed); diff --git a/src/pacman/util.c b/src/pacman/util.c index 5d68360..b086bb8 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1205,9 +1205,10 @@ static int depend_cmp(const void *d1, const void *d2) static char *make_optstring(alpm_depend_t *optdep) { + alpm_db_t *localdb = alpm_get_localdb(config->handle); char *optstring = alpm_dep_compute_string(optdep); char *status = NULL; - if(alpm_db_get_pkg(alpm_get_localdb(config->handle), optdep->name)) { + if(alpm_find_satisfier(alpm_db_get_pkgcache(localdb), optdep->name)) { status = _(" [installed]"); } else if(alpm_pkg_find(alpm_trans_get_add(config->handle), optdep->name)) { status = _(" [pending]"); -- 2.4.1

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.2.1-160-g3d45293
by allan＠archlinux.org 19 May '15

19 May '15

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, master has been updated via 3d4529335c598e79b5a483fedc4c9d5c12ef10f1 (commit) via 1a17249159d2425dfd5103b8699673f72394a385 (commit) via 366adc3bb07f0082c8417e60fe7fc41fff211123 (commit) via 23e3c4852649a8803d049f81a6eab660f036f9cd (commit) via 15b6cecdd5353d1ce8d8a9747ea9e55477ceb3fb (commit) from 8ab106eb9b21263941a4329eb89709f35b2bd178 (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 3d4529335c598e79b5a483fedc4c9d5c12ef10f1 Author: Allan McRae <allan(a)archlinux.org> Date: Mon May 18 00:02:17 2015 +1000 libmakepkg: extract functions for source download and extraction Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1a17249159d2425dfd5103b8699673f72394a385 Author: Allan McRae <allan(a)archlinux.org> Date: Sun May 17 22:57:44 2015 +1000 libmakepkg: extract functions for handling source URLs Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 366adc3bb07f0082c8417e60fe7fc41fff211123 Author: Allan McRae <allan(a)archlinux.org> Date: Sun May 17 22:48:59 2015 +1000 libmakepkg: fix test style Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 23e3c4852649a8803d049f81a6eab660f036f9cd Author: Allan McRae <allan(a)archlinux.org> Date: Wed May 13 15:46:33 2015 +1000 libmakepkg: move more functions for extracting information from PKGBIULDs Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 15b6cecdd5353d1ce8d8a9747ea9e55477ceb3fb Author: Allan McRae <allan(a)archlinux.org> Date: Wed May 13 15:44:01 2015 +1000 libmakepkg: extract more utility functions Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/Makefile.am | 11 +- scripts/libmakepkg/.gitignore | 3 + scripts/libmakepkg/source.sh.in | 113 ++++ scripts/libmakepkg/source/bzr.sh.in | 106 +++ scripts/libmakepkg/source/file.sh.in | 147 +++++ scripts/libmakepkg/source/git.sh.in | 127 ++++ scripts/libmakepkg/source/hg.sh.in | 104 +++ .../{lint_package.sh.in => source/local.sh.in} | 33 +- scripts/libmakepkg/source/svn.sh.in | 93 +++ scripts/libmakepkg/util/message.sh | 2 +- scripts/libmakepkg/util/option.sh | 2 +- scripts/libmakepkg/util/pkgbuild.sh | 47 +- scripts/libmakepkg/util/source.sh.in | 144 +++++ scripts/libmakepkg/util/util.sh | 32 +- scripts/makepkg.sh.in | 718 --------------------- scripts/po/POTFILES.in | 8 + 16 files changed, 949 insertions(+), 741 deletions(-) create mode 100644 scripts/libmakepkg/source.sh.in create mode 100644 scripts/libmakepkg/source/bzr.sh.in create mode 100644 scripts/libmakepkg/source/file.sh.in create mode 100644 scripts/libmakepkg/source/git.sh.in create mode 100644 scripts/libmakepkg/source/hg.sh.in copy scripts/libmakepkg/{lint_package.sh.in => source/local.sh.in} (61%) create mode 100644 scripts/libmakepkg/source/svn.sh.in create mode 100644 scripts/libmakepkg/util/source.sh.in hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/5] libmakepkg: extract more utility functions
by Allan McRae 17 May '15

17 May '15

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/libmakepkg/util/util.sh | 32 +++++++++++++++++++++++++++++++- scripts/makepkg.sh.in | 30 ------------------------------ 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/scripts/libmakepkg/util/util.sh b/scripts/libmakepkg/util/util.sh index 307464e..d2378bb 100644 --- a/scripts/libmakepkg/util/util.sh +++ b/scripts/libmakepkg/util/util.sh @@ -19,7 +19,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -[ -n "$LIBMAKEPKG_UTIL_UTIL_SH" ] && return +[[ -n "$LIBMAKEPKG_UTIL_UTIL_SH" ]] && return LIBMAKEPKG_UTIL_UTIL_SH=1 @@ -36,3 +36,33 @@ in_array() { done return 1 # Not Found } + +# Canonicalize a directory path if it exists +canonicalize_path() { + local path="$1"; + + if [[ -d $path ]]; then + ( + cd_safe "$path" + pwd -P + ) + else + printf "%s\n" "$path" + fi +} + +dir_is_empty() { + ( + shopt -s dotglob nullglob + files=("$1"/*) + (( ${#files} == 0 )) + ) +} + +cd_safe() { + if ! cd "$1"; then + error "$(gettext "Failed to change to directory %s")" "$1" + plain "$(gettext "Aborting...")" + exit 1 + fi +} diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 2d64997..f88ec3c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1415,14 +1415,6 @@ error_function() { exit 2 # $E_BUILD_FAILED } -cd_safe() { - if ! cd "$1"; then - error "$(gettext "Failed to change to directory %s")" "$1" - plain "$(gettext "Aborting...")" - exit 1 - fi -} - source_safe() { shopt -u extglob if ! source "$@"; then @@ -2380,28 +2372,6 @@ print_all_package_names() { done } -# Canonicalize a directory path if it exists -canonicalize_path() { - local path="$1"; - - if [[ -d $path ]]; then - ( - cd_safe "$path" - pwd -P - ) - else - printf "%s\n" "$path" - fi -} - -dir_is_empty() { - ( - shopt -s dotglob nullglob - files=("$1"/*) - (( ${#files} == 0 )) - ) -} - m4_include(library/parseopts.sh) usage() { -- 2.4.1

1 4