- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.2.2-9-ga309a01
by dan＠archlinux.org 24 Feb '09

24 Feb '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, maint has been updated via a309a016bfed9f67452f2a6556fb4391fd55b34e (commit) from e7daa59f845f073511c632a972215d047f292f25 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Add pkggrp variable for split packages?
by Allan McRae 24 Feb '09

24 Feb '09

Hi all, One of the things that needs fixed in the splitpkg work is the printing of informational messages. I.e. when printing anything to do with $pkgname. Think of the following messages. - "is not available for the ? architecture" - "Making package" - "Finished making" At the moment ${pkgname[0]} is printed, but that may not be good. The same thing occurs with "makepkg --source" and the naming of the source tarball. I propose fixing this by adding a "pkggrp" field that is only valid with split packages and will hold a name to be used when describing a group of packages. If not specified, it will fall back to pkgname[0]. Does this sound reasonable to people? Allan

4 4

[pacman-dev] [PATCH 1/1] makepkg: fix updating pkgrel with pkgver in SCM packages
by Allan McRae 23 Feb '09

23 Feb '09

Commit 1e656c0a introduced the changing of pkgrel to 1 when the pkgver was updated in SCM PKGBUILDs. However, the output in the "Making package:" was wrong. Attempting to fix that created another bug (FS#13416). Interestingly, pkgver was only ever being updated in the fakeroot stage which caused this problem. Now both pkgver and pkgrel are updated after the first devel_check and devel_update. Enjoy the really long explaination for a two line fix... Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e10c345..52e80d1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1176,8 +1176,6 @@ devel_check() { if [ -n "$newpkgver" ]; then msg2 "$(gettext "Version found: %s")" "$newpkgver" - pkgver=$newpkgver - pkgrel=1 fi else -- 1.6.1.3

1 0

[pacman-dev] Pacman Disk Space Issues
by Matthew Wood 20 Feb '09

20 Feb '09

Good Evening- In following the posting at: http://bbs.archlinux.org/viewtopic.php?pid=502174#p502174. I was wondering what the status of the disk space issue was and if I could assist in working out a disk space checking function to incorporate into it. According to the afformentioned post, there is some contention as to where the problem lies. Additionally, I would like to be sure I am following the right procedure for submitting changes, as I have not previously done any work for the community, so please forgive any procedural mistakes or dumb questions, thanks. Matt

4 4

[pacman-dev] [translation] kazakh translation for pacman and libalpm
by Hugo Doria 19 Feb '09

19 Feb '09

kazakh translation for pacman and libalpm. Sent from Baurzhan Muftakhidinov. -- Hugo

1 0

[pacman-dev] Code style (was: [PATCH 2/3] Enabled a new prompt...)
by Dan McGee 19 Feb '09

19 Feb '09

On Wed, Feb 18, 2009 at 9:45 PM, Bryan Ischo <bji-keyword-pacman.3644cb(a)www.ischo.com> wrote: > Dan McGee wrote: >> You can wrap this if you want, ignore my earlier weird recommendations. >> > > Are you talking about the line length issues you pointed out before? And > are you saying here that it's OK to wrap the lines to fit 80 columns in my > editor, rather than trying to match another environment? > > I think that's what you're saying. I will henceforth wrap wherever makes > the most sense for me. You hadn't commented on my comments before, but I > think you agree that the pacman code style guidelines unfortunately cause > problems like these. Using tabs for indentation only works for unbroken > lines; as soon as a line is broken and the second half needs to be lined up > on a non-tab-boundary (with function arguments on the second line lining up > with those on the first, for example), Here is the false statement. Lining things up makes for a hellish experience, and never seems to work right, and only encourages the spaces vs. tabs debate. Just let the editor do the hard work for you- I don't want it to line up at all. Two additional tabs is the standard going rate in our codebase, as this is what vim does by default anyways. The only way lining them up makes sense is if your function name is super short- as soon as your function name and return type are more than 30 characters, you are just needlessly cramming everything over to the right. > then it all goes to pot, since the > number of tabs/spaces needed to make these broken lines line up properly is > entirely dependent on your tab width. Exactly why I'm proposing we do this *not* based on tab width at all. Two extra tabs, always, end of story. > The same problem is true for breaking lines to avoid going over 80 columns; > where 80 columns is for a given line depends on your tab width when you use > tab indenting. I use width 4 tab stops, which I think is just about as > "standard" as you can get with tab widths, but if you're using width 2 tab > stops, then you can fit quite a bit more on deeply nested lines than I can. We probably should be using 4-wide tab stops, but as you can see in the files, the modeline currently sets it to 2. If we were to change this we would have an awful lot of ugly code staring at us, and I'm not quite ready to take that plunge yet. -Dan

3 2

[pacman-dev] [PATCH 2/4] repo-add : remove useless test_repo_db_file function
by Xavier Chantry 19 Feb '09

19 Feb '09

This function was used only once, was basically just one line, and was also called with an unused argument. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- scripts/repo-add.sh.in | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index c89e2a5..6b10527 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -82,15 +82,6 @@ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" } -# test if a file is a repository DB -test_repo_db_file () { - if bsdtar -tf "$REPO_DB_FILE" | grep -q "/desc"; then - return 0 # YES - else - return 1 # NO - fi -} - # write a list entry # arg1 - Entry name # arg2 - List @@ -328,7 +319,7 @@ for arg in "$@"; do # store absolute path to repo DB REPO_DB_FILE=$($realpath "$arg") if [ -f "$REPO_DB_FILE" ]; then - if ! test_repo_db_file $cmd; then + if ! (bsdtar -tf "$REPO_DB_FILE" | grep -q "/desc"); then error "$(gettext "Repository file '%s' is not a proper pacman database.")" "$REPO_DB_FILE" exit 1 fi -- 1.6.1.3

3 6

[pacman-dev] [PATCH] contrib/pacdiff : big rework and cleanup
by Xavier Chantry 19 Feb '09

19 Feb '09

I initially only wanted to add a -l/--locate option to use locate instead of find, which should have been easy. Then I thought I would try to support filename with whitespaces while I was at it, and this was a bit more complex. Then I asked for some help on #bash, and I received a lot of criticism on the script :) I tried to address them all, so hopefully that script is in a better state now. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- contrib/pacdiff | 64 +++++++++++++++++++++++++++++++++--------------------- 1 files changed, 39 insertions(+), 25 deletions(-) diff --git a/contrib/pacdiff b/contrib/pacdiff index 6493649..f9c29fb 100755 --- a/contrib/pacdiff +++ b/contrib/pacdiff @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # pacdiff : a simple pacnew/pacorig/pacsave updater for /etc/ # # Copyright (c) 2007 Aaron Griffin <aaronmgriffin(a)gmail.com> @@ -17,29 +17,43 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -# Original http://phraktured.net/config/bin/pacdiff - diffprog=${DIFFPROG:-vimdiff} -for x in $(find /etc/ -name "*.pacnew" -o -name "*.pacorig" -o -name "*.pacsave") -do - echo "File: ${x%.pac*}" - chk="$(cmp $x ${x%.pac*})" - if [ -z "${chk}" ]; then - echo " Files are identical, removing..." - rm $x - else - echo -n " File differences found. (V)iew, (S)kip, (R)emove: [v/s/r] " - read c - c="$(echo $c| tr A-Z a-z)" #tolower - if [ "$c" = "r" ]; then - rm $x - elif [ "$c" = "s" ]; then - continue - else - [ "$c" = "n" -o "$c" = "N" ] || $diffprog $x ${x%.pac*} - echo -n " Remove file? [Y/n] " - read c - [ "$c" = "n" -o "$c" = "N" ] || rm $x - fi - fi + +case $1 in + -l|--locate) + cmd() { locate -0 -e -b \*.pacnew \*.pacorig \*.pacsave; } + ;; + *) + cmd() { find /etc/ -name \*.pacnew -o -name \*.pacorig -o -name \*.pacsave -print0; } + ;; +esac + +exec 3< <(cmd) +while IFS= read -r -d '' pacfile <&3; do + file="${pacfile%.pac*}" + echo "File: $file" + if [ ! -f "$file" ]; then + echo " $file does not exist" + rm -i "$pacfile" + continue + fi + check="$(cmp "$pacfile" "$file")" + if [ -z "${check}" ]; then + echo " Files are identical, removing..." + rm "$pacfile" + else + echo -n " File differences found. (V)iew, (S)kip, (R)emove: [v/s/r] " + while read c; do + case $c in + r|R) rm "$pacfile"; break ;; + v|V) + $diffprog "$pacfile" "$file" + rm -i "$pacfile"; break ;; + s|S) break ;; + *) echo -n " Invalid answer. Try again: [v/s/r] "; continue ;; + esac + done + fi done +exec 3>&- +exit 0 -- 1.6.1.3

4 8

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.2.2-8-ge7daa59
by dan＠archlinux.org 19 Feb '09

19 Feb '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, maint has been updated via e7daa59f845f073511c632a972215d047f292f25 (commit) via 48b209d6121f24e990951daf0edf1345012b4c78 (commit) via eb1775e485f7320142a3c66332166ff5ab1f0401 (commit) from ea84819bbbdba90f950339790d482f2348c2e9ef (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: doc/PKGBUILD.5.txt | 10 +++++----- po/pl.po | 2 +- scripts/repo-add.sh.in | 29 ++++++++++++++++------------- 3 files changed, 22 insertions(+), 19 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-86-g1c4633e
by dan＠archlinux.org 19 Feb '09

19 Feb '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 1c4633ea2cbc01cfd7929509724951615827c482 (commit) via 6c4d702cb10f9bc5da23b6511f09f4b4a07a4281 (commit) via e7daa59f845f073511c632a972215d047f292f25 (commit) via e515d89969ac7f8448a419b373530376ffe436bf (commit) via dce7aa85696680035a512dde7daf89f9506f8523 (commit) via 48b209d6121f24e990951daf0edf1345012b4c78 (commit) via 14c1a4423e62d9026e8025b79e6902c06ea4ae47 (commit) via eb1775e485f7320142a3c66332166ff5ab1f0401 (commit) from 04c2b9d4edb7f7e592919fa3bb975f9edd4fa0a6 (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 1c4633ea2cbc01cfd7929509724951615827c482 Merge: 6c4d702cb10f9bc5da23b6511f09f4b4a07a4281 e7daa59f845f073511c632a972215d047f292f25 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Feb 18 21:20:17 2009 -0600 Merge branch 'maint' commit 6c4d702cb10f9bc5da23b6511f09f4b4a07a4281 Author: Bryan Ischo <bryan(a)ischo.com> Date: Tue Jan 27 01:48:39 2009 +1300 Reorganize code for one-at-a-time resolving This change reorganizes the internal code so that packages are resolved one at a time instead of all at once from a list. This will allow a future checkin to prompt the user to see if they'd rather remove unresolvable packages from the transaction and continue, or fail the transaction. This change does not affect the actual behavior of libalpm and all tests pass without changes. Signed-off-by: Bryan Ischo <bryan(a)ischo.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e515d89969ac7f8448a419b373530376ffe436bf Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Feb 18 15:35:00 2009 +0100 repo-add : remove useless test_repo_db_file function This function was used only once, was basically just one line, and was also called with an unused argument. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dce7aa85696680035a512dde7daf89f9506f8523 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Tue Feb 17 23:40:11 2009 +0100 contrib/pacdiff : rework and cleanup I initially only wanted to add a -l/--locate option to use locate instead of find, which should have been easy. Then I thought I would try to support filename with whitespace while I was at it, and this was a bit more complex. The safest ways seem to be the following ones : http://mywiki.wooledge.org/BashFAQ/020 Then I received a lot of suggestions on #bash about how to improve the script, which I tried to address. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> [Dan: fix grouping of find arguments] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 14c1a4423e62d9026e8025b79e6902c06ea4ae47 Author: Kevin Barry <barryk(a)gmail.com> Date: Sun Feb 15 19:47:45 2009 -0500 configure.ac: use full path of stat for Mac OS X Change configure.ac to use the full path of stat when on darwin/mac. This is needed for situations when a user installs the GNU/coreutils and places it in their path before /usr/bin, but the SIZECMD is already configured for Darwin's version of stat. Signed-off-by: Kevin Barry <barryk gmail com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- contrib/pacdiff | 85 ++++++++++++++++++++++++++++++++--------------- doc/PKGBUILD.5.txt | 10 +++--- lib/libalpm/deps.c | 50 ++++++++++++++++++++++------ lib/libalpm/deps.h | 4 +- lib/libalpm/sync.c | 47 ++++++++++++++++++++------ po/pl.po | 2 +- scripts/repo-add.sh.in | 40 +++++++++------------- 8 files changed, 160 insertions(+), 80 deletions(-) hooks/post-receive -- The official pacman repository

1 0