May 2009 - Pacman-dev - lists.archlinux.org

[pacman-dev] Patch for srcpac to work with current makepkg
by u no hu 19 May '09

19 May '09

From: unohu <unohu0(a)gmail.com> Date: Fri, 15 May 2009 18:33:55 +0530 Subject: [PATCH] 2 bugfixes Replaced outdated makepkg option b with s copy all files instead of just PKGBUILD --- srcpac | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpac b/srcpac index 3445c58..45f1b5d 100755 --- a/srcpac +++ b/srcpac @@ -129,13 +129,13 @@ build_packages() fi mkdir -p ${builddir} - cp ${pkgdir}/PKGBUILD ${builddir} + cp ${pkgdir}/* ${builddir} # apply configuration apply_config ${pkg} ${builddir} # seperate out our makepkg flags - MAKEPKGOPTS="-c -b -r -f" + MAKEPKGOPTS="-c -s -r -f" cd ${builddir} -- 1.6.2.3

3 3

[pacman-dev] [PATCH] Add an initial pactest/test/.gitignore
by Gerardo Exequiel Pozzi 19 May '09

19 May '09

Add an initial pactest/test/.gitignore to exclude sync200.py that is generated from sync200.py.in Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- pactest/tests/.gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 pactest/tests/.gitignore diff --git a/pactest/tests/.gitignore b/pactest/tests/.gitignore new file mode 100644 index 0000000..665d9ce --- /dev/null +++ b/pactest/tests/.gitignore @@ -0,0 +1 @@ +sync200.py -- 1.6.3.1

2 1

[pacman-dev] [PATCH 2/2] We don't need root with -Sp
by Nagy Gabor 16 May '09

16 May '09

From 4531be12ace34a952e5d84e70f464f4643957793 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat, 16 May 2009 17:59:45 +0200 Subject: [PATCH 2/2] We don't need root with -Sp FS#8905 is fixed. The front-end passes PM_TRANS_FLAG_NOLOCK to the back-end, so it doesn't lock the database. That's why we don't need root anymore. I reworked (and renamed) needs_transaction() accordingly. I also added missing -Sc check there (for example, -Sci didn't print non-root error, but pacman wanted to lock the database). Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- src/pacman/pacman.c | 3 ++- src/pacman/util.c | 19 ++++++++----------- src/pacman/util.h | 2 +- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index b94b28e..3b8636c 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -481,6 +481,7 @@ static int parseargs(int argc, char *argv[]) config->op_q_isfile = 1; config->op_s_printuris = 1; config->flags |= PM_TRANS_FLAG_NOCONFLICTS; + config->flags |= PM_TRANS_FLAG_NOLOCK; break; case 'q': config->quiet = 1; @@ -900,7 +901,7 @@ int main(int argc, char *argv[]) #if defined(HAVE_GETEUID) && !defined(CYGWIN) /* check if we have sufficient permission for the requested operation */ - if(myuid > 0 && needs_transaction()) { + if(myuid > 0 && needs_root()) { pm_printf(PM_LOG_ERROR, _("you cannot perform this operation unless you are root.\n")); cleanup(EXIT_FAILURE); } diff --git a/src/pacman/util.c b/src/pacman/util.c index a280252..8056fbd 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -69,19 +69,16 @@ int trans_release(void) return(0); } -int needs_transaction(void) +int needs_root(void) { - if(config->op != PM_OP_MAIN && config->op != PM_OP_QUERY && config->op != PM_OP_DEPTEST) { - if((config->op == PM_OP_SYNC && !config->op_s_sync && - (config->op_s_search || config->group || config->op_q_list || config->op_q_info)) - || config->op == PM_OP_DEPTEST) { - /* special case: PM_OP_SYNC can be used w/ config->op_s_search by any user */ - return(0); - } else { - return(1); - } + if(config->op == PM_OP_UPGRADE || config->op == PM_OP_REMOVE || /* -U, -R */ + (config->op == PM_OP_SYNC && (config->op_s_clean || config->op_s_sync || /* -Sc, -Sy */ + (!config->group && !config->op_s_info && !config->op_q_list /* all other -S combinations, where */ + && !config->op_s_search && !config->op_s_printuris)))) { /* -g, -i, -l, -s, -p is not set */ + return(1); + } else { + return(0); } - return(0); } /* gets the current screen column width */ diff --git a/src/pacman/util.h b/src/pacman/util.h index 6416858..b159018 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -38,7 +38,7 @@ int trans_init(pmtranstype_t type, pmtransflag_t flags); int trans_release(void); -int needs_transaction(void); +int needs_root(void); int getcols(void); int makepath(const char *path); int rmrf(const char *path); -- 1.6.3.1

1 0

Re: [pacman-dev] [arch-general] "pkgdyn" a set of scripts for analysis of ELF deps in pkgs.
by Aaron Griffin 15 May '09

15 May '09

On Thu, Apr 23, 2009 at 10:45 PM, Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> wrote: > Hi, > > This is a set of draft scripts that I use to find/extract some data of > ELF files from packages. > For example: > > * Find all packages that needed inexistent shared objects because a > soname bump in libraries. > * Generate a report for all packages per repo that in case of soname > bump , needs to be rebuild. > * Find ELF files that are outside the allowed paths (for example ELF in > /usr/share) > * Find RPATH in packages, with a simple "awk" can generate a report etc. > > * Other task with "temporary data generated", but there are no scripts > at this time, are only "at command line runtime". > Can be easily construct with awk, of your preferer lang. > > It use files in analysis so, if a ELF needed a "soname" that are > symlink, this are reported (tho only case here are courier-maildrop, > just ignore it) > > http://archlinux.djgera.com.ar/pkgdyn/ > > Sample data and generated DB by "dynup.bash" is uploaded, extract in > "pkgdyn" directory. > The dyunp.bash can make DB from empty DB, or update the DB, deleting old > entries and inserting news. > > > Is in "public domain": so use it, modify it, copy it, no problem. > Sugestions, improvements, dudes, write me. > > > PS1: Exception here: (this report as missing, but is a "optdepend in > community") > extra/gnome-speech-0.4.25-1:NEEDED libespeak.so.1 > > PS2: All missing deps I already reported and many of [community] have > been fixed. Congrats TU! > > > Cheers, Just replying so I can send this over to the pacman-dev list. This looks great

2 2

[pacman-dev] [PATCH] Introduce -Suu
by Nagy Gabor 14 May '09

14 May '09

>From 449d53df4a41f3856a5dba967e2eb186aa64914a Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Thu, 14 May 2009 18:25:16 +0200 Subject: [PATCH] Introduce -Suu If the user switches from unstable repo to a stable one, it is quite hard to sync its system with the new repo (the user will see many "Local is newer than stable" messages, nothing more). That's why I introduced -Suu, which treats a sync package like an upgrade, iff the package version doesn't match with the local one's. I added a new pactest (sync104.py) to test this, and I updated the documentation of -Su. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- doc/pacman.8.txt | 5 ++++- lib/libalpm/alpm.h | 2 +- lib/libalpm/sync.c | 18 +++++++++++++++--- lib/libalpm/sync.h | 2 +- lib/libalpm/trans.c | 4 ++-- pactest/tests/sync104.py | 12 ++++++++++++ src/pacman/pacman.c | 3 ++- src/pacman/sync.c | 2 +- 8 files changed, 38 insertions(+), 10 deletions(-) create mode 100644 pactest/tests/sync104.py diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 4582be5..e914ab4 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -310,7 +310,10 @@ linkman:pacman.conf[5]. report of all packages to upgrade will be presented and the operation will not proceed without user confirmation. Dependencies are automatically resolved at this level and will be installed/upgraded if - necessary. + necessary. Pass this option twice to enable package downgrade; in this + case pacman will select sync packages whose version does not match with + the local ones'. For example, this can be useful when the user + switches from a testing repo to a stable one. *-w, \--downloadonly*:: Retrieve all packages from the server, but do not install/upgrade diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 57ea880..2a6c2e0 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -395,7 +395,7 @@ alpm_list_t * alpm_trans_get_pkgs(); int alpm_trans_init(pmtranstype_t type, pmtransflag_t flags, alpm_trans_cb_event cb_event, alpm_trans_cb_conv conv, alpm_trans_cb_progress cb_progress); -int alpm_trans_sysupgrade(void); +int alpm_trans_sysupgrade(int enable_downgrade); int alpm_trans_addtarget(char *target); int alpm_trans_prepare(alpm_list_t **data); int alpm_trans_commit(alpm_list_t **data); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index abda147..ccd6424 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -79,7 +79,7 @@ pmpkg_t SYMEXPORT *alpm_sync_newversion(pmpkg_t *pkg, alpm_list_t *dbs_sync) return(NULL); } -int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync) +int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, int enable_downgrade) { alpm_list_t *i, *j, *k; @@ -115,8 +115,20 @@ int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_s trans->packages = alpm_list_add(trans->packages, spkg); } } else if(cmp < 0) { - _alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)\n"), - lpkg->name, lpkg->version, sdb->treename, spkg->version); + if(enable_downgrade) { + /* check IgnorePkg/IgnoreGroup */ + if(_alpm_pkg_should_ignore(spkg) || _alpm_pkg_should_ignore(lpkg)) { + _alpm_log(PM_LOG_WARNING, _("%s: ignoring package downgrade (%s => %s)\n"), + lpkg->name, lpkg->version, spkg->version); + } else { + _alpm_log(PM_LOG_WARNING, _("%s: downgrading from version %s to version %s\n"), + lpkg->name, lpkg->version, spkg->version); + trans->packages = alpm_list_add(trans->packages, spkg); + } + } else { + _alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)\n"), + lpkg->name, lpkg->version, sdb->treename, spkg->version); + } } break; /* jump to next local package */ } else { /* 2. search for replacers in sdb */ diff --git a/lib/libalpm/sync.h b/lib/libalpm/sync.h index 00985b6..8171e36 100644 --- a/lib/libalpm/sync.h +++ b/lib/libalpm/sync.h @@ -23,7 +23,7 @@ #include "alpm.h" -int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync); +int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, int enable_downgrade); int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, char *name); int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, alpm_list_t **data); diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index ef56841..b144b2a 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -87,7 +87,7 @@ int SYMEXPORT alpm_trans_init(pmtranstype_t type, pmtransflag_t flags, /** Search for packages to upgrade and add them to the transaction. * @return 0 on success, -1 on error (pm_errno is set accordingly) */ -int SYMEXPORT alpm_trans_sysupgrade() +int SYMEXPORT alpm_trans_sysupgrade(int enable_downgrade) { pmtrans_t *trans; @@ -100,7 +100,7 @@ int SYMEXPORT alpm_trans_sysupgrade() ASSERT(trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1)); ASSERT(trans->type == PM_TRANS_TYPE_SYNC, RET_ERR(PM_ERR_TRANS_TYPE, -1)); - return(_alpm_sync_sysupgrade(trans, handle->db_local, handle->dbs_sync)); + return(_alpm_sync_sysupgrade(trans, handle->db_local, handle->dbs_sync, enable_downgrade)); } /** Add a target to the transaction. diff --git a/pactest/tests/sync104.py b/pactest/tests/sync104.py new file mode 100644 index 0000000..6d51b85 --- /dev/null +++ b/pactest/tests/sync104.py @@ -0,0 +1,12 @@ +self.description = "-Suu" + +sp = pmpkg("dummy", "0.9-1") +lp = pmpkg("dummy", "1.0-1") + +self.addpkg2db("sync", sp) +self.addpkg2db("local", lp) + +self.args = "-Suu" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=dummy|0.9-1") diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 72a72ba..6e2d96c 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -129,6 +129,7 @@ static void usage(int op, const char * const myname) printf(_(" -p, --print-uris print out URIs for given packages and their dependencies\n")); printf(_(" -s, --search <regex> search remote repositories for matching strings\n")); printf(_(" -u, --sysupgrade upgrade all packages that are out of date\n")); + printf(_(" (-uu enables package downgrade)\n")); printf(_(" -w, --downloadonly download packages but do not install/upgrade anything\n")); printf(_(" -y, --refresh download fresh package databases from the server\n")); printf(_(" --needed don't reinstall up to date packages\n")); @@ -501,7 +502,7 @@ static int parseargs(int argc, char *argv[]) config->op_q_unrequired = 1; break; case 'u': - config->op_s_upgrade = 1; + (config->op_s_upgrade)++; config->op_q_upgrade = 1; config->flags |= PM_TRANS_FLAG_UNNEEDED; break; diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 68fb81a..3a03b42 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -561,7 +561,7 @@ static int sync_trans(alpm_list_t *targets) if(config->op_s_upgrade) { printf(_(":: Starting full system upgrade...\n")); alpm_logaction("starting full system upgrade\n"); - if(alpm_trans_sysupgrade() == -1) { + if(alpm_trans_sysupgrade(config->op_s_upgrade >= 2) == -1) { pm_fprintf(stderr, PM_LOG_ERROR, "%s\n", alpm_strerrorlast()); retval = 1; goto cleanup; -- 1.6.0.3

1 1

[pacman-dev] [PATCH] Don't print "local/" with -Qs
by Nagy Gabor 13 May '09

13 May '09

>From 1572535efe01dfae1f28b74862dec21f2102f165 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun, 10 May 2009 14:08:04 +0200 Subject: [PATCH] Don't print "local/" with -Qs See FS#14642. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- src/pacman/query.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 0d48638..2cb86a9 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -166,7 +166,7 @@ static int query_search(alpm_list_t *targets) pmpkg_t *pkg = alpm_list_getdata(i); if (!config->quiet) { - printf("local/%s %s", alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg)); + printf("%s %s", alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg)); } else { printf("%s", alpm_pkg_get_name(pkg)); } -- 1.6.0.3

3 4

[pacman-dev] [PATCH] Add more files to cleanup in autoclean.sh
by Gerardo Exequiel Pozzi 12 May '09

12 May '09

Add files pactest/tests/Makefile.in , pactest/tests/Makefile and contrib/Makefile.in , contrib/Makefile to list of cleanup script. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- autoclean.sh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/autoclean.sh b/autoclean.sh index 17e4416..4353179 100755 --- a/autoclean.sh +++ b/autoclean.sh @@ -18,7 +18,8 @@ rm -rf scripts/{Makefile.in,Makefile} rm -rf etc/{Makefile.in,Makefile} rm -rf etc/pacman.d/{Makefile.in,Makefile} rm -rf etc/abs/{Makefile.in,Makefile} -rm -rf pactest/{Makefile.in,Makefile} +rm -rf pactest{,/tests}/{Makefile.in,Makefile} +rm -rf contrib/{Makefile.in,Makefile} rm -rf doc/{Makefile.in,Makefile} rm -rf doc/html/*.html rm -rf doc/man3/*.3 -- 1.6.3

1 0

[pacman-dev] [PATCH] Introduce -Qlq
by Nagy Gabor 12 May '09

12 May '09

>From 054eae27537989dee76a06fac882fb38702144d5 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun, 10 May 2009 22:41:29 +0200 Subject: [PATCH] Introduce -Qlq With --quiet flag, -Ql doesn't print the package name only lists files. I made --quiet documentation up-to-date (I also added -Sgq/-Qgq). Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- doc/pacman.8.txt | 18 ++++++++++++------ src/pacman/package.c | 8 ++++++-- src/pacman/package.h | 2 +- src/pacman/query.c | 2 +- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 95880a2..cc3d396 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -204,9 +204,13 @@ Query Options[[QO]] This is useful in combination with '\--info' and '\--list'. *-q, \--quiet*:: - Show less information for certain query operations. Search will only show - package names and not version, group, and description information; a bare - query will only show package names rather than names and versions. + Show less information for certain query operations. (This is useful when + pacman's output is processed in a script.) Search will only show package + names and not version, group, and description information; owns will + only show package names and versions instead of "file is owned by pkg" + messages; group will only show package names and omit group names; list + will only show files and omit package names; a bare query will only + show package names rather than names and versions. *-s, \--search* <'regexp'>:: This will search each locally-installed package for names or @@ -284,9 +288,11 @@ linkman:pacman.conf[5]. downloaded at a later time, using a program like wget. *-q, \--quiet*:: - Show less information for certain sync operations. Search will only show - package names and not version, group, and description information; list - will only show package names and omit databases and versions. + Show less information for certain sync operations. (This is useful when + pacman's output is processed in a script.) Search will only show package + names and not repo, version, group, and description information; list + will only show package names and omit databases and versions; group will + only show package names and omit group names. *-s, \--search* <'regexp'>:: This will search each package in the sync databases for names or diff --git a/src/pacman/package.c b/src/pacman/package.c index b23c577..da2feb5 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -205,7 +205,7 @@ void dump_pkg_backups(pmpkg_t *pkg) /* List all files contained in a package */ -void dump_pkg_files(pmpkg_t *pkg) +void dump_pkg_files(pmpkg_t *pkg, int quiet) { const char *pkgname, *root, *filestr; alpm_list_t *i, *pkgfiles; @@ -216,7 +216,11 @@ void dump_pkg_files(pmpkg_t *pkg) for(i = pkgfiles; i; i = alpm_list_next(i)) { filestr = alpm_list_getdata(i); - fprintf(stdout, "%s %s%s\n", pkgname, root, filestr); + if(!quiet){ + fprintf(stdout, "%s %s%s\n", pkgname, root, filestr); + } else { + fprintf(stdout, "%s%s\n", root, filestr); + } } fflush(stdout); diff --git a/src/pacman/package.h b/src/pacman/package.h index 14bc7d6..aede2a1 100644 --- a/src/pacman/package.h +++ b/src/pacman/package.h @@ -25,7 +25,7 @@ void dump_pkg_full(pmpkg_t *pkg, int level); void dump_pkg_sync(pmpkg_t *pkg, const char *treename); void dump_pkg_backups(pmpkg_t *pkg); -void dump_pkg_files(pmpkg_t *pkg); +void dump_pkg_files(pmpkg_t *pkg, int quiet); void dump_pkg_changelog(pmpkg_t *pkg); #endif /* _PM_PACKAGE_H */ diff --git a/src/pacman/query.c b/src/pacman/query.c index 2cb86a9..0b8406d 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -320,7 +320,7 @@ static void display(pmpkg_t *pkg) } } if(config->op_q_list) { - dump_pkg_files(pkg); + dump_pkg_files(pkg, config->quiet); } if(config->op_q_changelog) { dump_pkg_changelog(pkg); -- 1.6.0.3

2 3

[pacman-dev] [PATCH 1/3] Fix stderr redirection
by Cedric Staniewski 12 May '09

12 May '09

When redirecting both stderr and stdout and using the 2>&1 construct, you have to redirect stdout first. Otherwise stderr will be redirected to the 'old' stdout and not to the new resource. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- acinclude.m4 | 4 ++-- scripts/repo-add.sh.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 1524a3d..94ddb2b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -234,7 +234,7 @@ AC_DEFUN([_LT_COMPILER_BOILERPLATE], [AC_REQUIRE([LT_AC_PROG_SED])dnl ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +eval "$ac_compile" >/dev/null 2>&1 | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ])# _LT_COMPILER_BOILERPLATE @@ -248,7 +248,7 @@ AC_DEFUN([_LT_LINKER_BOILERPLATE], [AC_REQUIRE([LT_AC_PROG_SED])dnl ac_outfile=conftest.$ac_objext echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +eval "$ac_link" >/dev/null 2>&1 | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* ])# _LT_LINKER_BOILERPLATE diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 2390a92..13097df 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -341,7 +341,7 @@ add() fi pkgfile=$1 - if ! bsdtar -tf "$pkgfile" .PKGINFO 2>&1 >/dev/null; then + if ! bsdtar -tf "$pkgfile" .PKGINFO >/dev/null 2>&1; then error "$(gettext "'%s' is not a package file, skipping")" "$pkgfile" return 1 fi -- 1.6.3

1 0

[pacman-dev] [PATCH] Remove unused included headers from testdb.c and testpkg.c
by Gerardo Exequiel Pozzi 12 May '09

12 May '09

libgen.h was used for basename() in function main() from src/util/testdb.c string.h was used for strlen() in function output_cb() from src/util/testpkg.c Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- src/util/testdb.c | 1 - src/util/testpkg.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/util/testdb.c b/src/util/testdb.c index cbff578..abbc62f 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -24,7 +24,6 @@ #include <limits.h> #include <string.h> #include <dirent.h> -#include <libgen.h> #include <alpm.h> #include <alpm_list.h> diff --git a/src/util/testpkg.c b/src/util/testpkg.c index 6e8f9d1..d86fb1e 100644 --- a/src/util/testpkg.c +++ b/src/util/testpkg.c @@ -21,7 +21,6 @@ #include <stdio.h> /* printf */ #include <stdarg.h> /* va_list */ -#include <string.h> /* strlen */ #include <alpm.h> -- 1.6.2.4

1 0