- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Pass the old package with PM_TRANS_EVT_UPGRADE_START
by Nagy Gabor 30 Jul '08

30 Jul '08

From 84218a43d0a455a29b9312d43270ddf8bb78600d Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Wed, 30 Jul 2008 23:36:46 +0200 Subject: [PATCH] Pass the old package with PM_TRANS_EVT_UPGRADE_START This is more rational and coherent with PM_TRANS_EVT_UPGRADE_DONE. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/add.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 72ea70c..46a511c 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -650,14 +650,15 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count, if(local) { is_upgrade = 1; - EVENT(trans, PM_TRANS_EVT_UPGRADE_START, newpkg, NULL); + /* we'll need to save some record for backup checks later */ + oldpkg = _alpm_pkg_dup(local); + + EVENT(trans, PM_TRANS_EVT_UPGRADE_START, newpkg, oldpkg); _alpm_log(PM_LOG_DEBUG, "upgrading package %s-%s\n", newpkg->name, newpkg->version); - /* we'll need to save some record for backup checks later */ - oldpkg = _alpm_pkg_dup(local); /* copy over the install reason */ - newpkg->reason = alpm_pkg_get_reason(local); + newpkg->reason = alpm_pkg_get_reason(oldpkg); /* pre_upgrade scriptlet */ if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { -- 1.5.6.4

1 0

[pacman-dev] 3.2 "RC" release
by Dan McGee 30 Jul '08

30 Jul '08

I rebuilt pacman-git tonight with the latest head commit from the GIT repo: http://dev.archlinux.org/~dan/pacman-git/ If anyone notices anything wrong, speak soon. This should be 3.2.0 if nothing comes up, minus the version number bumping. -Dan

4 10

[pacman-dev] refresh_pkgcache branch
by Nagy Gabor 30 Jul '08

30 Jul '08

I just inform you that I warmed up my favourite bug-fix: http://repo.or.cz/w/pacman-ng.git?a=shortlog;h=refs/heads/refresh_pkgcache Bye

3 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.1.4-289-g5949936
by Dan McGee 30 Jul '08

30 Jul '08

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 59499367771e2cd906c4e23a3ad7c6d321ca65b3 (commit) via a7244e6ab257058669924cb5cdc14a494ea26c0b (commit) via 5d6788b36e8e2a6b883c841f23e257b9e9153687 (commit) via 6ede1a5af07e437d16c6fd4cc876ffb3cec4940b (commit) via 0e0a8461357baeb4bea23b09a56c003cf04fd0db (commit) via 428b2fd8cc5ad4a0e7b2dcd1d097fb57237ea7a8 (commit) via 9a6fd1b021fa03471c68fabcdb912bf3ded77b65 (commit) via e4b1a97ff232a8f755cc2db845683b940ad543b4 (commit) via 85f5279ec04f80ed6dde9c6a13272b7d3bb1e80d (commit) via 20a0b8e2013e71ff6b3ecf93167b6fa1c77f29f7 (commit) via 3bf9448943dc0bd9ae6deadb8a772130926b2058 (commit) via cf25884e992e9c0dd6e4bf2f7cd4bb3252578bf6 (commit) via 9f57921467ea368be96ffc09c8c35e9acfcc41ed (commit) via 7bc34ccde3b8860a4aaf8418996a72e8cc4dfae5 (commit) via b8e306b73e9b22fae3e45e5f5a3e8c07b63904b9 (commit) via 8877c88defdd9ea90bed9fb569addfa2b242a0f4 (commit) via dfae7bdd52476673424f8020befef166cf95f3fc (commit) via e6fb229534332396363f69bdb46081f45271bc53 (commit) via 5078ca580e102c0f87daee6bb82df1c0f0496bd3 (commit) via 310b13a4b7da1a35e035ce39f47091c0d3877cd5 (commit) via c317222d710e4d6b98f9387fedac2057cfa42c73 (commit) via 67f388c3fcad755d94944bee1f3a5a938817f5b9 (commit) via 5e4882dfe8b62a8cb7c206986d1010195a63d74e (commit) from 075b244be23aa788ae21e8c5d50cb99a1296c37f (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 59499367771e2cd906c4e23a3ad7c6d321ca65b3 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat Jul 26 00:28:28 2008 +0200 Update README file. Several pieces of information were outdated for the 3.2 release. Add a section for the API changes between 3.1 and 3.2. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> [Dan: small updates/grammar corrections] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a7244e6ab257058669924cb5cdc14a494ea26c0b Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jul 29 22:25:02 2008 -0500 Further updates to submitting-patches Xavier started the job, this should clean it up and get it up to date that final bit. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5d6788b36e8e2a6b883c841f23e257b9e9153687 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Jul 27 17:45:52 2008 +0200 Update submitting-patches file. The submitting patches page needed a bit of updating. It was currently a mash-up between the pre and post git eras. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6ede1a5af07e437d16c6fd4cc876ffb3cec4940b Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Mon Jul 28 22:37:08 2008 +0200 makepkg: Fix STRIP_DIRS test. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0e0a8461357baeb4bea23b09a56c003cf04fd0db Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Thu Jul 24 11:37:36 2008 +0200 makepkg : use /etc/profile This fixes FS#9486. source /etc/profile instead of all individual files in /etc/profile.d/* (which is done by /etc/profile anyway). Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 428b2fd8cc5ad4a0e7b2dcd1d097fb57237ea7a8 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun Jul 27 12:27:50 2008 +0200 Put CleanMethod to pacman.conf (commented out) Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9a6fd1b021fa03471c68fabcdb912bf3ded77b65 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat Jul 26 12:28:49 2008 +0200 Remove UseColor from front-end This option wasn't used. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e4b1a97ff232a8f755cc2db845683b940ad543b4 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri Jul 25 14:35:54 2008 +0200 New fileconflict005.py pactest This makes the fileconflict004.py test complete. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 85f5279ec04f80ed6dde9c6a13272b7d3bb1e80d Author: Robson Roberto Souza Peixoto <robsonpeixoto(a)gmail.com> Date: Mon Jul 28 22:44:21 2008 +0200 Small fix to pt_BR translation. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 20a0b8e2013e71ff6b3ecf93167b6fa1c77f29f7 Author: Giovanni Scafora <giovanni(a)archlinux.org> Date: Fri Jul 25 14:01:58 2008 +0200 Small fix to Italian translation Signed-off-by: Giovanni Scafora <linuxmania(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3bf9448943dc0bd9ae6deadb8a772130926b2058 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 25 07:12:04 2008 -0500 vercmptest: fix binary existence check Signed-off-by: Dan McGee <dan(a)archlinux.org> commit cf25884e992e9c0dd6e4bf2f7cd4bb3252578bf6 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jul 24 22:14:27 2008 -0500 pactest: exit with a non-zero error code on unexpected failure This will allow the return code of pactest to be useful, for such things as use in a git-bisect test script. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9f57921467ea368be96ffc09c8c35e9acfcc41ed Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jul 24 21:42:27 2008 -0500 pactest: add test.expectfailure option for tests This will enable us to mark tests we know currently fail to differentiate them from those that we know should pass. Regressions should be easier to spot this way. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7bc34ccde3b8860a4aaf8418996a72e8cc4dfae5 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jul 24 22:32:55 2008 +1000 Update NEWS file for 3.2.0 release Signed-off-by: Allan McRae <allan(a)archlinux.org> [Dan: updates of my own + some from ML] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b8e306b73e9b22fae3e45e5f5a3e8c07b63904b9 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Thu Jul 24 12:26:09 2008 +0200 Implement AND based package searching. This fixes FS#2334. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> [Dan: add some comments to the code] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8877c88defdd9ea90bed9fb569addfa2b242a0f4 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Fri Jul 25 02:02:37 2008 +0200 Show number of packages to be installed / removed. This fixes FS#7794. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dfae7bdd52476673424f8020befef166cf95f3fc Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Fri Jul 25 02:02:36 2008 +0200 src/pacman : rework the display_targets function. We had a lot of duplicated code here. The code handling the showsize option needed to be there three times : 1) for install part of -S 2) for remove part of -S (conflict removal) 3) for -R This patch introduce a new display_targets(pkglist, install) function which can handle the 3 cases above. We pass install == 1 for case 1), and install == 0 for case 2) and 3). Now we can finally get the benefit of an old patch which handled the ShowSize option consistently in the 3 cases above, without an awful lot of duplicated code : http://www.archlinux.org/pipermail/pacman-dev/2008-January/011029.html Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e6fb229534332396363f69bdb46081f45271bc53 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jul 24 20:34:52 2008 -0500 Remove unused strverscmp substitute Our internal vercmp function was the only user of this, and it no longer relies on it. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5078ca580e102c0f87daee6bb82df1c0f0496bd3 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jul 24 20:34:11 2008 -0500 pacsearch: quote args passed to pacman Something such as "pacsearch foo|bar" would cause problems due to the quoting being dropped. Adding quotes solves the problem. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 310b13a4b7da1a35e035ce39f47091c0d3877cd5 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Fri Jul 25 02:02:17 2008 +0200 libalpm/package.c : fix infolevel bug in pkg_dup The pkg_dup function shouldn't call any alpm_pkg_get_ accessors because this can fill the old package with all INFRQ_DESC fields for example, and this won't necessarily be reproduced in the new package (for all the fields that were copied before). Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c317222d710e4d6b98f9387fedac2057cfa42c73 Author: Carlo Bersani <carlocci(a)gmail.com> Date: Wed Jul 23 14:22:49 2008 +0200 contrib: add pactree script Pactree is a dependency tree viewer for installed packages. It features both textual and graphic (through graphviz) output. Script by: Carlo Bersani <carlocci(a)gmail.com> [Allan: removed whitespace errors] Signed-off-by: Allan McRae <allan(a)archlinux.org> [Dan: killed some unnecessary lines, moved license header] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 67f388c3fcad755d94944bee1f3a5a938817f5b9 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jul 23 23:01:35 2008 +1000 makepkg: add packages to pkgdeps list only after successful install This fixed FS#9403. With this you can use "makepkg -sr", install the dependencies, Ctrl+c during the makedepends installation and have makepkg remove the installed packages on the exit. Previously makepkg tried to also remove the makedepends which were not installed. The deplist="" line in remove_deps is due to an obscure bug where local varaibles from the handle_deps function seem stay in scope because we never formally exited it. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5e4882dfe8b62a8cb7c206986d1010195a63d74e Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jul 22 23:41:50 2008 -0500 Fix vercmp and add additional tests This vercmp issue has been a sticking point but this should resolve many of the issues that have come up. Only a few minor code changes were necessary to get the behavior we desired, and this version appears to beat any other vercmp rendition on a few more cases added in this commit. This commit passes all 58 vercmp tests currently out there. Other 'fixes' still fail on a few tests, namely these ones: test: ver1: 1.5.a ver2: 1.5 ret: -1 expected: 1 ==> FAILURE test: ver1: 1.5 ver2: 1.5.a ret: 1 expected: -1 ==> FAILURE test: ver1: 1.5-1 ver2: 1.5.b ret: 1 expected: -1 ==> FAILURE test: ver1: 1.5.b ver2: 1.5-1 ret: -1 expected: 1 ==> FAILURE 4 of 58 tests failed Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 70 +++++++++ README | 169 +++++++++++++--------- configure.ac | 2 +- contrib/Makefile.am | 1 + contrib/README | 3 + contrib/pacsearch | 4 +- contrib/pactree | 301 ++++++++++++++++++++++++++++++++++++++ doc/pacman.8.txt | 2 +- etc/pacman.conf.in | 1 + lib/libalpm/db.c | 9 +- lib/libalpm/package.c | 47 +++--- lib/libalpm/po/it.po | 4 +- lib/libalpm/util.c | 102 ------------- lib/libalpm/util.h | 3 - pactest/pactest.py | 9 +- pactest/pmenv.py | 45 ++++-- pactest/pmtest.py | 7 +- pactest/tests/fileconflict001.py | 2 + pactest/tests/fileconflict002.py | 2 + pactest/tests/fileconflict004.py | 2 + pactest/tests/fileconflict005.py | 23 +++ pactest/tests/sync403.py | 2 + pactest/tests/trans001.py | 2 + pactest/tests/upgrade046.py | 2 + pactest/tests/upgrade051.py | 2 + pactest/util.py | 5 +- pactest/vercmptest.sh | 36 ++++- po/it.po | 6 +- po/pt_BR.po | 14 +- scripts/makepkg.sh.in | 18 +-- src/pacman/conf.h | 1 - src/pacman/pacman.c | 3 - src/pacman/query.c | 2 +- src/pacman/remove.c | 15 +-- src/pacman/sync.c | 2 +- src/pacman/util.c | 104 ++++++++------ src/pacman/util.h | 3 +- submitting-patches | 90 ++++++------ 38 files changed, 760 insertions(+), 355 deletions(-) create mode 100755 contrib/pactree create mode 100644 pactest/tests/fileconflict005.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] makepkg patch to preserve environment variables (when "-s"ing)
by rob＠kingofnerds.net 29 Jul '08

29 Jul '08

it just changes every "sudo" to "sudo -E" (useful when using $http_proxy) version 3.1.4 http://rob.kingofnerds.net/makepkg_sudo.patch

4 3

[pacman-dev] [PATCH] Make strip paths configurable
by Allan McRae 29 Jul '08

29 Jul '08

This patch introduces a new STRIP_DIRS makepkg.conf option to change makepkg's search path when stripping binaries. Original work by: Thomas Bächler <thomas(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/makepkg.conf.5.txt | 7 +++++++ etc/makepkg.conf.in | 2 ++ scripts/makepkg.sh.in | 9 ++++++--- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index b5a49ba..8b39c46 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -134,6 +134,13 @@ Options that are located in opt/, you may need to add the directory to this array. *NOTE:* Do not add the leading slash to the directory name. +**STRIP_DIRS=(**bin lib sbin usr/{bin,lib} ...**)**:: + If "strip" is specified in the OPTIONS array, this variable will + instruct makepkg where to look to for files to strip. If you build + packages that are located in opt/, you may need to add the directory + to this array. *NOTE:* Do not add the leading slash to the directory + name. + **PKGDEST=**"/path/to/folder":: If this value is not set, packages will by default be placed in the current directory (location of the linkman:PKGBUILD[5]). Many people diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index bb2018f..0241a8e 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -73,6 +73,8 @@ OPTIONS=(strip docs libtool emptydirs zipman) INTEGRITY_CHECK=(md5) #-- Info and doc directories to remove (if option set correctly above) DOC_DIRS=(usr/{,share/}{info,doc,gtk-doc} opt/*/{info,doc,gtk-doc}) +#-- Directories to be searched for the strip option (if option set correctly above) +STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin}) ######################################################################### # PACKAGE OUTPUT diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 2777102..ae19983 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -731,9 +731,12 @@ tidy_install() { if [ "$(check_option strip)" = "y" ]; then msg2 "$(gettext "Stripping debugging symbols from binaries and libraries...")" - local binary bindirs - bindirs="bin lib sbin usr/bin usr/lib usr/sbin usr/local/bin usr/local/lib usr/local/sbin opt/*/bin opt/*/lib opt/*/sbin" - find ${bindirs} -type f 2>/dev/null | while read binary ; do + local binary + if [ -z "${STRIP_DIRS[@]}" ]; then + # fall back to default value + STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin}) + fi + find ${STRIP_DIRS[@]} -type f 2>/dev/null | while read binary ; do case "$(file -biz "$binary")" in *application/x-sharedlib*) # Libraries (.so) /usr/bin/strip --strip-debug "$binary";; -- 1.5.6.3

6 15

[pacman-dev] [Translation] Small fix to ptBR translation
by Robson Roberto Souza Peixoto 28 Jul '08

28 Jul '08

Some small fix for pacman 3.2.0 Thanks!!! -- Robson Roberto Souza Peixoto Robinho robsonpeixoto(a)gmail.com Obs.: Novo Tel: (071) 8782-0206

2 1

[pacman-dev] [PATCH] pacman.conf (manual) changes
by Nagy Gabor 28 Jul '08

28 Jul '08

From 6f83f47c8545674b7c8e1c3178ac40b2ace44f3a Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat, 26 Jul 2008 12:46:22 +0200 Subject: [PATCH] pacman.conf (manual) changes Document ILoveCandy, and set the default CleanMethod value. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- doc/pacman.conf.5.txt | 3 +++ etc/pacman.conf.in | 2 ++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index 20a9067..0eee3f0 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -149,6 +149,9 @@ Options and completed percentage of the entire download list rather than the percent of each individual download target. The progress bar is still based solely on the current file download. + +*ILoveCandy*:: + Enables pacman game inspired progressbar. Repository Sections ------------------- diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index 199626d..2101e3b 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -17,6 +17,7 @@ HoldPkg = pacman glibc # If upgrades are available for these packages they will be asked for first SyncFirst = pacman #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#CleanMethod = KeepInstalled # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup #IgnorePkg = @@ -31,6 +32,7 @@ SyncFirst = pacman #ShowSize #UseDelta #TotalDownload +#ILoveCandy # # REPOSITORIES -- 1.5.6.4

4 7

[pacman-dev] Update for the README file
by Xavier 28 Jul '08

28 Jul '08

Dan complained several times that the README file was long outdated, so I tried to improve that. I hope I did not make it worse :/ As always, help/feedback is appreciated.

2 2

[pacman-dev] [PATCH] links problem in bacman
by Carlo Bersani 28 Jul '08

28 Jul '08

I just discovered test -e tries to resolve the link before testing, so if the link is copied before the actual file, the script exits. Here's the simple fix to this bug: --- bacman 2008-06-16 17:42:45.000000000 +0200 +++ bacman.new 2008-06-16 17:52:17.000000000 +0200 @@ -136,7 +136,7 @@ bsdtar -cnf - "/$i" 2> /dev/null | bsdtar -xpf - # Workaround to bsdtar not reporting a missing file as an error - if [ ! -e "$work_dir"/"$i" ]; then + if [ ! -e "$work_dir"/"$i" ] && [ ! -L "$work_dir"/"$i" ]; then echo "" echo "ERROR: unable to add /$i to the package" echo " If your user does not have permssion to read this file then"

5 14