[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-315-g94d22f9
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 94d22f93096e210cd00d2e9c97c65f77d49ae387 (commit) via 4bdb868ac8d535a3818d519b16eff7d129fe6717 (commit) via 624a87870164ab48bda485204d6fd49c86a0c354 (commit) via 63335859d1b1c77222c31229fe499c031a76361d (commit) via f15cce1d414cb497ee804d50c25c6d3d717240bd (commit) via 3ace8ceb2343621ada4a72fc60e8e03a570fd389 (commit) via 11d8418737d9d9c12584c6eed83bc6cea46ef3e9 (commit) via 763d638ca1d3f1f1d6a8276e36b837e82890f4ee (commit) via a8c3202836014908b95df7d294d2e309faf4b2a0 (commit) via f12ead2cf278d4a9b330d0d320733960fc750e96 (commit) via d589a7b5dbdfcf740d72aa4e9e8fcab9a3de0fbd (commit) via e27a5c88514c5eb9480294374e98914ec27bf65d (commit) from ac7d17f88e200f3f1c213474e7b875ecd341753d (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 94d22f93096e210cd00d2e9c97c65f77d49ae387 Author: Allan McRae <allan@archlinux.org> Date: Wed Jun 22 14:07:27 2011 +1000 Document group and providers selection The format required for selection of packages within the group selection dialog is not entirely obvious, so provide some documentation. Fixes FS#24134. Signed-off-by: Allan McRae <allan@archlinux.org> commit 4bdb868ac8d535a3818d519b16eff7d129fe6717 Author: Allan McRae <allan@archlinux.org> Date: Sat Jun 18 12:40:14 2011 +1000 makepkg: clean-up of output messages There was a lot of inconsistency in how strings that should not be translated (program names, option flags, PKGBUILD directives, etc) were handled. This patch moves them all outside the gettext invocation for consistency and to prevent accidental translation. Note that some of these may need reverted if they cause difficulties in translation due to gettext usage in bash not taking positional parameters for arguments. A quick survey of current translations indicates that this issue will be rare. Also, we should be able to catch these before a full string freeze given we are going to probably need a "developer preview" release before the next release series. Signed-off-by: Allan McRae <allan@archlinux.org> commit 624a87870164ab48bda485204d6fd49c86a0c354 Author: Dan McGee <dan@archlinux.org> Date: Wed Jun 22 15:45:09 2011 -0500 pactest: generate sync DB's in memory Sync database are no longer exploded on the filesystem. Rework the logic used to generate our test databases so we can create them completely in memory without having to write the individual files to disk at all. The local database is unaffected. Note that several shortcomings in libalpm parsing were discovered by this change, which have since been temporarily patched around in this test suite: * archive_fgets() did not properly handle a file that ended in a non-newline, and would silently drop the data in this line. * sync database with only the file entries and not the directories would fail to parse properly, and even cause segfaults in some cases. Signed-off-by: Dan McGee <dan@archlinux.org> commit 63335859d1b1c77222c31229fe499c031a76361d Author: Dan McGee <dan@archlinux.org> Date: Wed Jun 22 15:11:56 2011 -0500 pactest: refactor install file creation Signed-off-by: Dan McGee <dan@archlinux.org> commit f15cce1d414cb497ee804d50c25c6d3d717240bd Author: Dan McGee <dan@archlinux.org> Date: Wed Jun 22 15:05:53 2011 -0500 pactest: move filelist/backup generation into package object These are definite methods that operate on a package, so move them there which cleans up util a bit more. Signed-off-by: Dan McGee <dan@archlinux.org> commit 3ace8ceb2343621ada4a72fc60e8e03a570fd389 Author: Dan McGee <dan@archlinux.org> Date: Wed Jun 22 14:39:50 2011 -0500 pactest: make pmfile a bit more pythonic Signed-off-by: Dan McGee <dan@archlinux.org> commit 11d8418737d9d9c12584c6eed83bc6cea46ef3e9 Author: Dan McGee <dan@archlinux.org> Date: Wed Jun 22 14:45:55 2011 -0500 pactest: small cleanups and chmod -x most files Remove empty docstrings, small and easy pylint fixes, etc. Signed-off-by: Dan McGee <dan@archlinux.org> commit 763d638ca1d3f1f1d6a8276e36b837e82890f4ee Author: Dan McGee <dan@archlinux.org> Date: Wed Jun 22 14:28:56 2011 -0500 pactest: clean up database section writing Signed-off-by: Dan McGee <dan@archlinux.org> commit a8c3202836014908b95df7d294d2e309faf4b2a0 Author: Dan McGee <dan@archlinux.org> Date: Wed Jun 22 13:58:07 2011 -0500 pactest: add isize attribute, fix url attribute Signed-off-by: Dan McGee <dan@archlinux.org> commit f12ead2cf278d4a9b330d0d320733960fc750e96 Author: Dan McGee <dan@archlinux.org> Date: Fri Jun 24 00:40:03 2011 -0500 Remove three unnecessary usages of alpm_list_count() For the files count when loading from a package, we can keep a counter. The two in the frontend were completely useless due to the fact that if sync_dbs is non-NULL, alpm_list_count() will always be greater than 0. Signed-off-by: Dan McGee <dan@archlinux.org> commit d589a7b5dbdfcf740d72aa4e9e8fcab9a3de0fbd Author: Dan McGee <dan@archlinux.org> Date: Fri Jun 24 01:33:12 2011 -0500 Prevent segfault when parsing unexpected sync database file This doesn't fix the real (bigger) problem of failing to parse sync databases without directory entries, but it does prevent the parser from segfaulting when the first desc file encountered did not have a directory entry, among other conditions. Signed-off-by: Dan McGee <dan@archlinux.org> commit e27a5c88514c5eb9480294374e98914ec27bf65d Author: Dave Reisner <d@falconindy.com> Date: Wed Jun 22 17:53:06 2011 -0400 parse-options: simplify unused-arg & parameter printing Signed-off-by: Dave Reisner <d@falconindy.com> ----------------------------------------------------------------------- Summary of changes: doc/pacman.8.txt | 12 ++- lib/libalpm/be_package.c | 5 +- lib/libalpm/be_sync.c | 6 +- scripts/library/parse_options.sh | 13 +-- scripts/makepkg.sh.in | 102 ++++++++-------- src/pacman/query.c | 2 +- src/pacman/sync.c | 2 +- test/pacman/pactest.py | 20 ++-- test/pacman/pmdb.py | 242 +++++++++++++++---------------------- test/pacman/pmenv.py | 26 ++-- test/pacman/pmfile.py | 24 +++-- test/pacman/pmpkg.py | 49 ++++++++- test/pacman/pmtest.py | 43 +------ test/pacman/util.py | 44 ------- 14 files changed, 255 insertions(+), 335 deletions(-) mode change 100755 => 100644 test/pacman/pmdb.py mode change 100755 => 100644 test/pacman/pmenv.py mode change 100755 => 100644 test/pacman/pmfile.py mode change 100755 => 100644 test/pacman/pmpkg.py mode change 100755 => 100644 test/pacman/pmrule.py mode change 100755 => 100644 test/pacman/pmtest.py mode change 100755 => 100644 test/pacman/util.py hooks/post-receive -- The official pacman repository
allan broke it in 4bdb868a. Signed-off-by: Dave Reisner <d@falconindy.com> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e101a76..3d40bc1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2096,7 +2096,7 @@ if (( INFAKEROOT )); then tidy_install fi else - warning "$(gettext "Repackaging without the use of a %s function is deprecated.")" "package()" + warning "$(gettext "Repackaging without the use of a %s function is deprecated." "package()")" plain "$(gettext "File permissions may not be preserved.")" fi else -- 1.7.5.4
On 24/06/11 22:39, Dave Reisner wrote:
allan broke it in 4bdb868a.
Signed-off-by: Dave Reisner<d@falconindy.com> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e101a76..3d40bc1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2096,7 +2096,7 @@ if (( INFAKEROOT )); then tidy_install fi else - warning "$(gettext "Repackaging without the use of a %s function is deprecated.")" "package()" + warning "$(gettext "Repackaging without the use of a %s function is deprecated." "package()")" plain "$(gettext "File permissions may not be preserved.")" fi else
You stuffed this up worse than I did.... Allan
On 24/06/11 22:43, Allan McRae wrote:
On 24/06/11 22:39, Dave Reisner wrote:
allan broke it in 4bdb868a.
Signed-off-by: Dave Reisner<d@falconindy.com> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e101a76..3d40bc1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2096,7 +2096,7 @@ if (( INFAKEROOT )); then tidy_install fi else - warning "$(gettext "Repackaging without the use of a %s function is deprecated.")" "package()" + warning "$(gettext "Repackaging without the use of a %s function is deprecated." "package()")" plain "$(gettext "File permissions may not be preserved.")" fi else
You stuffed this up worse than I did....
In fact... what is wrong?
On Fri, Jun 24, 2011 at 10:47:58PM +1000, Allan McRae wrote:
On 24/06/11 22:43, Allan McRae wrote:
On 24/06/11 22:39, Dave Reisner wrote:
allan broke it in 4bdb868a.
Signed-off-by: Dave Reisner<d@falconindy.com> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e101a76..3d40bc1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2096,7 +2096,7 @@ if (( INFAKEROOT )); then tidy_install fi else - warning "$(gettext "Repackaging without the use of a %s function is deprecated.")" "package()" + warning "$(gettext "Repackaging without the use of a %s function is deprecated." "package()")" plain "$(gettext "File permissions may not be preserved.")" fi else
You stuffed this up worse than I did....
In fact... what is wrong?
==> Validating source files with md5sums... pacman.conf ... Passed pacman.conf.x86_64 ... Passed makepkg.conf ... Passed ==> Extracting Sources... /usr/bin/makepkg: line 2325: unexpected EOF while looking for matching `)' Which traces back to this particular line. It's mismatched quoting, really. d
On 24/06/11 22:56, Dave Reisner wrote:
On Fri, Jun 24, 2011 at 10:47:58PM +1000, Allan McRae wrote:
On 24/06/11 22:43, Allan McRae wrote:
On 24/06/11 22:39, Dave Reisner wrote:
allan broke it in 4bdb868a.
Signed-off-by: Dave Reisner<d@falconindy.com> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e101a76..3d40bc1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2096,7 +2096,7 @@ if (( INFAKEROOT )); then tidy_install fi else - warning "$(gettext "Repackaging without the use of a %s function is deprecated.")" "package()" + warning "$(gettext "Repackaging without the use of a %s function is deprecated." "package()")" plain "$(gettext "File permissions may not be preserved.")" fi else
You stuffed this up worse than I did....
In fact... what is wrong?
==> Validating source files with md5sums... pacman.conf ... Passed pacman.conf.x86_64 ... Passed makepkg.conf ... Passed ==> Extracting Sources... /usr/bin/makepkg: line 2325: unexpected EOF while looking for matching `)'
Which traces back to this particular line. It's mismatched quoting, really.
Look at the line number and the patch sent to the list before your one...
On Fri, Jun 24, 2011 at 10:43:00PM +1000, Allan McRae wrote:
On 24/06/11 22:39, Dave Reisner wrote:
allan broke it in 4bdb868a.
Signed-off-by: Dave Reisner<d@falconindy.com> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e101a76..3d40bc1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2096,7 +2096,7 @@ if (( INFAKEROOT )); then tidy_install fi else - warning "$(gettext "Repackaging without the use of a %s function is deprecated.")" "package()" + warning "$(gettext "Repackaging without the use of a %s function is deprecated." "package()")" plain "$(gettext "File permissions may not be preserved.")" fi else
You stuffed this up worse than I did....
Allan
I will neither confirm nor deny, but at this least this lets makepkg build me packges. =P anyways, im too slow. d
participants (3)
-
Allan McRae
-
dan＠archlinux.org
-
Dave Reisner