- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] call alpm_option_get_localdb once in syncfirst()
by Andrea Scarpino 29 Mar '11

29 Mar '11

Signed-off-by: Andrea Scarpino <andrea(a)archlinux.org> --- :100644 100644 b12206c... 0b34f04... M src/pacman/sync.c src/pacman/sync.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index b12206c..0b34f04 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -578,10 +578,11 @@ static int sync_list(alpm_list_t *syncs, alpm_list_t *targets) static alpm_list_t *syncfirst(void) { alpm_list_t *i, *res = NULL; + pmdb_t *db_local = alpm_option_get_localdb(); for(i = config->syncfirst; i; i = alpm_list_next(i)) { char *pkgname = alpm_list_getdata(i); - pmpkg_t *pkg = alpm_db_get_pkg(alpm_option_get_localdb(), pkgname); + pmpkg_t *pkg = alpm_db_get_pkg(db_local, pkgname); if(pkg == NULL) { continue; } -- 1.7.4.2

1 0

[pacman-dev] [PATCH] call alpm_option_get_localdb once in syncfirst()
by Andrea Scarpino 29 Mar '11

29 Mar '11

Call alpm_option_get_localdb once and use the same value for every package in the loop. >From ba81c98746b18a820769d209fc13740ef76939db Mon Sep 17 00:00:00 2001 From: Andrea Scarpino <andrea(a)archlinux.org> Date: Tue, 29 Mar 2011 16:27:11 +0200 Subject: [PATCH] call alpm_option_get_localdb() once --- src/pacman/sync.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index b12206c..0b34f04 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -578,10 +578,11 @@ static int sync_list(alpm_list_t *syncs, alpm_list_t *targets) static alpm_list_t *syncfirst(void) { alpm_list_t *i, *res = NULL; + pmdb_t *db_local = alpm_option_get_localdb(); for(i = config->syncfirst; i; i = alpm_list_next(i)) { char *pkgname = alpm_list_getdata(i); - pmpkg_t *pkg = alpm_db_get_pkg(alpm_option_get_localdb(), pkgname); + pmpkg_t *pkg = alpm_db_get_pkg(db_local, pkgname); if(pkg == NULL) { continue; } -- 1.7.4.2

1 0

[pacman-dev] [PATCH] alpm/handle.c: ensure handle is not NULL before proceeding
by Rémy Oudompheng 28 Mar '11

28 Mar '11

Many alpm_option_get/set_*() functions already check this and set pm_errno to the right value, but not all, so this improves consistency. Signed-off-by: Rémy Oudompheng <remy(a)archlinux.org> --- lib/libalpm/handle.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 80 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index d4ebe82..c37a0f9 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -302,6 +302,10 @@ int SYMEXPORT alpm_option_set_root(const char *root) ALPM_LOG_FUNC; + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return(-1); + } if(!root) { pm_errno = PM_ERR_WRONG_ARGS; return(-1); @@ -342,6 +346,10 @@ int SYMEXPORT alpm_option_set_dbpath(const char *dbpath) ALPM_LOG_FUNC; + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return(-1); + } if(!dbpath) { pm_errno = PM_ERR_WRONG_ARGS; return(-1); @@ -380,6 +388,10 @@ int SYMEXPORT alpm_option_add_cachedir(const char *cachedir) ALPM_LOG_FUNC; + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return(-1); + } if(!cachedir) { pm_errno = PM_ERR_WRONG_ARGS; return(-1); @@ -402,6 +414,10 @@ int SYMEXPORT alpm_option_add_cachedir(const char *cachedir) void SYMEXPORT alpm_option_set_cachedirs(alpm_list_t *cachedirs) { + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return; + } if(handle->cachedirs) FREELIST(handle->cachedirs); if(cachedirs) handle->cachedirs = cachedirs; } @@ -411,6 +427,10 @@ int SYMEXPORT alpm_option_remove_cachedir(const char *cachedir) char *vdata = NULL; char *newcachedir; size_t cachedirlen; + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return(-1); + } /* verify cachedir ends in a '/' */ cachedirlen = strlen(cachedir); if(cachedir[cachedirlen-1] != '/') { @@ -434,6 +454,10 @@ int SYMEXPORT alpm_option_set_logfile(const char *logfile) ALPM_LOG_FUNC; + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return(-1); + } if(!logfile) { pm_errno = PM_ERR_WRONG_ARGS; return(-1); @@ -456,16 +480,28 @@ int SYMEXPORT alpm_option_set_logfile(const char *logfile) void SYMEXPORT alpm_option_set_usesyslog(int usesyslog) { + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return; + } handle->usesyslog = usesyslog; } void SYMEXPORT alpm_option_add_noupgrade(const char *pkg) { + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return; + } handle->noupgrade = alpm_list_add(handle->noupgrade, strdup(pkg)); } void SYMEXPORT alpm_option_set_noupgrades(alpm_list_t *noupgrade) { + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return; + } if(handle->noupgrade) FREELIST(handle->noupgrade); if(noupgrade) handle->noupgrade = noupgrade; } @@ -473,6 +509,10 @@ void SYMEXPORT alpm_option_set_noupgrades(alpm_list_t *noupgrade) int SYMEXPORT alpm_option_remove_noupgrade(const char *pkg) { char *vdata = NULL; + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return(-1); + } handle->noupgrade = alpm_list_remove_str(handle->noupgrade, pkg, &vdata); if(vdata != NULL) { FREE(vdata); @@ -495,6 +535,10 @@ void SYMEXPORT alpm_option_set_noextracts(alpm_list_t *noextract) int SYMEXPORT alpm_option_remove_noextract(const char *pkg) { char *vdata = NULL; + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return(-1); + } handle->noextract = alpm_list_remove_str(handle->noextract, pkg, &vdata); if(vdata != NULL) { FREE(vdata); @@ -505,11 +549,19 @@ int SYMEXPORT alpm_option_remove_noextract(const char *pkg) void SYMEXPORT alpm_option_add_ignorepkg(const char *pkg) { + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return; + } handle->ignorepkg = alpm_list_add(handle->ignorepkg, strdup(pkg)); } void SYMEXPORT alpm_option_set_ignorepkgs(alpm_list_t *ignorepkgs) { + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return; + } if(handle->ignorepkg) FREELIST(handle->ignorepkg); if(ignorepkgs) handle->ignorepkg = ignorepkgs; } @@ -517,6 +569,10 @@ void SYMEXPORT alpm_option_set_ignorepkgs(alpm_list_t *ignorepkgs) int SYMEXPORT alpm_option_remove_ignorepkg(const char *pkg) { char *vdata = NULL; + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return(-1); + } handle->ignorepkg = alpm_list_remove_str(handle->ignorepkg, pkg, &vdata); if(vdata != NULL) { FREE(vdata); @@ -527,11 +583,19 @@ int SYMEXPORT alpm_option_remove_ignorepkg(const char *pkg) void SYMEXPORT alpm_option_add_ignoregrp(const char *grp) { + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return; + } handle->ignoregrp = alpm_list_add(handle->ignoregrp, strdup(grp)); } void SYMEXPORT alpm_option_set_ignoregrps(alpm_list_t *ignoregrps) { + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return; + } if(handle->ignoregrp) FREELIST(handle->ignoregrp); if(ignoregrps) handle->ignoregrp = ignoregrps; } @@ -539,6 +603,10 @@ void SYMEXPORT alpm_option_set_ignoregrps(alpm_list_t *ignoregrps) int SYMEXPORT alpm_option_remove_ignoregrp(const char *grp) { char *vdata = NULL; + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return(-1); + } handle->ignoregrp = alpm_list_remove_str(handle->ignoregrp, grp, &vdata); if(vdata != NULL) { FREE(vdata); @@ -549,17 +617,29 @@ int SYMEXPORT alpm_option_remove_ignoregrp(const char *grp) void SYMEXPORT alpm_option_set_arch(const char *arch) { + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return; + } if(handle->arch) FREE(handle->arch); if(arch) handle->arch = strdup(arch); } void SYMEXPORT alpm_option_set_usedelta(int usedelta) { + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return; + } handle->usedelta = usedelta; } void SYMEXPORT alpm_option_set_checkspace(int checkspace) { + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return; + } handle->checkspace = checkspace; } -- 1.7.4.2

3 5

[pacman-dev] [PATCH] Create pacman keyring directory if missing
by Ray Kohler 28 Mar '11

28 Mar '11

Signed-off-by: Ray Kohler <ataraxia937(a)gmail.com> --- scripts/pacman-key.sh.in | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 5746e64..ccc7f92 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -246,6 +246,12 @@ if [[ GPGDIR=$(find_config "GPGDir") == 0 ]]; then fi GPG_PACMAN="gpg --homedir ${PACMAN_KEYRING_DIR}" +# Try to create $PACMAN_KEYRING_DIR if non-existent +# Check for simple existence rather than for a directory as someone may want +# to use a symlink here +# Force mode 700 as gpg complains if any group or other access is present +[[ -e ${PACMAN_KEYRING_DIR} ]] || mkdir -p -m 700 "${PACMAN_KEYRING_DIR}" + # Parse and execute command command="$1" if [[ -z "${command}" ]]; then -- 1.7.4.1

4 10

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.1-94-g4ef664f
by dan＠archlinux.org 28 Mar '11

28 Mar '11

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 4ef664f485559b0764271184a5305808b1a2e911 (commit) via c3ae209246804e9aebdc04c958548e340ff8998f (commit) via f6c8532fd04f334c35b3e860ee08d2cdee83a07c (commit) via c0190798e100a46997f58c6afe3598b91f80edda (commit) via 86ff381ac20df4317c1068fc82d556e74219ea9b (commit) from 4a3cd364d00b6889b24a16542618f1e2c14b86ac (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 4ef664f485559b0764271184a5305808b1a2e911 Author: Ray Kohler <ataraxia937(a)gmail.com> Date: Sun Mar 27 12:14:15 2011 -0400 Create pacman keyring directory if missing Use mode 755, so non-root users can see inside. Add "--no-permission-warning" to GPG_PACMAN to suppress the noise that otherwise comes of not using mode 700 - this is not private data. GPGme turns out not to issue this warning itself, so no problem there. TODO: should non-root users be allowed to use the read-only operations (--list, --export, --finger)? Signed-off-by: Ray Kohler <ataraxia937(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c3ae209246804e9aebdc04c958548e340ff8998f Author: Dan McGee <dan(a)archlinux.org> Date: Sun Mar 27 21:27:15 2011 -0500 Documentation formatting updates Be consistent in the Synopsis and Description sections with the use of quotes around command names. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f6c8532fd04f334c35b3e860ee08d2cdee83a07c Author: Ray Kohler <ataraxia937(a)gmail.com> Date: Fri Mar 25 20:26:08 2011 -0400 Add manpage for pkgdelta Signed-off-by: Ray Kohler <ataraxia937(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c0190798e100a46997f58c6afe3598b91f80edda Author: Ray Kohler <ataraxia937(a)gmail.com> Date: Fri Mar 25 20:26:07 2011 -0400 Update repo-add manpage Add -v, mention delta support (other than -d), and split repo-add-specific options out from those common to repo-add and repo-remove. Signed-off-by: Ray Kohler <ataraxia937(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 86ff381ac20df4317c1068fc82d556e74219ea9b Author: Ray Kohler <ataraxia937(a)gmail.com> Date: Sun Mar 27 22:04:40 2011 -0400 Clean up repo-add usage message This now includes -s and -v, tailors itself to the current command, and is formatted more like that of other pacman commands. Signed-off-by: Ray Kohler <ataraxia937(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/.gitignore | 1 + doc/Makefile.am | 4 +++ doc/index.txt | 1 + doc/makepkg.8.txt | 8 +++--- doc/pacman-key.8.txt | 4 +- doc/pkgdelta.8.txt | 42 ++++++++++++++++++++++++++++++++++++++++ doc/repo-add.8.txt | 48 ++++++++++++++++++++++++++------------------- scripts/pacman-key.sh.in | 7 +++++- scripts/repo-add.sh.in | 43 +++++++++++++++++++++++----------------- 9 files changed, 113 insertions(+), 45 deletions(-) create mode 100644 doc/pkgdelta.8.txt hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] Update repo-add manpage
by Ray Kohler 28 Mar '11

28 Mar '11

Add -v, mention delta support (other than -d), and split repo-add-specific options out from those common to repo-add and repo-remove. Signed-off-by: Ray Kohler <ataraxia937(a)gmail.com> --- doc/repo-add.8.txt | 46 +++++++++++++++++++++++++++------------------- 1 files changed, 27 insertions(+), 19 deletions(-) diff --git a/doc/repo-add.8.txt b/doc/repo-add.8.txt index 26009f6..9167a40 100644 --- a/doc/repo-add.8.txt +++ b/doc/repo-add.8.txt @@ -10,35 +10,28 @@ repo-add - package database maintenance utility Synopsis -------- -repo-add [-d] [-f] [-q] <path-to-db> <package1> [<package2> ...] +repo-add [-d] [-f] [-q] [-s] [-v] <path-to-db> <package|delta> [<package|delta> ...] -repo-remove [-q] <path-to-db> <packagename> [<packagename2> ...] +repo-remove [-q] [-s] [-v] <path-to-db> <packagename|delta> [<packagename|delta> ...] Description ----------- repo-add and repo-remove are two scripts to help build a package database for packages built with linkman:makepkg[8] and installed with linkman:pacman[8]. +They also handle package deltas produced by linkman:pkgdelta[8]. -repo-add will update a package database by reading a built package file. -Multiple packages to add can be specified on the command line. +repo-add will update a package database by reading a built package or package +delta file. Multiple packages and/or deltas to add can be specified on the +command line. -repo-remove will update a package database by removing the package name -specified on the command line. Multiple packages to remove can be specified -on the command line. +repo-remove will update a package database by removing the package name or +delta specified on the command line. Multiple packages and/or delta to remove +can be specified on the command line. -Options -------- -*-d, \--delta*:: - Automatically generate and add a delta file between the old entry and the - new one, if the old package file is found next to the new one. - -*-f, \--files*:: - Tells repo-add also to create and include a list of the files in the - specified packages. This is useful for creating databases listing all files - in a given sync repository for tools that may use this information. - +Common Options +-------------- *-q, \--quiet*:: Force this program to keep quiet and run silent except for warning and error messages. @@ -49,9 +42,24 @@ Options signature file, using the GPG agent if it is available. The signature file will be the entire filename of the database with a ``.sig'' extension. +*-v, \--verify*:: + Verify the PGP signature of the database before updating the database. + If the signature is invalid, an error is produced and the update does not + proceed. + +repo-add Options +---------------- +*-d, \--delta*:: + Automatically generate and add a delta file between the old entry and the + new one, if the old package file is found next to the new one. + +*-f, \--files*:: + Tells repo-add also to create and include a list of the files in the + specified packages. This is useful for creating databases listing all files + in a given sync repository for tools that may use this information. See Also -------- -linkman:makepkg[8], linkman:pacman[8] +linkman:makepkg[8], linkman:pacman[8], linkman:pkgdelta[8] include::footer.txt[] -- 1.7.4.1

2 3

[pacman-dev] [PATCH] Add -s --sign and -v --verify to repo-add usage message.
by Ray Kohler 28 Mar '11

28 Mar '11

There were not added to the end of the list as that would mean splitting the single gettext string that contains -f and the "see the man page" message, and I wanted to do as little string damage as possible. Signed-off-by: Ray Kohler <ataraxia937(a)gmail.com> --- scripts/repo-add.sh.in | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 9b57ba7..3d6d0c7 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -74,6 +74,11 @@ repo-remove will update a package database by removing the package name\n\ specified on the command line from the given repo database. Multiple\n\ packages to remove can be specified on the command line.\n\n")" printf "$(gettext "\ +Use the -s/--sign flag to sign the database with GnuPG after updating.\n\n")" + printf "$(gettext "\ +Use the -v/--verify flag to verify the GnuPG signature of the database\n\ +before updating.\n\n")" + printf "$(gettext "\ Use the -q/--quiet flag to minimize output to basic messages, warnings,\n\ and errors.\n\n")" printf "$(gettext "\ -- 1.7.4.1

3 13

[pacman-dev] heads-up - master branch compile failure with gcc-4.6
by Allan McRae 28 Mar '11

28 Mar '11

Just a heads-up that the upcoming gcc-4.6 release will cause a build failure when building with --enable-debug (which sets -Werror...) be_package.c: In function 'pkg_load': be_package.c:257:7: error: variable 'ret' set but not used [-Werror=unused-but-set-variable] cc1: all warnings being treated as errors Clearly something on the TODO list anyway! /* TODO: do something with ret value */ ret = _alpm_load_signature(pgpfile, &(newpkg->pgpsig)); Allan

2 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.1-89-g4a3cd36
by dan＠archlinux.org 28 Mar '11

28 Mar '11

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 4a3cd364d00b6889b24a16542618f1e2c14b86ac (commit) via 3f269503d53811cf45037022a263f2447e427a0b (commit) via 630b7b94c39ddc60d4e2b3c80d5d9f3101049b93 (commit) via 43dacceb6bba837aceba331c31ed8d8ee7a9e1d5 (commit) via c02556e2905dc1801d751db8cc3e96ccbedb76ab (commit) via a9fb4d9d5b065560f7e42378ad1ee3d2f7b19911 (commit) via 98c8ab18ff7f48bb2074d821ad93b009fd4bac4c (commit) via 33c08ac91e32e1c1fe135c42030f1a2b64a63a54 (commit) via fd64988c8085a410a80851e2b4b6b62ea59139c2 (commit) via 55f790ebe49ebf5a7d2084682735fd75f6d4903b (commit) via 283bf7e87cab1fa187334830fe2d05dd28bc5b77 (commit) via ea216d3f5a84814c512ab51ac37a4055b82032c3 (commit) via 68701a98aff46821e7e3440d5db233adbe249770 (commit) via 3bc3999bd25647f9b64ea4b4995cad54a8066cc1 (commit) via 5a9a570dda81148fd9ce8ea46b3c57befa8535fe (commit) via c40fc6b80d4a97e3333afab6d2ce8290aaa29c46 (commit) via 7f480ccc0de9438ef499685088a49b3c5964606b (commit) via e214b260efcba299611688bdbbc02b7391632d43 (commit) from 86e7f6075671e08c456f389d8ecba47190c03f0f (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 4a3cd364d00b6889b24a16542618f1e2c14b86ac Author: Dan McGee <dan(a)archlinux.org> Date: Sun Mar 27 20:48:26 2011 -0500 Temporary fix for new warnings from gcc 4.6 Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3f269503d53811cf45037022a263f2447e427a0b Merge: 630b7b9 ea216d3 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Mar 27 20:41:23 2011 -0500 Merge branch 'maint' Conflicts: lib/libalpm/deps.c commit 630b7b94c39ddc60d4e2b3c80d5d9f3101049b93 Author: Ray Kohler <ataraxia937(a)gmail.com> Date: Fri Mar 25 19:25:38 2011 -0400 Sign database even if empty Move the create_signature() call outside the case of non-empty databases, so it will be called regardless. Signed-off-by: Ray Kohler <ataraxia937(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 43dacceb6bba837aceba331c31ed8d8ee7a9e1d5 Author: Ray Kohler <ataraxia937(a)gmail.com> Date: Fri Mar 25 21:32:21 2011 -0400 makepkg: allow PKGEXT and SRCEXT to be overridden by env variables Signed-off-by: Ray Kohler <ataraxia937(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c02556e2905dc1801d751db8cc3e96ccbedb76ab Author: Dave Reisner <d(a)falconindy.com> Date: Thu Mar 24 10:10:05 2011 -0400 Rely on the return value of type instead of its output Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a9fb4d9d5b065560f7e42378ad1ee3d2f7b19911 Author: Dave Reisner <d(a)falconindy.com> Date: Fri Mar 25 09:15:30 2011 -0400 lib/dload: abstract out helper function to set utimes This greatly simplifies the cleanup fallthrough in our download function and we'll be able to reuse this for signatures. Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 98c8ab18ff7f48bb2074d821ad93b009fd4bac4c Author: Dave Reisner <d(a)falconindy.com> Date: Fri Mar 25 08:49:13 2011 -0400 lib/dload: remove proxy debug output Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 33c08ac91e32e1c1fe135c42030f1a2b64a63a54 Author: Dave Reisner <d(a)falconindy.com> Date: Fri Mar 25 08:45:54 2011 -0400 lib/dload: code simplification Based on the fact that localf always points to the same file, there's no need to code in multiple fopen calls with varying results. Instead, track the desired file open mode and make a single call to fopen. Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fd64988c8085a410a80851e2b4b6b62ea59139c2 Author: Dave Reisner <d(a)falconindy.com> Date: Fri Mar 25 08:37:02 2011 -0400 lib/dload: merge get_{destfile,tempfile} into get_fullpath Create a more general function that allows appending a suffix to a filepath. Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 55f790ebe49ebf5a7d2084682735fd75f6d4903b Author: Dave Reisner <d(a)falconindy.com> Date: Thu Mar 17 18:33:34 2011 -0400 pacman/pacman.c: fix setting of useragent string libcurl doesn't natively honor the HTTP_USER_AGENT environment variable. Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 283bf7e87cab1fa187334830fe2d05dd28bc5b77 Author: Dave Reisner <d(a)falconindy.com> Date: Mon Mar 21 16:54:00 2011 -0400 lib/dload: pass a struct with filename and size to curl_progress This lets us determine the real size of the file on disk so that we can properly bump the progress bar when we're resuming a download. Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/pacscripts.in | 2 +- lib/libalpm/be_package.c | 5 +- lib/libalpm/db.c | 1 + lib/libalpm/deps.c | 176 ++++++++++++++++++++------------------- lib/libalpm/deps.h | 6 -- lib/libalpm/dload.c | 135 +++++++++++++++--------------- lib/libalpm/dload.h | 6 ++ lib/libalpm/package.c | 16 ++-- scripts/makepkg.sh.in | 8 ++- scripts/pacman-db-upgrade.sh.in | 6 +- scripts/repo-add.sh.in | 7 +- src/pacman/pacman.c | 17 ++-- test/util/vercmptest.sh | 2 +- 13 files changed, 201 insertions(+), 186 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.1-10-gea216d3
by dan＠archlinux.org 28 Mar '11

28 Mar '11

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 ea216d3f5a84814c512ab51ac37a4055b82032c3 (commit) via 68701a98aff46821e7e3440d5db233adbe249770 (commit) via 3bc3999bd25647f9b64ea4b4995cad54a8066cc1 (commit) via 5a9a570dda81148fd9ce8ea46b3c57befa8535fe (commit) via c40fc6b80d4a97e3333afab6d2ce8290aaa29c46 (commit) via 7f480ccc0de9438ef499685088a49b3c5964606b (commit) via e214b260efcba299611688bdbbc02b7391632d43 (commit) from c37c9c5dcae06c1585b4da4c0b838f5b44e1498e (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 ea216d3f5a84814c512ab51ac37a4055b82032c3 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Mar 27 20:03:08 2011 -0500 Clarify error message in pacman-db-upgrade Addresses FS#23451. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 68701a98aff46821e7e3440d5db233adbe249770 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Mar 25 15:37:18 2011 -0500 Ensure reported missing dependencies show correct version comparison This addresses FS#23424. The -dd backend code was introduced in commit b6ec9019d77, and unfortunately the munged depend used for comparison did not carry through to the eventual display of this version. To fix this, we undo some of the depcmp_tolerant() business introduced, and instead make a new pmdepend_t object if necessary when the no dependency version flag is set. This results in the correct depend being copied to the missing depend passed onto the frontend. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3bc3999bd25647f9b64ea4b4995cad54a8066cc1 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Mar 25 14:45:42 2011 -0500 Mark various functions in deps.c static Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5a9a570dda81148fd9ce8ea46b3c57befa8535fe Author: Dan McGee <dan(a)archlinux.org> Date: Fri Mar 25 14:38:39 2011 -0500 Move alpm_find_dbs_satisfier() function down in deps.c This will make sense for a later commit when static/non-static properties of other functions are changed. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c40fc6b80d4a97e3333afab6d2ce8290aaa29c46 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Mar 25 15:34:39 2011 -0500 Rework find_requiredby() to not use _alpm_dep_edge() And move the sort after the final loop; we don't need to sort once for each database we look at. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7f480ccc0de9438ef499685088a49b3c5964606b Author: Dan McGee <dan(a)archlinux.org> Date: Fri Mar 25 14:51:31 2011 -0500 Don't include version in dep string if mod == ANY Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e214b260efcba299611688bdbbc02b7391632d43 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Mar 25 13:47:27 2011 -0500 Update usage instruction strings * Address FS#23433 by documenting -d vs. -dd * Drop the useless "as well", "also", "too", and "that won't break packages" strings from -R usage * Fix alignment of multiline strings in source (no string change) Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/deps.c | 176 ++++++++++++++++++++------------------- lib/libalpm/deps.h | 6 -- lib/libalpm/package.c | 16 ++-- scripts/pacman-db-upgrade.sh.in | 6 +- src/pacman/pacman.c | 17 ++-- 5 files changed, 113 insertions(+), 108 deletions(-) hooks/post-receive -- The official pacman repository

1 0