- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] New feature: files verification
by changaco 04 May '09

04 May '09

>From 7c0348fa499f55968764fef4c7bb3d3d7245932b Mon Sep 17 00:00:00 2001 From: Charly COSTE <changaco(a)laposte.net> Date: Sat, 28 Mar 2009 12:36:23 +0100 Subject: [PATCH] New feature: files verification A new option "-Qy" which checks if the files owned by a/some/all package(s) really are on the system (i.e. not accidentally deleted). http://bugs.archlinux.org/task/13877 Signed-off-by: Charly COSTE <changaco(a)laposte.net> --- src/pacman/conf.h | 1 + src/pacman/pacman.c | 6 +++- src/pacman/query.c | 87 +++++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 84 insertions(+), 10 deletions(-) diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 466d983..01a1828 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -50,6 +50,7 @@ typedef struct __config_t { unsigned short op_q_search; unsigned short op_q_changelog; unsigned short op_q_upgrade; + unsigned short op_q_verify; unsigned short op_s_clean; unsigned short op_s_downloadonly; diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 59916d6..e1d13a4 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -360,6 +360,7 @@ static int parseargs(int argc, char *argv[]) {"verbose", no_argument, 0, 'v'}, {"downloadonly", no_argument, 0, 'w'}, {"refresh", no_argument, 0, 'y'}, + {"verify", no_argument, 0, 'y'}, {"noconfirm", no_argument, 0, 1000}, {"config", required_argument, 0, 1001}, {"ignore", required_argument, 0, 1002}, @@ -510,7 +511,10 @@ static int parseargs(int argc, char *argv[]) config->flags |= PM_TRANS_FLAG_DOWNLOADONLY; config->flags |= PM_TRANS_FLAG_NOCONFLICTS; break; - case 'y': (config->op_s_sync)++; break; + case 'y': + (config->op_s_sync)++; + config->op_q_verify = 1; + break; case '?': return(1); default: return(1); } diff --git a/src/pacman/query.c b/src/pacman/query.c index 0d48638..2a7dba5 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -334,10 +334,70 @@ static void display(pmpkg_t *pkg) } } +// We loop through the packages and for each packages we loop through files to check if they exist +static void verify(alpm_list_t *pkgs) +{ + alpm_list_t *i, *files, *file, *pkgs2repair; + pmpkg_t *pkg; + struct stat stFileInfo; + int pkgs_n = alpm_list_count(pkgs); + int j = 0, k = 0; + for(i = pkgs; i; i = alpm_list_next(i)) { + j++; + pkg = alpm_list_getdata(i); + char *pkgname = alpm_pkg_get_name(pkg); + if(filter(pkg)) { + files = alpm_pkg_get_files(pkg); + for(file = files; file; file = alpm_list_next(file)){ + char *x = alpm_list_getdata(file); + char *f = malloc (strlen(x)+2); + strcpy(f,"/"); + strcat(f, x); + k++; + if(strncmp(f, "/tmp", 4)==0){ + continue; // ignore files in /tmp + } + if(lstat(f,&stFileInfo) == 0) { // we use lstat to prevent errors from symbolic links + if(!config->quiet){ + fprintf(stderr, "\rfile n°%i (package %i/%i): OK", k, j, pkgs_n); fflush(stdout); + } + } + else { + if(config->quiet){ + fprintf(stderr, "%s %s\n", pkgname, f); fflush(stdout); + } else { + fprintf(stderr, "\rfile n°%i (package %i/%i): Missing file owned by \"%s\": %s\n", k, j, pkgs_n, pkgname, f); fflush(stdout); + } + if(alpm_list_find_ptr(pkgs2repair, pkgname) == NULL) { + pkgs2repair = alpm_list_add(pkgs2repair, pkgname); + } + } + } + } + } + if(!config->quiet){ + fprintf(stderr, "\n"); + } + if(alpm_list_count(pkgs2repair) > 0) { + if(!config->quiet){ + fprintf(stderr, "Damaged packages: "); + } + for(i = pkgs2repair; i; i = alpm_list_next(i)) { + fprintf(stdout, "%s ", alpm_list_getdata(i)); + } + } else { + if(!config->quiet){ + fprintf(stderr, "No damaged packages."); + } + } + fprintf(stdout, "\n"); + fflush(stdout); +} + int pacman_query(alpm_list_t *targets) { int ret = 0; - alpm_list_t *i; + alpm_list_t *i, *pkgs; /* First: operations that do not require targets */ @@ -363,18 +423,20 @@ int pacman_query(alpm_list_t *targets) } /* operations on all packages in the local DB - * valid: no-op (plain -Q), list, info + * valid: no-op (plain -Q), list, info, verify * invalid: isfile, owns */ if(targets == NULL) { if(config->op_q_isfile || config->op_q_owns) { pm_printf(PM_LOG_ERROR, _("no targets specified (use -h for help)\n")); return(1); - } - - for(i = alpm_db_get_pkgcache(db_local); i; i = alpm_list_next(i)) { - pmpkg_t *pkg = alpm_list_getdata(i); - if(filter(pkg)) { - display(pkg); + } else if(config->op_q_verify) { + verify(alpm_db_get_pkgcache(db_local)); + } else { + for(i = alpm_db_get_pkgcache(db_local); i; i = alpm_list_next(i)) { + pmpkg_t *pkg = alpm_list_getdata(i); + if(filter(pkg)) { + display(pkg); + } } } return(0); @@ -389,7 +451,7 @@ int pacman_query(alpm_list_t *targets) } /* operations on named packages in the local DB - * valid: no-op (plain -Q), list, info */ + * valid: no-op (plain -Q), list, info, verify */ for(i = targets; i; i = alpm_list_next(i)) { char *strname = alpm_list_getdata(i); pmpkg_t *pkg = NULL; @@ -406,8 +468,12 @@ int pacman_query(alpm_list_t *targets) continue; } + if(filter(pkg)) { display(pkg); + if(config->op_q_verify){ + pkgs = alpm_list_add(pkgs, pkg); + } } if(config->op_q_isfile) { @@ -415,6 +481,9 @@ int pacman_query(alpm_list_t *targets) pkg = NULL; } } + if(config->op_q_verify){ + verify(pkgs); + } return(ret); } -- 1.6.2.1 Créez votre adresse électronique prenom.nom(a)laposte.net 1 Go d'espace de stockage, anti-spam et anti-virus intégrés.

7 21

[pacman-dev] [PATCH] makepkg: several small fixes
by Allan McRae 03 May '09

03 May '09

1) Do not attempt to strip compressed binaries Original-work-by: Marc - A. Dahlhaus <mad(a)wol.de> 2) Add "\" in "GPL\'ed" so quote mark does not break source code highlighting 3) Add local to docdir paths in makepkg.conf for consistency 4) Use full path to sed in MacOSX in case users have GNU sed earlier in path Signed-off-by: Allan McRae <allan(a)archlinux.org> --- configure.ac | 2 +- etc/makepkg.conf.in | 2 +- scripts/makepkg.sh.in | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index a83d5e4..9141158 100644 --- a/configure.ac +++ b/configure.ac @@ -193,7 +193,7 @@ case "${host_os}" in darwin*) host_os_darwin=yes SIZECMD="/usr/bin/stat -f %z" - SEDINPLACE="sed -i ''" + SEDINPLACE="/usr/bin/sed -i ''" ;; esac diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 76b9eca..1368ff1 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -75,7 +75,7 @@ INTEGRITY_CHECK=(md5) #-- Manual (man and info) directories to compress (if zipman is specified) MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) #-- Doc directories to remove (if !docs is specified) -DOC_DIRS=(usr/{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) +DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) #-- Directories to be searched for the strip option (if strip is specified) STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin}) #-- Files to be removed from all packages (if purge is specified) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ca25fbb..ebc19bc 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -846,6 +846,8 @@ tidy_install() { local binary find ${STRIP_DIRS[@]} -type f 2>/dev/null | while read binary ; do case "$(file -biz "$binary")" in + *compressed-encoding*) # Skip compressed binarys + ;; *application/x-sharedlib*) # Libraries (.so) /usr/bin/strip -S "$binary";; *application/x-archive*) # Libraries (.a) @@ -952,7 +954,7 @@ create_package() { # warn if license array is not present or empty if [ -z "$license" ]; then warning "$(gettext "Please add a license line to your %s!")" "$BUILDSCRIPT" - plain "$(gettext "Example for GPL'ed software: license=('GPL').")" + plain "$(gettext "Example for GPL\'ed software: license=('GPL').")" fi local comp_files=".PKGINFO" -- 1.6.2.4

1 0

[pacman-dev] Bad error message on invalid pacman -S operation
by Dan McGee 02 May '09

02 May '09

I did "pacman -S" today instead of "pacman -U", and I noticed the error message is not all that great, and I think this is a regression: dmcgee@galway ~/projects/arch-repos/valgrind/trunk $ pacS /home/makepkg/packages/valgrind-3.4.1-1-x86_64.pkg.tar.gz Password: error: repository '' not found error: '/home/makepkg/packages/valgrind-3.4.1-1-x86_64.pkg.tar.gz': no such repository

3 5

Re: [pacman-dev] [PATCH] Fix a possible bash-4.0 problem in makepkg
by Marc - A. Dahlhaus [ Administration | Westermann GmbH ] 28 Apr '09

28 Apr '09

Am Dienstag, den 28.04.2009, 14:26 +1000 schrieb Allan McRae: > Aaron Griffin wrote: > > On Sun, Apr 26, 2009 at 9:39 AM, Marc - A. Dahlhaus <mad(a)wol.de> wrote: > > > >> Dan McGee schrieb: > >> > >>> On Sun, Apr 26, 2009 at 9:04 AM, Marc - A. Dahlhaus <mad(a)wol.de> wrote: > >>> > >>> > >>>> Allan McRae schrieb: > >>>> > >>>> > >>>>> Marc - A. Dahlhaus wrote: > >>>>> > >>>>> > >>>>>> Hello, > >>>>>> > >>>>>> i've spotted a problem in makepkg's cleanup part if the host is running > >>>>>> bash-4.0. > >>>>>> As makepkg runs bash with option -e, on bash-4.0 it fails if strip > >>>>>> reports an unsupported binary. > >>>>>> The following trivial patch fixes the problem. > >>>>>> > >>>>>> Signed-off-by: "Marc - A. Dahlhaus" <mad(a)wol.de> > >>>>>> > >>>>>> --- pacman-3.2.2.orig/scripts/makepkg.sh.in > >>>>>> +++ pacman-3.2.2/scripts/makepkg.sh.in > >>>>>> @@ -766,11 +766,11 @@ tidy_install() { > >>>>>> 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";; > >>>>>> + /usr/bin/strip --strip-debug "$binary" || true;; > >>>>>> *application/x-archive*) # Libraries (.a) > >>>>>> - /usr/bin/strip --strip-debug "$binary";; > >>>>>> + /usr/bin/strip --strip-debug "$binary" || true;; > >>>>>> *application/x-executable*) # Binaries > >>>>>> - /usr/bin/strip "$binary";; > >>>>>> + /usr/bin/strip "$binary" || true;; > >>>>>> esac > >>>>>> done > >>>>>> fi > >>>>>> > >>>>>> > >>>>> I don't think this is a good approach to the problem. Having "|| true" > >>>>> means if there is a real problem, then it gets ignored. > >>>>> > >>>>> > >>>> What real problem could arise? > >>>> An unsupported binary? Would print errors but creates the package mostly > >>>> stripped. > >>>> A missing strip command? Would print errors but creates the package > >>>> unstripped. > >>>> A damaged storage... but i think in that case makepkg would have failed > >>>> in > >>>> the actual build step and not in cleanup. > >>>> > >>>> > >>>>> I suppose the real question is: How do you actually get an unsupported > >>>>> binary? My guess is this occurs when building a package from a binary > >>>>> source, in which case "options=('!strip')" would be the solution. > >>>>> > >>>>> > >>>> The package that triggered this, was xen. > >>>> xen installs some gzipped content inside /usr/lib which strip doesn't > >>>> support. > >>>> > >>>> $ file -biz usr/lib/xen/boot/ioemu-stubdom.gz > >>>> application/x-executable; charset=binary > >>>> compressed-encoding=application/x-gzip; charset=binary; charset=binary > >>>> > >>>> The file itself is a bootable image file for grub. > >>>> > >>>> The library strip lines are not needed. > >>>> What about a case which catches *"*compressed-encoding*" and continues > >>>> with > >>>> the next file?* > >>>> > >>>> > >>> I'm with Allan here- we should fix the real problem rather than adding > >>> a "|| true" and calling it a day. > >>> > >>> > >> This was an ugly hack, i know, hence the last few lines of my message. > >> > >>> I wouldn't be against an exclusion of "compressed-encoding=" when > >>> running strip- Allan, what do you think? The easiest way of > >>> implementing this would be to make it the first case and make it a > >>> no-op. > >>> > >> Thats what i had in mind. > >> > >> I'll do a complete rebuild of all packages and grep for unsupported binarys > >> in the logs. > >> There might be some other types where this could bite us. I'll report back > >> after that. $ grep "File format not recognized" makepkg.log /usr/bin/strip:usr/lib/xen/boot/ioemu-stubdom.gz: File format not recognized /usr/bin/strip:usr/lib/xen/boot/pv-grub-x86_32.gz: File format not recognized /usr/bin/strip:usr/lib/xen/boot/pv-grub-x86_64.gz: File format not recognized Looks like it's a xen only problem as no other package deploys compressed contents in searchpath. > > Is it actually strip-able? Could we actually unpack it (based on the > > compressed-encoding), strip it, and repack? > > I had that thought initially and then thought that would be a major > pain. I'm quite happy with detecting compressed files and skipping > them. But if someone goes ahead and implements that, at this stage I see > no reason not to include it. It just won't be me... > > Allan I don't think that it would work for xen as the files are bootable images that could depend on size and or symbols that we might strip out. An updated patch is attached. Marc

1 1

[pacman-dev] [PATCH] Fix a possible bash-4.0 problem in makepkg
by Marc - A. Dahlhaus 28 Apr '09

28 Apr '09

Hello, i've spotted a problem in makepkg's cleanup part if the host is running bash-4.0. As makepkg runs bash with option -e, on bash-4.0 it fails if strip reports an unsupported binary. The following trivial patch fixes the problem. Signed-off-by: "Marc - A. Dahlhaus" <mad(a)wol.de> --- pacman-3.2.2.orig/scripts/makepkg.sh.in +++ pacman-3.2.2/scripts/makepkg.sh.in @@ -766,11 +766,11 @@ tidy_install() { 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";; + /usr/bin/strip --strip-debug "$binary" || true;; *application/x-archive*) # Libraries (.a) - /usr/bin/strip --strip-debug "$binary";; + /usr/bin/strip --strip-debug "$binary" || true;; *application/x-executable*) # Binaries - /usr/bin/strip "$binary";; + /usr/bin/strip "$binary" || true;; esac done fi --- pacman-3.2.2.orig/scripts/makepkg.sh.in +++ pacman-3.2.2/scripts/makepkg.sh.in @@ -766,11 +766,11 @@ tidy_install() { 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";; + /usr/bin/strip --strip-debug "$binary" || true;; *application/x-archive*) # Libraries (.a) - /usr/bin/strip --strip-debug "$binary";; + /usr/bin/strip --strip-debug "$binary" || true;; *application/x-executable*) # Binaries - /usr/bin/strip "$binary";; + /usr/bin/strip "$binary" || true;; esac done fi

5 9

[pacman-dev] [PATCH] makepkg: make in-place sed portable
by Allan McRae 28 Apr '09

28 Apr '09

Do a sed replacement in-place is not very portable. On Mac OSX and BSDs, the syntax is "sed -i ''" where as with GNU sed the command is "sed -i''" or just "sed -i". This patch detects which command should be used during configure. Credit to Kevin Barry who researched this issue and provided a patch to work around this using temporary backup files. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- configure.ac | 5 +++++ scripts/Makefile.am | 1 + scripts/makepkg.sh.in | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 5dcbe79..a83d5e4 100644 --- a/configure.ac +++ b/configure.ac @@ -180,9 +180,11 @@ GCC_GNU89_INLINE_CC # Host-dependant definitions SIZECMD="stat -c %s" +SEDINPLACE="sed -i" case "${host_os}" in *bsd*) SIZECMD="stat -f %z" + SEDINPLACE="sed -i ''" ;; cygwin*) host_os_cygwin=yes @@ -191,12 +193,14 @@ case "${host_os}" in darwin*) host_os_darwin=yes SIZECMD="/usr/bin/stat -f %z" + SEDINPLACE="sed -i ''" ;; esac AM_CONDITIONAL([CYGWIN], test "x$host_os_cygwin" = "xyes") AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "xyes") AC_SUBST(SIZECMD) +AC_SUBST(SEDINPLACE) # Check for architecture, used in default makepkg.conf # (Note single space left after CARCHFLAGS) @@ -356,6 +360,7 @@ ${PACKAGE_NAME}: Architecture flags : ${CARCHFLAGS} Host Type : ${CHOST} Filesize command : ${SIZECMD} + In-place sed command : ${SEDINPLACE} libalpm version : ${LIB_VERSION} libalpm version info : ${LIB_VERSION_INFO} diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 5a2b780..5d65653 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -41,6 +41,7 @@ edit = sed \ -e 's|@DBEXT[@]|$(DBEXT)|g' \ -e 's|@BUILDSCRIPT[@]|$(BUILDSCRIPT)|g' \ -e 's|@SIZECMD[@]|$(SIZECMD)|g' \ + -e 's|@SEDINPLACE[@]|$(SEDINPLACE)|g' \ -e 's|@configure_input[@]|Generated from $@.in; do not edit by hand.|g' ## All the scripts depend on Makefile so that they are rebuilt when the diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c97eff2..ca25fbb 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1171,8 +1171,8 @@ devel_update() { if [ -n "$newpkgver" ]; then if [ "$newpkgver" != "$pkgver" ]; then if [ -f "./$BUILDSCRIPT" ]; then - sed -i "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "./$BUILDSCRIPT" - sed -i "s/^pkgrel=[^ ]*/pkgrel=1/" "./$BUILDSCRIPT" + @SEDINPLACE@ "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "./$BUILDSCRIPT" + @SEDINPLACE@ "s/^pkgrel=[^ ]*/pkgrel=1/" "./$BUILDSCRIPT" source "$BUILDSCRIPT" fi fi -- 1.6.2.4

3 3

[pacman-dev] [PATCH] makepkg: do not update pkgver when building source package
by Allan McRae 27 Apr '09

27 Apr '09

When making a source package for a SCM PKGBUILD, makepkg should not update the pkgver/pkgrel. Noted in FS#14456. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 97acfb4..c97eff2 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1098,14 +1098,13 @@ install_package() { devel_check() { newpkgver="" - # Only update pkgver if --holdver is not set - if [ "$HOLDVER" -eq 1 ]; then - return - fi - # Cannot update pkgver/pkgrel if reading PKGBUILD from pipe - if [ ! -f "./$BUILDSCRIPT" ]; then + + # Do not update pkgver if --holdver is set, when building a source package, + # or when reading PKGBUILD from pipe + if [ "$HOLDVER" -eq 1 -o "$SOURCEONLY" -ne 0 -o ! -f "./$BUILDSCRIPT" ]; then return fi + if [ -z "$FORCE_VER" ]; then # Check if this is a svn/cvs/etc PKGBUILD; set $newpkgver if so. # This will only be used on the first call to makepkg; subsequent -- 1.6.2.4

3 4

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-144-gc279046
by dan＠archlinux.org 26 Apr '09

26 Apr '09

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 c27904661ef96cb2e7c729ce82b527146529c768 (commit) from 10584ec8eab873ffb4b03dd8e4a4703dabed8955 (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 c27904661ef96cb2e7c729ce82b527146529c768 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Apr 26 20:58:04 2009 +1000 makepkg: make in-place sed portable Do a sed replacement in-place is not very portable. On Mac OSX and BSDs, the syntax is "sed -i ''" where as with GNU sed the command is "sed -i''" or just "sed -i". This patch detects which command should be used during configure. Credit to Kevin Barry who researched this issue and provided a patch to work around this using temporary backup files. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 5 +++++ scripts/Makefile.am | 1 + scripts/makepkg.sh.in | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Stripping files on OSX
by Allan McRae 26 Apr '09

26 Apr '09

Hi all, I am looking for people in the know about how files should be stripped on Mac OSX. In FS#13592, it is suggested that we do some more fine grained tuning of our library stripping. These should work for platforms using GNU strip (Linux/BSD/Cygwin): Binaries: "strip --strip-all" Shared Libraries: "strip --strip-unneeded" Static Libraries: "strip --strip-debug" Can we do something similar on OSX? From [1], it looks like similar options are: Binaries: "strip -u -r" Shared Libraries: "strip -x" Static Libraries: "strip -S Can someone confirm if these options are any good? I could be entirely wrong... [1] http://developer.apple.com/documentation/Darwin/Reference/ManPages/man1/str… Allan

1 0

[pacman-dev] [PATCH] Remove unused error codes and handle PM_ERR_RETRIEVE by alpm_strerror()
by Nagy Gabor 18 Apr '09

18 Apr '09

>From 88c26a6e5902875f07ca7c842971619530fa5aa9 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat, 18 Apr 2009 17:35:08 +0200 Subject: [PATCH] Remove unused error codes and handle PM_ERR_RETRIEVE by alpm_strerror() Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/alpm.h | 9 --------- lib/libalpm/error.c | 17 ++--------------- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 48b6ba2..57ea880 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -487,31 +487,22 @@ enum _pmerrno_t { PM_ERR_TRANS_NOT_PREPARED, PM_ERR_TRANS_ABORT, PM_ERR_TRANS_TYPE, - PM_ERR_TRANS_COMMITING, - PM_ERR_TRANS_DOWNLOADING, /* Packages */ PM_ERR_PKG_NOT_FOUND, PM_ERR_PKG_IGNORED, PM_ERR_PKG_INVALID, PM_ERR_PKG_OPEN, - PM_ERR_PKG_LOAD, - PM_ERR_PKG_CANT_FRESH, PM_ERR_PKG_CANT_REMOVE, PM_ERR_PKG_INVALID_NAME, PM_ERR_PKG_REPO_NOT_FOUND, /* Deltas */ PM_ERR_DLT_INVALID, PM_ERR_DLT_PATCHFAILED, - /* Groups */ - PM_ERR_GRP_NOT_FOUND, /* Dependencies */ PM_ERR_UNSATISFIED_DEPS, PM_ERR_CONFLICTING_DEPS, PM_ERR_FILE_CONFLICTS, /* Misc */ - PM_ERR_USER_ABORT, - PM_ERR_INTERNAL_ERROR, - PM_ERR_DB_SYNC, PM_ERR_RETRIEVE, PM_ERR_INVALID_REGEX, /* External library errors */ diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index 01dc758..47f0750 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -99,10 +99,6 @@ const char SYMEXPORT *alpm_strerror(int err) return _("transaction aborted"); case PM_ERR_TRANS_TYPE: return _("operation not compatible with the transaction type"); - case PM_ERR_TRANS_COMMITING: - return _("could not commit transaction"); - case PM_ERR_TRANS_DOWNLOADING: - return _("could not download all files"); /* Packages */ case PM_ERR_PKG_NOT_FOUND: return _("could not find or read package"); @@ -112,10 +108,6 @@ const char SYMEXPORT *alpm_strerror(int err) return _("invalid or corrupted package"); case PM_ERR_PKG_OPEN: return _("cannot open package file"); - case PM_ERR_PKG_LOAD: - return _("cannot load package data"); - case PM_ERR_PKG_CANT_FRESH: - return _("package not installed or lesser version"); case PM_ERR_PKG_CANT_REMOVE: return _("cannot remove all files for package"); case PM_ERR_PKG_INVALID_NAME: @@ -127,9 +119,6 @@ const char SYMEXPORT *alpm_strerror(int err) return _("invalid or corrupted delta"); case PM_ERR_DLT_PATCHFAILED: return _("delta patch failed"); - /* Groups */ - case PM_ERR_GRP_NOT_FOUND: - return _("group not found"); /* Dependencies */ case PM_ERR_UNSATISFIED_DEPS: return _("could not satisfy dependencies"); @@ -138,10 +127,8 @@ const char SYMEXPORT *alpm_strerror(int err) case PM_ERR_FILE_CONFLICTS: return _("conflicting files"); /* Miscellaenous */ - case PM_ERR_USER_ABORT: - return _("user aborted the operation"); - case PM_ERR_INTERNAL_ERROR: - return _("internal error"); + case PM_ERR_RETRIEVE: + return _("failed to retrieve some files"); case PM_ERR_INVALID_REGEX: return _("invalid regular expression"); /* Errors from external libraries- our own wrapper error */ -- 1.6.0.3

1 1