- Pacman-dev - lists.archlinux.org

[pacman-dev] needless ldconfig
by Nagy Gabor 27 Feb '07

27 Feb '07

That is terrible, that pacman does ldconfig always. A NOLDCONFIG flag would be nice (and easy to implement) somewhere in .PKGINFO. These solution would be compatible with older packeges (because ldconfig is still the default), however we can radically speed up for example -R in the case of packages where no ldconfig is needed. Bye, Nagy Gabor

3 3

[pacman-dev] CVS update of pacman-lib/etc/abs (5 files)
by Dan McGee 27 Feb '07

27 Feb '07

Date: Tuesday, February 27, 2007 @ 10:53:14 Author: dan Path: /home/cvs-pacman/pacman-lib/etc/abs Modified: supfile.arch (1.1 -> 1.2) supfile.community (1.1 -> 1.2) supfile.extra (1.1 -> 1.2) supfile.testing (1.2 -> 1.3) supfile.unstable (1.1 -> 1.2) * Updated all the supfiles for consistancy, and added a commented out line to set the umask that some people may find helpful with an 'abs' group (but it isn't enabled by default). -------------------+ supfile.arch | 12 +++--------- supfile.community | 1 + supfile.extra | 1 + supfile.testing | 5 +++-- supfile.unstable | 1 + 5 files changed, 9 insertions(+), 11 deletions(-) Index: pacman-lib/etc/abs/supfile.arch diff -u pacman-lib/etc/abs/supfile.arch:1.1 pacman-lib/etc/abs/supfile.arch:1.2 --- pacman-lib/etc/abs/supfile.arch:1.1 Tue Dec 5 02:30:15 2006 +++ pacman-lib/etc/abs/supfile.arch Tue Feb 27 10:53:14 2007 @@ -1,21 +1,15 @@ # -# /etc/abs/supfile +# /etc/abs/supfile.arch # -# this is the host containing the master ABS files +# this is the host containing the current PKGBUILD files *default host=cvs.archlinux.org *default release=cvs *default delete *default use-rel-suffix *default compress +#*default umask=002 -# -# Set tag equal to the package tree you wish to follow. CURRENT and -# STABLE are the most commonly used, but you can specify specific -# versions or tag names. Examples are RELEASE_0_2, VEGA, RELEASE_0_3, -# FIREFLY, etc. -# *default tag=CURRENT - arch Index: pacman-lib/etc/abs/supfile.community diff -u pacman-lib/etc/abs/supfile.community:1.1 pacman-lib/etc/abs/supfile.community:1.2 --- pacman-lib/etc/abs/supfile.community:1.1 Tue Dec 5 02:30:15 2006 +++ pacman-lib/etc/abs/supfile.community Tue Feb 27 10:53:14 2007 @@ -9,6 +9,7 @@ *default delete *default use-rel-suffix *default compress +#*default umask=002 *default tag=CURRENT community Index: pacman-lib/etc/abs/supfile.extra diff -u pacman-lib/etc/abs/supfile.extra:1.1 pacman-lib/etc/abs/supfile.extra:1.2 --- pacman-lib/etc/abs/supfile.extra:1.1 Tue Dec 5 02:30:15 2006 +++ pacman-lib/etc/abs/supfile.extra Tue Feb 27 10:53:14 2007 @@ -9,6 +9,7 @@ *default delete *default use-rel-suffix *default compress +#*default umask=002 *default tag=CURRENT extra Index: pacman-lib/etc/abs/supfile.testing diff -u pacman-lib/etc/abs/supfile.testing:1.2 pacman-lib/etc/abs/supfile.testing:1.3 --- pacman-lib/etc/abs/supfile.testing:1.2 Fri Feb 23 02:45:15 2007 +++ pacman-lib/etc/abs/supfile.testing Tue Feb 27 10:53:14 2007 @@ -2,14 +2,15 @@ # /etc/abs/supfile.testing # -# this is the host containing the master ABS files +# this is the host containing the testing PKGBUILD files *default host=cvs.archlinux.org *default release=cvs *default delete *default use-rel-suffix *default compress -*default tag=TESTING +#*default umask=002 +*default tag=TESTING arch extra Index: pacman-lib/etc/abs/supfile.unstable diff -u pacman-lib/etc/abs/supfile.unstable:1.1 pacman-lib/etc/abs/supfile.unstable:1.2 --- pacman-lib/etc/abs/supfile.unstable:1.1 Tue Dec 5 02:30:15 2006 +++ pacman-lib/etc/abs/supfile.unstable Tue Feb 27 10:53:14 2007 @@ -9,6 +9,7 @@ *default delete *default use-rel-suffix *default compress +#*default umask=002 *default tag=CURRENT unstable

1 0

[pacman-dev] pacman locking the db when downloading with -S ?
by Andreas Radke 27 Feb '07

27 Feb '07

i found this strange behavior: while i had pacman3 -Syu downloading some updates it kept the db locked so makepkg3 couldn't check the deps. [andyrtr@workstation64 pacman3]$ rm -rf src/ && time makepkg3 -L ==> Entering fakeroot environment ==> Making package: pacman-rc 2007.02.25-1 (So 25. Feb 14:34:46 CET 2007) ==> Checking Runtime Dependencies... Fehler: unable to lock database ==> ERROR: pacman3 returned a fatal error (1): Wenn Sie sicher sind, dass nicht bereits ein Paketmanager gestartet ist, können Sie /tmp/pacman.lck entfernen ==> Checking Buildtime Dependencies... Fehler: unable to lock database ==> ERROR: pacman3 returned a fatal error (1): Wenn Sie sicher sind, dass nicht bereits ein Paketmanager gestartet ist, können Sie /tmp/pacman.lck entfernen ==> Retrieving Sources... ==> Validating source files with md5sums ==> Validating source files with sha1sums ==> Extracting Sources... It's ok that the pacman -Syu job locks the db while checking the dependencies but it should unlock them after that immediatly and maybe relock when installing the packages. Andy

3 3

[pacman-dev] CVS update of pacman-lib/pactest (pmpkg.py)
by Aaron Griffin 27 Feb '07

27 Feb '07

Date: Tuesday, February 27, 2007 @ 03:32:52 Author: aaron Path: /home/cvs-pacman/pacman-lib/pactest Modified: pmpkg.py (1.2 -> 1.3) * Fixed a pacman warning when these fake packages didn't create an (empty) .FILELIST ----------+ pmpkg.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) Index: pacman-lib/pactest/pmpkg.py diff -u pacman-lib/pactest/pmpkg.py:1.2 pacman-lib/pactest/pmpkg.py:1.3 --- pacman-lib/pactest/pmpkg.py:1.2 Wed Feb 21 01:33:13 2007 +++ pacman-lib/pactest/pmpkg.py Tue Feb 27 03:32:52 2007 @@ -156,9 +156,8 @@ # .INSTALL empty = 1 - for value in self.install.values(): - if value: - empty = 0 + if len(self.install.values()) > 0: + empty = 0 if not empty: mkinstallfile(".INSTALL", self.install) targets += " .INSTALL" @@ -166,7 +165,11 @@ # .FILELIST if self.files: os.system("tar cvf /dev/null * | sort >.FILELIST") - targets += " .FILELIST *" + else: + #prevent some pacman warnings... I expect a real package would + #always have at least one file... + os.system("touch .FILELIST") + targets += " .FILELIST *" # Generate package archive os.system("tar zcf %s %s" % (archive, targets))

1 0

[pacman-dev] CVS update of pacman-lib/pactest/tests (upgrade052.py)
by Aaron Griffin 27 Feb '07

27 Feb '07

Date: Tuesday, February 27, 2007 @ 03:29:02 Author: aaron Path: /home/cvs-pacman/pacman-lib/pactest/tests Modified: upgrade052.py (1.1 -> 1.2) * This test was off. pactest doesn't do all the DB work, so we need to manually add the "requiredby" information that libalpm would have written. Now it succeeds. ---------------+ upgrade052.py | 1 + 1 file changed, 1 insertion(+) Index: pacman-lib/pactest/tests/upgrade052.py diff -u pacman-lib/pactest/tests/upgrade052.py:1.1 pacman-lib/pactest/tests/upgrade052.py:1.2 --- pacman-lib/pactest/tests/upgrade052.py:1.1 Mon Feb 26 20:34:08 2007 +++ pacman-lib/pactest/tests/upgrade052.py Tue Feb 27 03:29:02 2007 @@ -6,6 +6,7 @@ lp2 = pmpkg("pkg2") lp2.provides = ["imaginary", "real"] +lp2.requiredby = [ "pkg1" ] self.addpkg2db("local", lp2) p = pmpkg("pkg2", "1.0-2")

1 0

[pacman-dev] CVS update of pacman-lib/pactest/tests (5 files)
by Dan McGee 27 Feb '07

27 Feb '07

Date: Monday, February 26, 2007 @ 20:34:08 Author: dan Path: /home/cvs-pacman/pacman-lib/pactest/tests Added: upgrade050.py (1.1) upgrade051.py (1.1) upgrade052.py (1.1) upgrade053.py (1.1) upgrade054.py (1.1) * Added 5 new upgrade tests, which check various things with depends, provides, and conflicts. - upgrade051 is known to fail- but we want to eventually make it work. - upgrade052 is Nagy's bug as reported on the ML- I think. If it isn't, let me know. ---------------+ upgrade050.py | 15 +++++++++++++++ upgrade051.py | 15 +++++++++++++++ upgrade052.py | 19 +++++++++++++++++++ upgrade053.py | 19 +++++++++++++++++++ upgrade054.py | 19 +++++++++++++++++++ 5 files changed, 87 insertions(+) Index: pacman-lib/pactest/tests/upgrade050.py diff -u /dev/null pacman-lib/pactest/tests/upgrade050.py:1.1 --- /dev/null Mon Feb 26 20:34:08 2007 +++ pacman-lib/pactest/tests/upgrade050.py Mon Feb 26 20:34:07 2007 @@ -0,0 +1,15 @@ +self.description = "Upgrade package with a conflict == depend (not installed)" + +p1 = pmpkg("pkg1") +p1.conflicts = ["pkg2"] +p1.depends = ["pkg2"] +self.addpkg(p1) + +p2 = pmpkg("pkg2") +self.addpkg(p2) + +self.args = "-U %s" % " ".join([p.filename() for p in p1, p2]) + +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_EXIST=pkg1") +self.addrule("!PKG_EXIST=pkg2") Index: pacman-lib/pactest/tests/upgrade051.py diff -u /dev/null pacman-lib/pactest/tests/upgrade051.py:1.1 --- /dev/null Mon Feb 26 20:34:08 2007 +++ pacman-lib/pactest/tests/upgrade051.py Mon Feb 26 20:34:08 2007 @@ -0,0 +1,15 @@ +self.description = "Upgrade to a package that provides another package" + +lp = pmpkg("pkg1") +self.addpkg2db("local", lp) + +p = pmpkg("pkg2") +p.conflicts = ["pkg1"] +p.provides = ["pkg1"] +self.addpkg(p) + +self.args = "-U %s" % p.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("!PKG_EXIST=pkg1") +self.addrule("PKG_EXIST=pkg2") Index: pacman-lib/pactest/tests/upgrade052.py diff -u /dev/null pacman-lib/pactest/tests/upgrade052.py:1.1 --- /dev/null Mon Feb 26 20:34:08 2007 +++ pacman-lib/pactest/tests/upgrade052.py Mon Feb 26 20:34:08 2007 @@ -0,0 +1,19 @@ +self.description = "Nagy's bug (I think) -- in progress" + +lp1 = pmpkg("pkg1") +lp1.depends = ["imaginary"] +self.addpkg2db("local", lp1) + +lp2 = pmpkg("pkg2") +lp2.provides = ["imaginary", "real"] +self.addpkg2db("local", lp2) + +p = pmpkg("pkg2", "1.0-2") +p.provides = ["real"] +self.addpkg(p) + +self.args = "-U %s" % p.filename() + +self.addrule("PACMAN_RETCODE=1") +self.addrule("PKG_EXIST=pkg1") +self.addrule("PKG_VERSION=pkg2|1.0-1") Index: pacman-lib/pactest/tests/upgrade053.py diff -u /dev/null pacman-lib/pactest/tests/upgrade053.py:1.1 --- /dev/null Mon Feb 26 20:34:08 2007 +++ pacman-lib/pactest/tests/upgrade053.py Mon Feb 26 20:34:08 2007 @@ -0,0 +1,19 @@ +self.description = "Upgrade a package with dependency on provided package (same)" + +lp1 = pmpkg("pkg1") +lp1.depends = ["imaginary"] +self.addpkg2db("local", lp1) + +lp2 = pmpkg("pkg2") +lp2.provides = ["imaginary", "real"] +self.addpkg2db("local", lp2) + +p = pmpkg("pkg1", "1.0-2") +p.depends = ["imaginary"] +self.addpkg(p) + +self.args = "-U %s" % p.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=pkg1|1.0-2") +self.addrule("PKG_EXIST=pkg2") Index: pacman-lib/pactest/tests/upgrade054.py diff -u /dev/null pacman-lib/pactest/tests/upgrade054.py:1.1 --- /dev/null Mon Feb 26 20:34:08 2007 +++ pacman-lib/pactest/tests/upgrade054.py Mon Feb 26 20:34:08 2007 @@ -0,0 +1,19 @@ +self.description = "Upgrade a package with dependency on provided package (different)" + +lp1 = pmpkg("pkg1") +lp1.depends = ["imaginary"] +self.addpkg2db("local", lp1) + +lp2 = pmpkg("pkg2") +lp2.provides = ["imaginary", "real"] +self.addpkg2db("local", lp2) + +p = pmpkg("pkg1", "1.0-2") +p.depends = ["real"] +self.addpkg(p) + +self.args = "-U %s" % p.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=pkg1|1.0-2") +self.addrule("PKG_EXIST=pkg2")

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (db.c)
by Dan McGee 26 Feb '07

26 Feb '07

Date: Monday, February 26, 2007 @ 18:32:08 Author: dan Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: db.c (1.61 -> 1.62) * db search optimization- why don't we compile the regex once instead of once per package. ------+ db.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) Index: pacman-lib/lib/libalpm/db.c diff -u pacman-lib/lib/libalpm/db.c:1.61 pacman-lib/lib/libalpm/db.c:1.62 --- pacman-lib/lib/libalpm/db.c:1.61 Mon Feb 26 03:38:48 2007 +++ pacman-lib/lib/libalpm/db.c Mon Feb 26 18:32:08 2007 @@ -105,21 +105,21 @@ for(i = needles; i; i = i->next) { char *targ; + regex_t reg; if(i->data == NULL) { continue; } targ = i->data; _alpm_log(PM_LOG_DEBUG, "searching for target '%s'", targ); + + if(regcomp(&reg, targ, REG_EXTENDED | REG_NOSUB | REG_ICASE | REG_NEWLINE) != 0) { + RET_ERR(PM_ERR_INVALID_REGEX, NULL); + } for(j = _alpm_db_get_pkgcache(db, INFRQ_DESC|INFRQ_DEPENDS); j; j = j->next) { pmpkg_t *pkg = j->data; char *matched = NULL; - regex_t reg; - - if(regcomp(&reg, targ, REG_EXTENDED | REG_NOSUB | REG_ICASE | REG_NEWLINE) != 0) { - RET_ERR(PM_ERR_INVALID_REGEX, NULL); - } /* check name */ if (regexec(&reg, pkg->name, 0, 0, 0) == 0) { @@ -130,6 +130,8 @@ matched = pkg->desc; } /* check provides */ + /* TODO: should we be doing this, and should we print something + * differently when we do match it since it isn't currently printed? */ else { for(k = pkg->provides; k; k = k->next) { if (regexec(&reg, k->data, 0, 0, 0) == 0) { @@ -138,13 +140,15 @@ } } } - regfree(&reg); if(matched != NULL) { - _alpm_log(PM_LOG_DEBUG, " search target '%s' matched '%s'", targ, matched); + _alpm_log(PM_LOG_DEBUG, " search target '%s' matched '%s'", + targ, matched); ret = alpm_list_add(ret, pkg); } } + + regfree(&reg); } return(ret);

1 0

[pacman-dev] CVS update of pacman-lib (3 files)
by Dan McGee 26 Feb '07

26 Feb '07

Date: Monday, February 26, 2007 @ 10:10:54 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: TODO.dan (1.15 -> 1.16) contrib/Makefile.am (1.2 -> 1.3) scripts/Makefile.am (1.6 -> 1.7) * TODO updates. * Makefile.am updates for Aaron's move of re-pacman to contrib. ---------------------+ TODO.dan | 15 +++++++++++++-- contrib/Makefile.am | 1 + scripts/Makefile.am | 1 - 3 files changed, 14 insertions(+), 3 deletions(-) Index: pacman-lib/TODO.dan diff -u pacman-lib/TODO.dan:1.15 pacman-lib/TODO.dan:1.16 --- pacman-lib/TODO.dan:1.15 Wed Feb 21 23:36:02 2007 +++ pacman-lib/TODO.dan Mon Feb 26 10:10:53 2007 @@ -84,9 +84,20 @@ differ here. Rewrite makepkg to use terminal-safe coloring/bolding. tput utility should -allow us to do this. +allow us to do this. Make universal message functions for systemwide use, +including all pacman utilites- abs, pacman-optimize, etc. -Bugs/FRs to smash: 6468, 6437, 6430?, 6420, 6404, 6389, 6312?, 6284, 6273?, 6255?, 6208, 5987, 5885, 5571, 4182, 3492, 2810?, 1769, 1588, 1571 +Bugs/FRs to smash: 6468, 6437, 6430?, 6420, 6404, 6389, 6312?, 6284, 6273?, +6255?, 6208, 5987, 5885, 5571, 4182, 3492, 2810?, 1769, 1588, 1571 + +Remove _alpm from function names now that we have SYMHIDDEN and static +declarations. + +Remove alpm.c, put functions where they should be. + +Update doxygen comments, they may need some work. Try to document all of the +private internal functions too- it helps a ton for people just getting a +start on pacman hacking. Other smaller things: --------------------- Index: pacman-lib/contrib/Makefile.am diff -u pacman-lib/contrib/Makefile.am:1.2 pacman-lib/contrib/Makefile.am:1.3 --- pacman-lib/contrib/Makefile.am:1.2 Fri Feb 23 03:07:48 2007 +++ pacman-lib/contrib/Makefile.am Mon Feb 26 10:10:53 2007 @@ -2,5 +2,6 @@ bash_completion \ pacsearch \ pacdiff \ + re-pacman \ zsh_completion Index: pacman-lib/scripts/Makefile.am diff -u pacman-lib/scripts/Makefile.am:1.6 pacman-lib/scripts/Makefile.am:1.7 --- pacman-lib/scripts/Makefile.am:1.6 Thu Feb 22 16:34:52 2007 +++ pacman-lib/scripts/Makefile.am Mon Feb 26 10:10:53 2007 @@ -11,7 +11,6 @@ rankmirrors \ repo-add \ repo-remove \ - re-pacman \ updatesync EXTRA_DIST = $(bin_SCRIPTS)

1 0

[pacman-dev] CVS update of pacman-lib (HACKING contrib/re-pacman scripts/re-pacman)
by Aaron Griffin 26 Feb '07

26 Feb '07

Date: Monday, February 26, 2007 @ 04:19:34 Author: aaron Path: /home/cvs-pacman/pacman-lib Added: contrib/re-pacman (1.1) Modified: HACKING (1.1 -> 1.2) Removed: scripts/re-pacman (1.3) * Added a small note to HACKING * Moved re-pacman to contrib/ as it's probably not as useful as the other stuff in scripts/ -------------------+ HACKING | 3 + contrib/re-pacman | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++ scripts/re-pacman | 79 ---------------------------------------------------- 3 files changed, 82 insertions(+), 79 deletions(-) Index: pacman-lib/HACKING diff -u pacman-lib/HACKING:1.1 pacman-lib/HACKING:1.2 --- pacman-lib/HACKING:1.1 Tue Feb 20 11:29:21 2007 +++ pacman-lib/HACKING Mon Feb 26 04:19:33 2007 @@ -1,6 +1,9 @@ Contributing to pacman ====================== +Please read 'submitting-patches' and 'translation-help' in the same directory as +this file. + Coding style ------------ Index: pacman-lib/contrib/re-pacman diff -u /dev/null pacman-lib/contrib/re-pacman:1.1 --- /dev/null Mon Feb 26 04:19:34 2007 +++ pacman-lib/contrib/re-pacman Mon Feb 26 04:19:33 2007 @@ -0,0 +1,79 @@ +#!/bin/sh +# +# re-pacman: regenerate a pacman package based on installed files and the +# pacman database entries. Useful for reuse, or possible config file +# extension +# +# Copyright (c) 2006 Aaron Griffin <aaron(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, +# USA. +# + +#TODO +# * Check for md5 changes in backup lines and change pkgrel + +pacinfo () { + [ $# -ne 2 ] && return 1 + #use echo to strip spaces + echo $(pacman -Qi ${1} | grep "${2}" | cut -d: -f2-) +} + +make_pkginfo () { + echo "# Generated by re-pacman 1.0.0" + echo "# On $(date)" + echo "pkgname =$(pacinfo ${1} Name)" + echo "pkgver =$(pacinfo ${1} Version)" + echo "pkgdesc =$(pacinfo ${1} Description)" + echo "url =$(pacinfo ${1} URL)" + echo "builddate =$(pacinfo ${1} 'Build Date')" + echo "packager =$(pacinfo ${1} Packager)" + echo "size =$(pacinfo ${1} Size)" + echo "arch =$(pacinfo ${1} Architecture)" + deps=$(pacinfo ${1} 'Depends On') + for d in ${deps}; do + echo "depend = ${d}" + done +} + +if [ $# -ne 1 ]; then + echo "usage: re-pacman <installed package name>" + exit 1 +fi + +ver=$(pacinfo ${1} Version) +if [ "x${ver}" = "x" ]; then + echo "Package '${1}' not found, aborting." + exit 1 +fi + +echo ":: Cleaning up old files" +rm -f .PKGINFO .FILELIST "${1}-${ver}.pkg.tar.gz" + +echo ":: Building PKGINFO" +make_pkginfo ${1} > .PKGINFO +echo ":: Building FILELIST" +pacman -Ql ${1} | cut -d' ' -f2- > .FILELIST + +flist=".PKGINFO .FILELIST" +flist="${flist} $(pacman -Ql ${1} | sed 's|\w* $.*$|/\1|g' | grep -v '/$')" + +echo ":: Building final package tarball" +echo ${flist} | tr ' ' '\n' | tar czf "${1}-${ver}.pkg.tar.gz" -T - 2>/dev/null + +rm -f .PKGINFO .FILELIST +echo ":: Package '${1}-${ver}.pkg.tar.gz' is now ready for installation" + +# vim: set ts=2 sw=2 noet: Index: pacman-lib/scripts/re-pacman diff -u pacman-lib/scripts/re-pacman:1.3 pacman-lib/scripts/re-pacman:removed --- pacman-lib/scripts/re-pacman:1.3 Wed Dec 20 20:53:41 2006 +++ pacman-lib/scripts/re-pacman Mon Feb 26 04:19:34 2007 @@ -1,79 +0,0 @@ -#!/bin/sh -# -# re-pacman: regenerate a pacman package based on installed files and the -# pacman database entries. Useful for reuse, or possible config file -# extension -# -# Copyright (c) 2006 Aaron Griffin <aaron(a)archlinux.org> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -# USA. -# - -#TODO -# * Check for md5 changes in backup lines and change pkgrel - -pacinfo () { - [ $# -ne 2 ] && return 1 - #use echo to strip spaces - echo $(pacman -Qi ${1} | grep "${2}" | cut -d: -f2-) -} - -make_pkginfo () { - echo "# Generated by re-pacman 1.0.0" - echo "# On $(date)" - echo "pkgname =$(pacinfo ${1} Name)" - echo "pkgver =$(pacinfo ${1} Version)" - echo "pkgdesc =$(pacinfo ${1} Description)" - echo "url =$(pacinfo ${1} URL)" - echo "builddate =$(pacinfo ${1} 'Build Date')" - echo "packager =$(pacinfo ${1} Packager)" - echo "size =$(pacinfo ${1} Size)" - echo "arch =$(pacinfo ${1} Architecture)" - deps=$(pacinfo ${1} 'Depends On') - for d in ${deps}; do - echo "depend = ${d}" - done -} - -if [ $# -ne 1 ]; then - echo "usage: re-pacman <installed package name>" - exit 1 -fi - -ver=$(pacinfo ${1} Version) -if [ "x${ver}" = "x" ]; then - echo "Package '${1}' not found, aborting." - exit 1 -fi - -echo ":: Cleaning up old files" -rm -f .PKGINFO .FILELIST "${1}-${ver}.pkg.tar.gz" - -echo ":: Building PKGINFO" -make_pkginfo ${1} > .PKGINFO -echo ":: Building FILELIST" -pacman -Ql ${1} | cut -d' ' -f2- > .FILELIST - -flist=".PKGINFO .FILELIST" -flist="${flist} $(pacman -Ql ${1} | sed 's|\w* $.*$|/\1|g' | grep -v '/$')" - -echo ":: Building final package tarball" -echo ${flist} | tr ' ' '\n' | tar czf "${1}-${ver}.pkg.tar.gz" -T - 2>/dev/null - -rm -f .PKGINFO .FILELIST -echo ":: Package '${1}-${ver}.pkg.tar.gz' is now ready for installation" - -# vim: set ts=2 sw=2 noet:

1 0

[pacman-dev] CVS update of pacman-lib (7 files)
by Aaron Griffin 26 Feb '07

26 Feb '07

Date: Monday, February 26, 2007 @ 03:43:02 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: scripts/makepkg (1.53 -> 1.54) src/pacman/deptest.c (1.14 -> 1.15) src/pacman/pacman.c (1.101 -> 1.102) src/pacman/query.c (1.25 -> 1.26) src/pacman/remove.c (1.28 -> 1.29) src/pacman/sync.c (1.114 -> 1.115) src/pacman/util.c (1.29 -> 1.30) * pacman hidden arguments: removed -Y and -D. -T is the only hidden arg now, to be used in place of -Y. Also, -D was rather silly, as it does mostly what -S does. * Cleaned up pacman_deptest - removed the goofy faketarget stuff (NEEDS testing still) * libalpm function renames ----------------------+ scripts/makepkg | 10 +-- src/pacman/deptest.c | 131 ++++++------------------------------------------- src/pacman/pacman.c | 11 ---- src/pacman/query.c | 8 +- src/pacman/remove.c | 4 - src/pacman/sync.c | 12 ++-- src/pacman/util.c | 9 ++- 7 files changed, 43 insertions(+), 142 deletions(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.53 pacman-lib/scripts/makepkg:1.54 --- pacman-lib/scripts/makepkg:1.53 Fri Feb 23 21:11:52 2007 +++ pacman-lib/scripts/makepkg Mon Feb 26 03:43:02 2007 @@ -184,7 +184,7 @@ pmout=$(pacman $PACMAN_OPTS -T $*) ret=$? - if [ $ret -eq 127 ]; then #unresolved deps + if [ $ret -eq 1 ]; then #unresolved deps #strip out the pacman prefix from "requires: xyz" echo $pmout | sed 's|requires:||g' elif [ $ret -ne 0 ]; then @@ -211,8 +211,8 @@ FAKEROOTKEY2=$FAKEROOTKEY unset FAKEROOTKEY fi - sudo pacman $PACMAN_OPTS -D $deplist - if [ "$?" = "127" ]; then + sudo pacman $PACMAN_OPTS -S $deplist + if [ $? -eq 1 ]; then error "Failed to install missing dependencies." exit 1 fi @@ -223,8 +223,8 @@ elif [ "$DEP_BIN" = "1" ]; then # install missing deps from binary packages (using pacman -S) msg "Installing missing dependencies..." - pacman $PACMAN_OPTS -D $deplist - if [ "$?" = "127" ]; then + pacman $PACMAN_OPTS -S $deplist + if [ $? -eq 1 ]; then error "Failed to install missing dependencies." exit 1 fi Index: pacman-lib/src/pacman/deptest.c diff -u pacman-lib/src/pacman/deptest.c:1.14 pacman-lib/src/pacman/deptest.c:1.15 --- pacman-lib/src/pacman/deptest.c:1.14 Mon Feb 12 01:44:00 2007 +++ pacman-lib/src/pacman/deptest.c Mon Feb 26 03:43:02 2007 @@ -36,131 +36,36 @@ extern config_t *config; -/* TODO this function is fairly messy, with the obscure return codes and the odd - * 'dummy' packages and all these messy FREELISTs of synctargs - */ int pacman_deptest(alpm_list_t *targets) { - alpm_list_t *data, *i; - char *str; int retval = 0; + pmdb_t *local; + pmpkg_t *pkg; + alpm_list_t *i, *provides; if(targets == NULL) { return(0); } + + local = alpm_option_get_localdb(); - /* we create a transaction to hold a dummy package to be able to use - * deps checkings from alpm_trans_prepare() */ - if(alpm_trans_init(PM_TRANS_TYPE_ADD, 0, NULL, NULL, NULL) == -1) { - ERR(NL, "%s", alpm_strerror(pm_errno)); - if(pm_errno == PM_ERR_HANDLE_LOCK) { - MSG(NL, _(" if you're sure a package manager is not already running,\n" - " you can remove %s%s\n"), alpm_option_get_root(), PM_LOCK); - } - return(1); - } - - /* We use a hidden facility from alpm_trans_addtarget() to add a dummy - * target to the transaction (see the library code for details). - * It allows us to use alpm_trans_prepare() to check dependencies of the - * given target. - */ - str = (char *)malloc(strlen("name=dummy|version=1.0-1")+1); - if(str == NULL) { - ERR(NL, _("memory allocation failure\n")); - retval = 1; - goto cleanup; - } - strcpy(str, "name=dummy|version=1.0-1"); for(i = targets; i; i = alpm_list_next(i)) { - const char *targ = alpm_list_getdata(i); - str = (char *)realloc(str, strlen(str)+8+strlen(targ)+1); - strcat(str, "|depend="); - strcat(str, targ); - } - vprint(_("add target %s\n"), str); - if(alpm_trans_addtarget(str) == -1) { - FREE(str); - ERR(NL, _("could not add target (%s)\n"), alpm_strerror(pm_errno)); - retval = 1; - goto cleanup; - } - FREE(str); - - if(alpm_trans_prepare(&data) == -1) { - alpm_list_t *synctargs = NULL; - retval = 126; - /* return 126 = deps were missing, but successfully resolved - * return 127 = deps were missing, and failed to resolve; OR - * = deps were missing, but no resolution was attempted; OR - * = unresolvable conflicts were found - */ - switch(pm_errno) { - case PM_ERR_UNSATISFIED_DEPS: - for(i = data; i; i = alpm_list_next(i)) { - pmdepmissing_t *miss = alpm_list_getdata(i); - if(!config->op_d_resolve) { - MSG(NL, _("requires: %s"), alpm_dep_get_name(miss)); - switch(alpm_dep_get_mod(miss)) { - case PM_DEP_MOD_ANY: - break; - case PM_DEP_MOD_EQ: - MSG(CL, "=%s", alpm_dep_get_version(miss)); - break; - case PM_DEP_MOD_GE: - MSG(CL, ">=%s", alpm_dep_get_version(miss)); - break; - case PM_DEP_MOD_LE: - MSG(CL, "<=%s", alpm_dep_get_version(miss)); - break; - } - MSG(CL, "\n"); - } - synctargs = alpm_list_add(synctargs, strdup(alpm_dep_get_name(miss))); - } - alpm_list_free(data); - break; - case PM_ERR_CONFLICTING_DEPS: - /* we can't auto-resolve conflicts */ - for(i = data; i; i = alpm_list_next(i)) { - pmdepmissing_t *miss = alpm_list_getdata(i); - MSG(NL, _("conflict: %s"), alpm_dep_get_name(miss)); - } - retval = 127; - alpm_list_free(data); - break; - default: - retval = 127; - break; - } - - /* attempt to resolve missing dependencies */ - /* TODO: handle version comparators (eg, glibc>=2.2.5) */ - if(retval == 126 && synctargs != NULL) { - if(alpm_trans_release() == -1) { - ERR(NL, _("could not release transaction (%s)"), alpm_strerror(pm_errno)); - FREELIST(synctargs); - return(1); - } - if(!config->op_d_resolve || pacman_sync(synctargs) != 0) { - /* error (or -D not used) */ - retval = 127; + const char *pkgname; + + pkgname = alpm_list_getdata(i); + /* find this package in the local DB */ + pkg = alpm_db_get_pkg(local, pkgname); + + if(!pkg) { + /* not found, can we find anything that provides this in the local DB? */ + provides = alpm_db_whatprovides(local, pkgname); + if(!provides) { + /* nope, must be missing */ + MSG(NL, _("requires: %s"), pkgname); + retval = 1; } - FREELIST(synctargs); - return(retval); } - - FREELIST(synctargs); } - -cleanup: - if(!config->op_d_resolve) { - if(alpm_trans_release() == -1) { - ERR(NL, _("could not release transaction (%s)"), alpm_strerror(pm_errno)); - retval = 1; - } - } - return(retval); } Index: pacman-lib/src/pacman/pacman.c diff -u pacman-lib/src/pacman/pacman.c:1.101 pacman-lib/src/pacman/pacman.c:1.102 --- pacman-lib/src/pacman/pacman.c:1.101 Thu Feb 22 22:40:20 2007 +++ pacman-lib/src/pacman/pacman.c Mon Feb 26 03:43:02 2007 @@ -217,7 +217,6 @@ static struct option opts[] = { {"add", no_argument, 0, 'A'}, - {"resolve", no_argument, 0, 'D'}, /* used by 'makepkg -s' */ {"freshen", no_argument, 0, 'F'}, {"query", no_argument, 0, 'Q'}, {"remove", no_argument, 0, 'R'}, @@ -264,7 +263,7 @@ struct stat st; unsigned short logmask; - while((opt = getopt_long(argc, argv, "ARUFQSTDYr:b:vkhscVfmnoldepiuwyg", opts, &option_index))) { + while((opt = getopt_long(argc, argv, "ARUFQSTr:b:vkhscVfmnoldepiuwyg", opts, &option_index))) { if(opt < 0) { break; } @@ -316,11 +315,6 @@ alpm_option_set_cachedir(optarg); break; case 'A': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_ADD); break; - case 'D': - config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_DEPTEST); - config->op_d_resolve = 1; - config->flags |= PM_TRANS_FLAG_ALLDEPS; - break; case 'F': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_UPGRADE); config->flags |= PM_TRANS_FLAG_FRESHEN; @@ -331,9 +325,6 @@ case 'T': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_DEPTEST); break; case 'U': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_UPGRADE); break; case 'V': config->version = 1; break; - case 'Y': - config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_DEPTEST); - break; case 'b': if(stat(optarg, &st) == -1 || !S_ISDIR(st.st_mode)) { ERR(NL, _("'%s' is not a valid db path\n"), optarg); Index: pacman-lib/src/pacman/query.c diff -u pacman-lib/src/pacman/query.c:1.25 pacman-lib/src/pacman/query.c:1.26 --- pacman-lib/src/pacman/query.c:1.25 Sun Feb 11 23:45:22 2007 +++ pacman-lib/src/pacman/query.c Mon Feb 26 03:43:02 2007 @@ -153,7 +153,7 @@ const char *grpname; grpname = alpm_grp_get_name(grp); - pkgnames = alpm_grp_get_packages(grp); + pkgnames = alpm_grp_get_pkgs(grp); for(p = pkgnames; p; p = alpm_list_next(p)) { MSG(NL, "%s %s\n", grpname, (char *)alpm_list_getdata(p)); @@ -162,7 +162,7 @@ } else { pmgrp_t *grp = alpm_db_readgrp(db_local, package); if(grp) { - alpm_list_t *p, *pkgnames = alpm_grp_get_packages(grp); + alpm_list_t *p, *pkgnames = alpm_grp_get_pkgs(grp); for(p = pkgnames; p; p = alpm_list_next(p)) { MSG(NL, "%s %s\n", package, (char *)alpm_list_getdata(p)); } @@ -217,7 +217,7 @@ pkgver = alpm_pkg_get_version(tmpp); if(config->op_q_list || config->op_q_orphans || config->op_q_foreign) { - info = alpm_db_readpkg(db_local, (char *)pkgname); + info = alpm_db_get_pkg(db_local, (char *)pkgname); if(info == NULL) { /* something weird happened */ ERR(NL, _("package \"%s\" not found\n"), pkgname); @@ -250,7 +250,7 @@ } } } else { - info = alpm_db_readpkg(db_local, package); + info = alpm_db_get_pkg(db_local, package); if(info == NULL) { ERR(NL, _("package \"%s\" not found\n"), package); continue; Index: pacman-lib/src/pacman/remove.c diff -u pacman-lib/src/pacman/remove.c:1.28 pacman-lib/src/pacman/remove.c:1.29 --- pacman-lib/src/pacman/remove.c:1.28 Thu Feb 1 01:35:30 2007 +++ pacman-lib/src/pacman/remove.c Mon Feb 26 03:43:02 2007 @@ -53,7 +53,7 @@ pmgrp_t *grp = alpm_db_readgrp(db_local, alpm_list_getdata(i)); if(grp) { int all; - alpm_list_t *pkgnames = alpm_grp_get_packages(grp); + alpm_list_t *pkgnames = alpm_grp_get_pkgs(grp); MSG(NL, _(":: group %s:\n"), alpm_grp_get_name(grp)); list_display(" ", pkgnames); @@ -117,7 +117,7 @@ if(config->flags & PM_TRANS_FLAG_RECURSE || config->flags & PM_TRANS_FLAG_CASCADE) { /* list transaction targets */ alpm_list_t *lst = NULL; - for(i = alpm_trans_get_packages(); i; i = alpm_list_next(i)) { + for(i = alpm_trans_get_pkgs(); i; i = alpm_list_next(i)) { pmpkg_t *pkg = alpm_list_getdata(i); lst = alpm_list_add(lst, strdup(alpm_pkg_get_name(pkg))); } Index: pacman-lib/src/pacman/sync.c diff -u pacman-lib/src/pacman/sync.c:1.114 pacman-lib/src/pacman/sync.c:1.115 --- pacman-lib/src/pacman/sync.c:1.114 Fri Feb 23 02:50:35 2007 +++ pacman-lib/src/pacman/sync.c Mon Feb 26 03:43:02 2007 @@ -292,7 +292,7 @@ if(grp) { /* TODO this should be a lot cleaner, why two outputs? */ MSG(NL, "%s\n", (char *)alpm_grp_get_name(grp)); - list_display(" ", alpm_grp_get_packages(grp)); + list_display(" ", alpm_grp_get_pkgs(grp)); } } } @@ -305,7 +305,7 @@ MSG(NL, "%s\n", (char *)alpm_grp_get_name(grp)); if(grp && level > 1) { - list_display(" ", alpm_grp_get_packages(grp)); + list_display(" ", alpm_grp_get_pkgs(grp)); } } } @@ -510,10 +510,10 @@ * this can prevent some of the "syntax error" problems users can have * when sysupgrade'ing with an older version of pacman. */ - data = alpm_trans_get_packages(); + data = alpm_trans_get_pkgs(); for(i = data; i; i = alpm_list_next(i)) { pmsyncpkg_t *sync = alpm_list_getdata(i); - pmpkg_t *spkg = alpm_sync_get_package(sync); + pmpkg_t *spkg = alpm_sync_get_pkg(sync); if(strcmp("pacman", alpm_pkg_get_name(spkg)) == 0 && alpm_list_count(data) > 1) { MSG(NL, _("\n:: pacman has detected a newer version of the \"pacman\" package.\n")); MSG(NL, _(":: It is recommended that you allow pacman to upgrade itself\n")); @@ -567,7 +567,7 @@ found++; MSG(NL, _(":: group %s:\n"), targ); /* remove dupe entries in case a package exists in multiple repos */ - alpm_list_t *pkgs = alpm_list_remove_dupes(alpm_grp_get_packages(grp)); + alpm_list_t *pkgs = alpm_list_remove_dupes(alpm_grp_get_pkgs(grp)); list_display(" ", pkgs); if(yesno(_(":: Install whole content? [Y/n] "))) { for(k = pkgs; k; k = alpm_list_next(k)) { @@ -659,7 +659,7 @@ goto cleanup; } - packages = alpm_trans_get_packages(); + packages = alpm_trans_get_pkgs(); if(packages == NULL) { /* nothing to do: just exit without complaining */ MSG(NL, _(" local database is up to date\n")); Index: pacman-lib/src/pacman/util.c diff -u pacman-lib/src/pacman/util.c:1.29 pacman-lib/src/pacman/util.c:1.30 --- pacman-lib/src/pacman/util.c:1.29 Sat Feb 10 04:34:59 2007 +++ pacman-lib/src/pacman/util.c Mon Feb 26 03:43:02 2007 @@ -274,7 +274,7 @@ for(i = syncpkgs; i; i = alpm_list_next(i)) { pmsyncpkg_t *sync = alpm_list_getdata(i); - pmpkg_t *pkg = alpm_sync_get_package(sync); + pmpkg_t *pkg = alpm_sync_get_pkg(sync); /* If this sync record is a replacement, the data member contains * a list of packages to be removed due to the package that is being @@ -381,9 +381,14 @@ const unsigned short chomp = alpm_option_get_chomp(); const unsigned int hashlen = proglen - 8; const unsigned int hash = percent * hashlen / 100; - unsigned int lasthash = 0, mouth = 0; + static unsigned int lasthash = 0, mouth = 0; unsigned int i; + if(percent == 0) { + lasthash = 0; + mouth = 0; + } + printf(" ["); for(i = hashlen; i > 1; --i) { /* if special progress bar enabled */

1 0