- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] HoldPkg rework
by Nagy Gabor 24 Aug '08

24 Aug '08

From f6af53eed61c3088d756cba021b03266a0702ce8 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun, 24 Aug 2008 23:24:53 +0200 Subject: [PATCH] HoldPkg rework The HoldPkg feature is even more important when the packages to be held are pulled automatically by pacman, in a -Rc and -Rs operation. Before, it only applied when the packages were explicitly requested by the user to be removed. This patch extends holdpkg to -Rc and -Rs by doing the HoldPkg check just before trans_commit. Additionally, the whole HoldPkg stuff was moved to the front-end. I changed the default behavior to "don't remove", so I modified remove030.py pactest as well. See also: FS#9173. Original-work-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/alpm.h | 10 +--------- lib/libalpm/error.c | 3 --- lib/libalpm/handle.c | 32 -------------------------------- lib/libalpm/handle.h | 1 - lib/libalpm/remove.c | 10 ---------- pactest/tests/remove030.py | 6 ++---- src/pacman/callback.c | 4 ---- src/pacman/conf.c | 2 ++ src/pacman/conf.h | 1 + src/pacman/pacman.c | 7 ++++++- src/pacman/remove.c | 15 +++++++++++++++ 11 files changed, 27 insertions(+), 64 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index cdceaf0..7ef6a81 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -132,11 +132,6 @@ void alpm_option_add_ignorepkg(const char *pkg); void alpm_option_set_ignorepkgs(alpm_list_t *ignorepkgs); int alpm_option_remove_ignorepkg(const char *pkg); -alpm_list_t *alpm_option_get_holdpkgs(); -void alpm_option_add_holdpkg(const char *pkg); -void alpm_option_set_holdpkgs(alpm_list_t *holdpkgs); -int alpm_option_remove_holdpkg(const char *pkg); - alpm_list_t *alpm_option_get_ignoregrps(); void alpm_option_add_ignoregrp(const char *grp); void alpm_option_set_ignoregrps(alpm_list_t *ignoregrps); @@ -378,9 +373,7 @@ typedef enum _pmtransconv_t { PM_TRANS_CONV_REPLACE_PKG = 0x02, PM_TRANS_CONV_CONFLICT_PKG = 0x04, PM_TRANS_CONV_CORRUPTED_PKG = 0x08, - PM_TRANS_CONV_LOCAL_NEWER = 0x10, - /* 0x20 flag can go here */ - PM_TRANS_CONV_REMOVE_HOLDPKG = 0x40 + PM_TRANS_CONV_LOCAL_NEWER = 0x10 } pmtransconv_t; /* Transaction Progress */ @@ -524,7 +517,6 @@ enum _pmerrno_t { PM_ERR_INTERNAL_ERROR, PM_ERR_DB_SYNC, PM_ERR_RETRIEVE, - PM_ERR_PKG_HOLD, PM_ERR_INVALID_REGEX, /* External library errors */ PM_ERR_LIBARCHIVE, diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index 05caf8e..5b87950 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -143,9 +143,6 @@ const char SYMEXPORT *alpm_strerror(int err) return _("user aborted the operation"); case PM_ERR_INTERNAL_ERROR: return _("internal error"); - case PM_ERR_PKG_HOLD: - /* TODO wow this is not descriptive at all... what does this mean? */ - return _("not confirmed"); case PM_ERR_INVALID_REGEX: return _("invalid regular expression"); /* Errors from external libraries- our own wrapper error */ diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index af1cc78..fbfe7bf 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -92,7 +92,6 @@ void _alpm_handle_free(pmhandle_t *handle) FREELIST(handle->noupgrade); FREELIST(handle->noextract); FREELIST(handle->ignorepkg); - FREELIST(handle->holdpkg); FREELIST(handle->ignoregrp); FREE(handle); } @@ -205,15 +204,6 @@ alpm_list_t SYMEXPORT *alpm_option_get_ignorepkgs() return handle->ignorepkg; } -alpm_list_t SYMEXPORT *alpm_option_get_holdpkgs() -{ - if (handle == NULL) { - pm_errno = PM_ERR_HANDLE_NULL; - return NULL; - } - return handle->holdpkg; -} - alpm_list_t SYMEXPORT *alpm_option_get_ignoregrps() { if (handle == NULL) { @@ -516,28 +506,6 @@ int SYMEXPORT alpm_option_remove_ignorepkg(const char *pkg) return(0); } -void SYMEXPORT alpm_option_add_holdpkg(const char *pkg) -{ - handle->holdpkg = alpm_list_add(handle->holdpkg, strdup(pkg)); -} - -void SYMEXPORT alpm_option_set_holdpkgs(alpm_list_t *holdpkgs) -{ - if(handle->holdpkg) FREELIST(handle->holdpkg); - if(holdpkgs) handle->holdpkg = holdpkgs; -} - -int SYMEXPORT alpm_option_remove_holdpkg(const char *pkg) -{ - char *vdata = NULL; - handle->holdpkg = alpm_list_remove_str(handle->holdpkg, pkg, &vdata); - if(vdata != NULL) { - FREE(vdata); - return(1); - } - return(0); -} - void SYMEXPORT alpm_option_add_ignoregrp(const char *grp) { handle->ignoregrp = alpm_list_add(handle->ignoregrp, strdup(grp)); diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index bec0a6f..ad7666d 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -52,7 +52,6 @@ typedef struct _pmhandle_t { alpm_list_t *noupgrade; /* List of packages NOT to be upgraded */ alpm_list_t *noextract; /* List of files NOT to extract */ alpm_list_t *ignorepkg; /* List of packages to ignore */ - alpm_list_t *holdpkg; /* List of packages which 'hold' pacman */ alpm_list_t *ignoregrp; /* List of groups to ignore */ /* options */ diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 864fafa..b7f04a3 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -65,16 +65,6 @@ int _alpm_remove_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name) RET_ERR(PM_ERR_PKG_NOT_FOUND, -1); } - /* ignore holdpkgs on upgrade */ - if((trans == handle->trans) - && alpm_list_find_str(handle->holdpkg, info->name)) { - int resp = 0; - QUESTION(trans, PM_TRANS_CONV_REMOVE_HOLDPKG, info, NULL, NULL, &resp); - if(!resp) { - RET_ERR(PM_ERR_PKG_HOLD, -1); - } - } - _alpm_log(PM_LOG_DEBUG, "adding %s in the targets list\n", info->name); trans->packages = alpm_list_add(trans->packages, _alpm_pkg_dup(info)); diff --git a/pactest/tests/remove030.py b/pactest/tests/remove030.py index 9e2b9da..e975a4b 100644 --- a/pactest/tests/remove030.py +++ b/pactest/tests/remove030.py @@ -7,7 +7,5 @@ self.option["HoldPkg"] = ["dummy"] self.args = "-R %s" % p1.name -self.addrule("PACMAN_RETCODE=0") -self.addrule("!PKG_EXIST=dummy") -self.addrule("!FILE_EXIST=etc/dummy.conf") -self.addrule("!FILE_PACSAVE=etc/dummy.conf") +self.addrule("PACMAN_RETCODE=1") +self.addrule("PKG_EXIST=dummy") diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 3c98d39..e5404d5 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -260,10 +260,6 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, alpm_pkg_get_name(data1)); } break; - case PM_TRANS_CONV_REMOVE_HOLDPKG: - *response = yesno(_(":: %s is designated as a HoldPkg. Remove anyway?"), - alpm_pkg_get_name(data1)); - break; case PM_TRANS_CONV_REPLACE_PKG: *response = yesno(_(":: Replace %s with %s/%s?"), alpm_pkg_get_name(data1), diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 48c927b..40746e5 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -47,6 +47,7 @@ config_t *config_new(void) newconfig->rootdir = NULL; newconfig->dbpath = NULL; newconfig->logfile = NULL; + newconfig->holdpkg = NULL; newconfig->syncfirst = NULL; return(newconfig); @@ -58,6 +59,7 @@ int config_free(config_t *oldconfig) return(-1); } + FREELIST(oldconfig->holdpkg); FREELIST(oldconfig->syncfirst); free(oldconfig->configfile); free(oldconfig->rootdir); diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 8ea6662..466d983 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -69,6 +69,7 @@ typedef struct __config_t { * downloaded of the total download list */ unsigned short totaldownload; unsigned short cleanmethod; /* select -Sc behavior */ + alpm_list_t *holdpkg; alpm_list_t *syncfirst; } config_t; diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 83e713a..92feaf7 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -524,6 +524,11 @@ static int parseargs(int argc, char *argv[]) } /* helper for being used with setrepeatingoption */ +static void option_add_holdpkg(const char *name) { + config->holdpkg = alpm_list_add(config->holdpkg, strdup(name)); +} + +/* helper for being used with setrepeatingoption */ static void option_add_syncfirst(const char *name) { config->syncfirst = alpm_list_add(config->syncfirst, strdup(name)); } @@ -675,7 +680,7 @@ static int _parseconfig(const char *file, const char *givensection, } else if(strcmp(key, "IgnoreGroup") == 0) { setrepeatingoption(ptr, "IgnoreGroup", alpm_option_add_ignoregrp); } else if(strcmp(key, "HoldPkg") == 0) { - setrepeatingoption(ptr, "HoldPkg", alpm_option_add_holdpkg); + setrepeatingoption(ptr, "HoldPkg", option_add_holdpkg); } else if(strcmp(key, "SyncFirst") == 0) { setrepeatingoption(ptr, "SyncFirst", option_add_syncfirst); } else if(strcmp(key, "DBPath") == 0) { diff --git a/src/pacman/remove.c b/src/pacman/remove.c index b70f703..841a08b 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -121,6 +121,21 @@ int pacman_remove(alpm_list_t *targets) goto cleanup; } + /* Search for holdpkg in target list */ + int holdpkg = 0; + for(i = alpm_trans_get_pkgs(); i; i = alpm_list_next(i)) { + pmpkg_t *pkg = alpm_list_getdata(i); + if(alpm_list_find_str(config->holdpkg, alpm_pkg_get_name(pkg))) { + pm_printf(PM_LOG_WARNING, _("%s is designated as a HoldPkg.\n"), + alpm_pkg_get_name(pkg)); + holdpkg = 1; + } + } + if(holdpkg && (noyes(_("HoldPkg was found in target list. Do you want to continue?")) == 0)) { + retval = 1; + goto cleanup; + } + /* Warn user in case of dangerous operation */ if(config->flags & PM_TRANS_FLAG_RECURSE || config->flags & PM_TRANS_FLAG_CASCADE) { -- 1.6.0

2 1

[pacman-dev] Advices for all translators
by Xavier 24 Aug '08

24 Aug '08

On Sun, Aug 24, 2008 at 1:14 PM, Matthias Gorissen <matthias(a)archlinux.de> wrote: > I am very sorry for being late to the party, it took some time to find the > changes. > You don't use any po helper? Maybe you should. There are several dedicated applications : poedit, gtranslator, kbabel, etc Personally, I use a vim plugin : http://vim.sourceforge.net/scripts/script.php?script_id=695 All of these should allow you to find the untranslated and fuzzy messages, and to find eventual errors. Otherwise, using msgfmt manually can also help. to check if the file is fully translated : msgfmt --statistic <po file> to check the file doesn't contain any errors (like missing %s) : msgfmt -c <po file> The last one would for example have detected the error made in Spanish and Russian translation.

3 5

[pacman-dev] [PATCH] makepkg : allow to specify a download filename
by Xavier Chantry 24 Aug '08

24 Aug '08

A source entry can now have the following form, to specify a different filename : "filename::http://path/to/file" Of course, the old syntax is still supported : "http://path/to/file" And as before, in the second case, the filename used is simply "file". This fixes FS#11292, because handling multiple source files with the same name is now possible (just choose a different filename). But it will also allow to deal much more nicely with funny url like this by using a sane filename (and unfortunately, there are quite a few) : http://www.vim.org/scripts/download_script.php?src_id=6992 Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- doc/PKGBUILD.5.txt | 4 ++++ scripts/makepkg.sh.in | 35 ++++++++++++++++++++++++----------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index cf6eb23..743eba1 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -87,6 +87,10 @@ similar to `$_basekernver`. variables if possible when specifying the download location. Any files that are compressed will automatically be extracted, unless found in the noextract array listed below. + + + It is possible to specify an optional filename, which is practical with + some weird url, and also for handling multiple source files with the same + name : `source=('filename::url')` *noextract (array)*:: An array of filenames corresponding to those from the source array. Files diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ddf6cd8..d30713f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -163,11 +163,23 @@ trap 'trap_exit "$(gettext "TERM signal caught. Exiting...")"' TERM HUP QUIT trap 'trap_exit "$(gettext "Aborted by user! Exiting...")"' INT trap 'trap_exit "$(gettext "An unknown error has occured. Exiting...")"' ERR - -strip_url() { - echo "$1" | sed 's|^.*://.*/||g' +# a source entry can have two forms : +# 1) "filename::http://path/to/file" +# 2) "http://path/to/file" + +# extract the filename from a source entry +get_filename() { + # if a filename is specified, use it + local filename=$(echo $1 | sed 's|::.*||') + # if it is just an url, we only keep the last component + echo "$filename" | sed 's|^.*://.*/||g' } +# extract the url from a source entry +get_url() { + # strip an eventual filename + echo $1 | sed 's|.*::||' +} ## # Checks to see if options are present in makepkg.conf or PKGBUILD; @@ -418,7 +430,8 @@ download_sources() { local netfile for netfile in "${source[@]}"; do - local file=$(strip_url "$netfile") + local file=$(get_filename "$netfile") + local url=$(get_url "$netfile") if [ -f "$startdir/$file" ]; then msg2 "$(gettext "Found %s in build dir")" "$file" rm -f "$srcdir/$file" @@ -432,18 +445,18 @@ download_sources() { fi # if we get here, check to make sure it was a URL, else fail - if [ "$file" = "$netfile" ]; then + if [ "$file" = "$url" ]; then error "$(gettext "%s was not found in the build directory and is not a URL.")" "$netfile" exit 1 # $E_MISSING_FILE fi # find the client we should use for this URL - local dlclient=$(get_downloadclient "$netfile") || exit $? + local dlclient=$(get_downloadclient "$url") || exit $? msg2 "$(gettext "Downloading %s...")" "$file" # fix flyspray bug #3289 local ret=0 - download_file "$dlclient" "$netfile" "$file" || ret=$? + download_file "$dlclient" "$url" "$file" || ret=$? if [ $ret -gt 0 ]; then error "$(gettext "Failure while downloading %s")" "$file" plain "$(gettext "Aborting...")" @@ -491,7 +504,7 @@ generate_checksums() { local netfile for netfile in "${source[@]}"; do - local file="$(strip_url "$netfile")" + local file="$(get_filename "$netfile")" if [ ! -f "$file" ] ; then if [ ! -f "$SRCDEST/$file" ] ; then @@ -529,7 +542,7 @@ check_checksums() { local idx=0 local file for file in "${source[@]}"; do - file="$(strip_url "$file")" + file="$(get_filename "$file")" echo -n " $file ... " >&2 if [ ! -f "$file" ] ; then @@ -574,7 +587,7 @@ extract_sources() { msg "$(gettext "Extracting Sources...")" local netfile for netfile in "${source[@]}"; do - file=$(strip_url "$netfile") + file=$(get_filename "$netfile") if in_array "$file" ${noextract[@]}; then #skip source files in the noextract=() array # these are marked explicitly to NOT be extracted @@ -957,7 +970,7 @@ create_srcpackage() { local netfile for netfile in "${source[@]}"; do - local file=$(strip_url "$netfile") + local file=$(get_filename "$netfile") if [ -f "$netfile" ]; then msg2 "$(gettext "Adding %s...")" "$netfile" ln -s "${startdir}/$netfile" "${srclinks}/${pkgname}" -- 1.6.0

4 9

Re: [pacman-dev] [aur-general] makepkg 3.2.1 testing
by Allan McRae 24 Aug '08

24 Aug '08

G_Syme wrote: > On Sunday 24 August 2008 03:42:05 Xavier wrote: > >> [...] >> For FS#11292 (handling multiple source files which have the same >> name), a new feature had to be introduced. >> it is now possible to use the filename of your choice for remote >> sources, like this : >> source=('filename::http://path/to/file') >> This allows to handle multiple source files with same name, and also >> to handle more nicely weird URLs like >> http://www.vim.org/scripts/download_script.php?src_id=6992. >> > > I've tried the above feature with a modified version of my > eclipse-subversive-svn-connector package (attached). > I used the PKGBUILD you attached and it worked fine. I also tested with and without SRCDEST set in case that somehow caused it. > I've got the following behavior from makepkg: > After clearing my local makepkg source cache I try to run: > > $ makepkg -g > ==> Retrieving Sources... > -> Downloading feature.jar... > --2008-08-24 10:22:46-- http://www.polarion.org/projects/subversive/download/eclipse/2.0/update-sit… > Resolving www.polarion.org... 212.227.210.100 > Connecting to www.polarion.org|212.227.210.100|:80... connected. > HTTP request sent, awaiting response... 200 OK > Length: 16510 (16K) [application/java-archive] > Saving to: `org.polarion.eclipse.team.svn.connector_2.0.3.I20080814-1500.jar' > > 100%[======================================>] 16,510 --.-K/s in 0.1s > > 2008-08-24 10:22:47 (109 KB/s) - `org.polarion.eclipse.team.svn.connector_2.0.3.I20080814-1500.jar' saved [16510/16510] > What is really strange here is that makepkg isn't even saving the file to <name>.part. I don't understand this. Allan

2 2

[pacman-dev] [translation] de-version for 3.2.1
by Matthias Gorissen 24 Aug '08

24 Aug '08

I am very sorry for being late to the party, it took some time to find the changes.

1 0

[pacman-dev] [translation] Czech translation for 3.2.1
by Vojtěch Gondžala 24 Aug '08

24 Aug '08

Czech translation for 3.2.1 is attached. -- Vojtěch „vogo“ Gondžala

1 0

[pacman-dev] [translation] Russian translation for pacman 3.2.1
by serg 24 Aug '08

24 Aug '08

Hi :) This is translation for the 3.2.1 release

3 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.0-46-ga4100b3
by dan＠archlinux.org 23 Aug '08

23 Aug '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 a4100b384737d6b422a31eb0f6614b4f5f6070cb (commit) via 14203d77f43c02e60770dcbd4a9cb2b39b38bcd6 (commit) via ec928faad350e2aad957256fb47cb10277990738 (commit) via 4b183bf9a9702b63cb8b031887d0f6bd38e538e3 (commit) via 7e8f1469c4168875b54956d63884b8583ce99e38 (commit) via 68e59ecbaf5ab4b0ba8684ea8ce29ef90df84d7a (commit) via 91eeee08de706f4f1ab42eeb6996997691cd4255 (commit) via 05d23059fd960fdab23a3aa99b79591fda250a6f (commit) via f56d7635473d207c2fe734718fe406ffb2a56abc (commit) via 8f99f75e6edb409cd048019a464fc8fd139e0dc9 (commit) via 4b4ad18348f59393024a8a702e97983a2c692e42 (commit) via b0b5dabf1bbf5f3a6ba8476651356fed103f8781 (commit) via 31c7e82a51b70e886f929b0489c66dfdb9aa7815 (commit) via 496b687c3d4a56641051700e7c4e5e21b9c6607c (commit) via baf58525553db8f1e680de16793b147c88df59e2 (commit) via 8146f6f1c6bbd7bf642cb263ca1658234fb7e48a (commit) via adc4078b8743a1437d44557dafea8619b1ce0fb1 (commit) via 7865fb9af487f7ca043cab6e90c3aee0863e285b (commit) via 3ff7701e89f3193f8ea57a5910ae508a2aed65a3 (commit) via b3033a59e922684a41b00bd94f8976995dd015da (commit) from 5b51dbb11e2087e1055be24b486502be806b5e13 (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 a4100b384737d6b422a31eb0f6614b4f5f6070cb Merge: 14203d77f43c02e60770dcbd4a9cb2b39b38bcd6 68e59ecbaf5ab4b0ba8684ea8ce29ef90df84d7a Author: Dan McGee <dan(a)archlinux.org> Date: Sat Aug 23 18:28:58 2008 -0500 Merge branch 'maint' commit 14203d77f43c02e60770dcbd4a9cb2b39b38bcd6 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Aug 17 13:45:05 2008 +0200 Allow sync200 pactest to pass without libdownload. This was a stupid and unimportant regression caused by commit 4476598e4e128f4595d5383ecb51a9576a447b5b . When libdownload is not available, a xfercommand is needed for this pactest to run properly. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ec928faad350e2aad957256fb47cb10277990738 Author: Henning Garus <henning.garus(a)googlemail.com> Date: Fri Aug 15 00:42:23 2008 +0200 Add autotools magic for pactests Added a Makefile.am for the pactest/tests dir. This is a blatant ripoff of scripts/Makefile.am, which replaces predefined expressions in NAME.py.in pactests with configure variables. This can be used to write pactests which consider compile time options. Signed-off-by: Henning Garus <henning.garus(a)gmail.com> [Dan: autotools are tough, make a few adjustments for correctness] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4b183bf9a9702b63cb8b031887d0f6bd38e538e3 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Thu Aug 7 17:08:33 2008 +0200 makepkg : add --config option for an alternate config file. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7e8f1469c4168875b54956d63884b8583ce99e38 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Aug 20 23:01:47 2008 +0200 Remove DB_COMPRESSION and DB_CHECKSUMS from makepkg.conf DB_COMPRESSION was only used in repo-add and DB_CHECKSUMS was not used anywhere. This also removes the dependency on makepkg.conf in repo-add, so repo-add no longer needs to source makepkg.conf And instead of DB_COMPRESSION, it seems better to just check the extension of the repository file. It does not make sense to have a tar.gz file with a tar.bz2 extension or whatever. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 496b687c3d4a56641051700e7c4e5e21b9c6607c Author: Dan McGee <dan(a)archlinux.org> Date: Sat Aug 23 10:19:17 2008 -0500 makepkg: check all integrity sums found in the PKGBUILD Currently we use the INTEGRITY_CHECK array from makepkg.conf to limit both the integrity sums generated and checked. It doesn't make a whole lot of sense to ignore integrity sums that are present in a PKGBUILD, so this patch will enable checking any that are available, but will only print a warning about missing sums for those types found in INTEGRITY_CHECK. It also adds a slight optimization of checking for openssl- we only need to check once now because we use the same program for all checks. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit baf58525553db8f1e680de16793b147c88df59e2 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun Aug 17 19:23:12 2008 +0200 Move -Sp implementation to the front-end This patch kills one of our hackish pseudo transactions: PRINTURIS. (The other one is -Sw) From now on, front-end must not call trans_commit in case of -Sp, it should print the uris of target packages "by hand" instead. PRINTURIS flag was removed, NOCONFLICTS flag can be passed to skip conflict checks. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8146f6f1c6bbd7bf642cb263ca1658234fb7e48a Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun Aug 17 18:32:39 2008 +0200 New public alpm_pkg_get_db function This function returns with the origin database of a package. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit adc4078b8743a1437d44557dafea8619b1ce0fb1 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Aug 20 22:08:11 2008 +0200 split yesno() into yesno() and noyes() functions. The yesno function had a preset argument for specifying the default answer : yes or no. However, in all our calls to yesno, only one used the default "no" answer. Having to specify preset==1 for all the other cases was rather cumbersome. To make this easier, this commit adds a noyes function, with the following behavior : yesno() : default answer is yes noyes() : default answer is no Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7865fb9af487f7ca043cab6e90c3aee0863e285b Author: Allan McRae <allan(a)archlinux.org> Date: Wed Aug 13 03:00:18 2008 +1000 Treat info pages like man pages As far a package building is concerned, info pages need to be treated in the same fashion as man pages in that they both can be compressed. This separates them from other forms of documentation and so it makes sense to make that distinction within makepkg. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3ff7701e89f3193f8ea57a5910ae508a2aed65a3 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Wed Jul 30 23:36:46 2008 +0200 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> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b3033a59e922684a41b00bd94f8976995dd015da Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jul 31 21:16:30 2008 -0500 pactest: remove need for pause when running tests Instead of pausing 1.5 seconds on tests that check file mtimes, change the mtimes to something in the far past so we can immediately tell if a file was modified and/or touched. This saves a decent amount of time on the upgrade tests which often check mtimes. 355 was a completely arbitrary time value, don't ask me why I picked it. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: TRANSLATORS | 2 +- configure.ac | 1 + doc/PKGBUILD.5.txt | 6 +- doc/makepkg.8.txt | 3 + doc/makepkg.conf.5.txt | 8 +- etc/makepkg.conf.in | 4 +- lib/libalpm/add.c | 11 ++- lib/libalpm/alpm.h | 7 +- lib/libalpm/package.c | 9 ++ lib/libalpm/po/cs.po | 21 +++-- lib/libalpm/po/de.po | 21 +++-- lib/libalpm/po/en_GB.po | 23 +++--- lib/libalpm/po/es.po | 52 ++++++------ lib/libalpm/po/fr.po | 23 +++--- lib/libalpm/po/hu.po | 18 ++-- lib/libalpm/po/it.po | 30 ++++--- lib/libalpm/po/libalpm.pot | 18 ++-- lib/libalpm/po/pl.po | 21 +++-- lib/libalpm/po/pt_BR.po | 21 +++-- lib/libalpm/po/ru.po | 21 +++-- lib/libalpm/po/tr.po | 21 +++-- lib/libalpm/po/zh_CN.po | 21 +++-- lib/libalpm/sync.c | 47 +++++------- pactest/Makefile.am | 3 +- pactest/pmenv.py | 8 +- pactest/pmfile.py | 8 ++ pactest/tests/Makefile.am | 26 ++++++ pactest/tests/{sync200.py => sync200.py.in} | 3 + po/cs.po | 46 ++++++++--- po/de.po | 47 ++++++++--- po/en_GB.po | 50 ++++++++---- po/es.po | 81 ++++++++++++------- po/fr.po | 56 +++++++++----- po/hu.po | 42 +++++++--- po/it.po | 53 ++++++++---- po/pacman.pot | 33 ++++++-- po/pl.po | 51 ++++++++---- po/pt_BR.po | 47 ++++++++--- po/ru.po | 49 ++++++++--- po/tr.po | 47 ++++++++--- po/zh_CN.po | 43 +++++++--- scripts/makepkg.sh.in | 116 ++++++++++++++------------- scripts/repo-add.sh.in | 21 +---- src/pacman/callback.c | 17 ++--- src/pacman/conf.h | 1 + src/pacman/pacman.c | 3 +- src/pacman/remove.c | 6 +- src/pacman/sync.c | 57 ++++++++------ src/pacman/util.c | 33 ++++++-- src/pacman/util.h | 3 +- 50 files changed, 848 insertions(+), 511 deletions(-) create mode 100644 pactest/tests/Makefile.am rename pactest/tests/{sync200.py => sync200.py.in} (78%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Quiet up the make process a bit
by Dan McGee 23 Aug '08

23 Aug '08

When we do our sed edits, we really don't need every command printed out to the terminal. Now with "make -s", the output is quite palatable. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- etc/Makefile.am | 7 ++++--- pactest/tests/Makefile.am | 11 ++++++----- scripts/Makefile.am | 15 ++++++++------- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/etc/Makefile.am b/etc/Makefile.am index b4f4972..55c28c3 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -20,9 +20,10 @@ edit = sed \ -e 's|@ROOTDIR[@]|$(ROOTDIR)|g' $(dist_sysconf_DATA): Makefile - rm -f $@ $@.tmp - $(edit) `test -f ./$@.in || echo $(srcdir)/`$@.in >$@.tmp - mv $@.tmp $@ + @echo ' ' GEN $@; + @rm -f $@ $@.tmp + @$(edit) `test -f ./$@.in || echo $(srcdir)/`$@.in >$@.tmp + @mv $@.tmp $@ makepkg.conf: $(srcdir)/makepkg.conf.in pacman.conf: $(srcdir)/pacman.conf.in diff --git a/pactest/tests/Makefile.am b/pactest/tests/Makefile.am index 42ca5cb..b793687 100644 --- a/pactest/tests/Makefile.am +++ b/pactest/tests/Makefile.am @@ -17,10 +17,11 @@ edit = sed \ $(CONFTESTS): Makefile - rm -f $@ $@.tmp - test -f $(srcdir)/$@.in && $(edit) $(srcdir)/$@.in >$@.tmp || true - test -f $@.tmp || false - chmod a-w $@.tmp - mv $@.tmp $@ + @echo ' ' GEN $@; + @rm -f $@ $@.tmp + @test -f $(srcdir)/$@.in && $(edit) $(srcdir)/$@.in >$@.tmp || true + @test -f $@.tmp || false + @chmod a-w $@.tmp + @mv $@.tmp $@ # vim:set ts=2 sw=2 noet: diff --git a/scripts/Makefile.am b/scripts/Makefile.am index fd8fab7..014ae87 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -46,13 +46,14 @@ edit = sed \ # two 'test' lines- make sure we can handle both sh and py type scripts # third 'test' line- make sure one of the two checks succeeded $(OURSCRIPTS): Makefile - rm -f $@ $@.tmp - test -f $(srcdir)/$@.sh.in && $(edit) $(srcdir)/$@.sh.in >$@.tmp || true - test -f $(srcdir)/$@.py.in && $(edit) $(srcdir)/$@.py.in >$@.tmp || true - test -f $@.tmp || false - chmod +x $@.tmp - chmod a-w $@.tmp - mv $@.tmp $@ + @echo ' ' GEN $@; + @rm -f $@ $@.tmp + @test -f $(srcdir)/$@.sh.in && $(edit) $(srcdir)/$@.sh.in >$@.tmp || true + @test -f $(srcdir)/$@.py.in && $(edit) $(srcdir)/$@.py.in >$@.tmp || true + @test -f $@.tmp || false + @chmod +x $@.tmp + @chmod a-w $@.tmp + @mv $@.tmp $@ makepkg: $(srcdir)/makepkg.sh.in pacman-optimize: $(srcdir)/pacman-optimize.sh.in -- 1.6.0

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.2.0-34-g68e59ec
by dan＠archlinux.org 23 Aug '08

23 Aug '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, maint has been updated via 68e59ecbaf5ab4b0ba8684ea8ce29ef90df84d7a (commit) via 91eeee08de706f4f1ab42eeb6996997691cd4255 (commit) via 05d23059fd960fdab23a3aa99b79591fda250a6f (commit) via f56d7635473d207c2fe734718fe406ffb2a56abc (commit) via 8f99f75e6edb409cd048019a464fc8fd139e0dc9 (commit) via 4b4ad18348f59393024a8a702e97983a2c692e42 (commit) via b0b5dabf1bbf5f3a6ba8476651356fed103f8781 (commit) via 31c7e82a51b70e886f929b0489c66dfdb9aa7815 (commit) from 5b51dbb11e2087e1055be24b486502be806b5e13 (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 68e59ecbaf5ab4b0ba8684ea8ce29ef90df84d7a Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat Aug 23 23:38:40 2008 +0200 Update British English translation Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> commit 91eeee08de706f4f1ab42eeb6996997691cd4255 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat Aug 23 23:28:07 2008 +0200 Update French translation Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> commit 05d23059fd960fdab23a3aa99b79591fda250a6f Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat Aug 23 23:25:56 2008 +0200 Update Hungarian translation commit f56d7635473d207c2fe734718fe406ffb2a56abc Author: Juan Pablo González Tognarelli <jotapesan(a)gmail.com> Date: Sat Aug 23 23:23:39 2008 +0200 Update Spanish translation Xav : one minor fix (a missing %s in the downgrading message). commit 8f99f75e6edb409cd048019a464fc8fd139e0dc9 Author: Mateusz Herych <heniekk(a)gmail.com> Date: Sat Aug 23 23:15:55 2008 +0200 Update Polish translation commit 4b4ad18348f59393024a8a702e97983a2c692e42 Author: Giovanni Scafora <linuxmania(a)gmail.com> Date: Sat Aug 23 23:13:12 2008 +0200 Update Italian translation commit b0b5dabf1bbf5f3a6ba8476651356fed103f8781 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Aug 23 11:21:28 2008 -0500 Update translation files for pending 3.2.1 release Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 31c7e82a51b70e886f929b0489c66dfdb9aa7815 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Aug 23 11:20:07 2008 -0500 Fix 'None' text so we don't have to translate it twice We had one "None" and one "None\n" string; we can let the program do the addition of the newline so we don't have to. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: TRANSLATORS | 2 +- lib/libalpm/po/cs.po | 21 ++++++----- lib/libalpm/po/de.po | 21 ++++++----- lib/libalpm/po/en_GB.po | 23 +++++++----- lib/libalpm/po/es.po | 52 ++++++++++++++------------- lib/libalpm/po/fr.po | 23 +++++++----- lib/libalpm/po/hu.po | 18 +++++----- lib/libalpm/po/it.po | 30 +++++++++------- lib/libalpm/po/libalpm.pot | 18 +++++----- lib/libalpm/po/pl.po | 21 ++++++----- lib/libalpm/po/pt_BR.po | 21 ++++++----- lib/libalpm/po/ru.po | 21 ++++++----- lib/libalpm/po/tr.po | 21 ++++++----- lib/libalpm/po/zh_CN.po | 21 ++++++----- po/cs.po | 46 ++++++++++++++++++------- po/de.po | 47 ++++++++++++++++++------- po/en_GB.po | 50 ++++++++++++++++++--------- po/es.po | 81 +++++++++++++++++++++++++++---------------- po/fr.po | 56 ++++++++++++++++++++---------- po/hu.po | 42 ++++++++++++++++------- po/it.po | 53 +++++++++++++++++++---------- po/pacman.pot | 33 +++++++++++++---- po/pl.po | 51 ++++++++++++++++++---------- po/pt_BR.po | 47 ++++++++++++++++++------- po/ru.po | 49 +++++++++++++++++++------- po/tr.po | 47 ++++++++++++++++++------- po/zh_CN.po | 43 +++++++++++++++++------ src/pacman/util.c | 4 +- 28 files changed, 618 insertions(+), 344 deletions(-) hooks/post-receive -- The official pacman repository

1 0