- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Remove -f option from ln for POSIX compliance (close FS#24893)
by Eric Bélanger 26 Jun '11

26 Jun '11

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- scripts/makepkg.sh.in | 18 ++++++++++++------ scripts/repo-add.sh.in | 10 ++++++---- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8d082a2..ed5cdef 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -518,7 +518,8 @@ download_sources() { local file=$(get_filepath "$netfile" || true) if [[ -n "$file" ]]; then msg2 "$(gettext "Found %s")" "${file##*/}" - ln -sf "$file" "$srcdir/" + rm -f "$srcdir/$file" + ln -s "$file" "$srcdir/" continue fi @@ -878,8 +879,8 @@ tidy_install() { # update symlinks to this manpage find ${MAN_DIRS[@]} -lname "$file" 2>/dev/null | while read link ; do - rm -f "$link" - ln -sf "${file}.gz" "${link}.gz" + rm -f "$link" "${link}.gz" + ln -s "${file}.gz" "${link}.gz" done # check file still exists (potentially already compressed due to hardlink) @@ -1187,9 +1188,13 @@ create_package() { create_signature "$pkg_file" if (( ! ret )) && [[ ! "$PKGDEST" -ef "${startdir}" ]]; then - ln -sf "${pkg_file}" "${pkg_file/$PKGDEST/$startdir}" + rm -f "${pkg_file/$PKGDEST/$startdir}" + ln -s "${pkg_file}" "${pkg_file/$PKGDEST/$startdir}" ret=$? - [[ -f $pkg_file.sig ]] && ln -sf "$pkg_file.sig" "${pkg_file/$PKGDEST/$startdir}.sig" + if [[ -f $pkg_file.sig ]]; then + rm -f "${pkg_file/$PKGDEST/$startdir}.sig" + ln -s "$pkg_file.sig" "${pkg_file/$PKGDEST/$startdir}.sig" + fi fi if (( ret )); then @@ -1276,7 +1281,8 @@ create_srcpackage() { fi if (( ! ret )) && [[ ! "$SRCPKGDEST" -ef "${startdir}" ]]; then - ln -sf "${pkg_file}" "${pkg_file/$SRCPKGDEST/$startdir}" + rm -f "${pkg_file/$SRCPKGDEST/$startdir}" + ln -s "${pkg_file}" "${pkg_file/$SRCPKGDEST/$startdir}" ret=$? fi diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index e970da3..b125035 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -613,12 +613,14 @@ if (( success )); then [[ -f $tmpdir/$filename.sig ]] && mv "$tmpdir/$filename.sig" "$REPO_DB_FILE.sig" dblink="${REPO_DB_FILE%.tar*}" target=${REPO_DB_FILE##*/} - ln -sf "$target" "$dblink" 2>/dev/null || \ - ln -f "$target" "$dblink" 2>/dev/null || \ + rm -f "$dblink" + ln -s "$target" "$dblink" 2>/dev/null || \ + ln "$target" "$dblink" 2>/dev/null || \ cp "$REPO_DB_FILE" "$dblink" if [[ -f "$target.sig" ]]; then - ln -sf "$target.sig" "$dblink.sig" 2>/dev/null || \ - ln -f "$target.sig" "$dblink.sig" 2>/dev/null || \ + rm -f "$dblink.sig" + ln -s "$target.sig" "$dblink.sig" 2>/dev/null || \ + ln "$target.sig" "$dblink.sig" 2>/dev/null || \ cp "$REPO_DB_FILE.sig" "$dblink.sig" fi else -- 1.7.5.4

3 4

[pacman-dev] [PATCH] makepkg: Move check for sudo into check_software function
by Eric Bélanger 25 Jun '11

25 Jun '11

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- scripts/makepkg.sh.in | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ebe010b..4e15d54 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1449,6 +1449,13 @@ check_software() { # check for needed software local ret=0 + # check for sudo if we will need it during makepkg execution + if (( ! ( ASROOT || INFAKEROOT ) && ( DEP_BIN || RMDEPS || INSTALL ) )); then + if ! type -p sudo >/dev/null; then + warning "$(gettext "Sudo can not be found. Will use su to acquire root privileges.")" + fi + fi + # fakeroot - building as non-root user if [[ $(check_buildenv fakeroot) = "y" ]] && (( EUID > 0 )); then if ! type -p fakeroot >/dev/null; then @@ -1898,13 +1905,6 @@ else fi fi -# check for sudo if we will need it during makepkg execution -if (( ! ( ASROOT || INFAKEROOT ) && ( DEP_BIN || RMDEPS || INSTALL ) )); then - if ! type -p sudo >/dev/null; then - warning "$(gettext "Sudo can not be found. Will use su to acquire root privileges.")" - fi -fi - unset pkgname pkgbase pkgver pkgrel epoch pkgdesc url license groups provides unset md5sums replaces depends conflicts backup source install changelog build unset makedepends optdepends options noextract -- 1.7.5.4

2 1

[pacman-dev] [PATCH] Add scripts po directory to autoclean.sh
by Allan McRae 24 Jun '11

24 Jun '11

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- autoclean.sh | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/autoclean.sh b/autoclean.sh index 71284ad..1a1ed5e 100755 --- a/autoclean.sh +++ b/autoclean.sh @@ -26,12 +26,7 @@ rm -f test/pacman/*.pyc rm -f doc/html/*.html rm -f doc/man3/*.3 -rm -f po/{Makefile.in,Makefile} -rm -f po/POTFILES -rm -f po/stamp-po -rm -f po/*.gmo - -rm -f lib/libalpm/po/{Makefile.in,Makefile} -rm -f lib/libalpm/po/POTFILES -rm -f lib/libalpm/po/stamp-po -rm -f lib/libalpm/po/*.gmo +rm -f {.,lib/libalpm,scripts}/po/{Makefile.in,Makefile} +rm -f {.,lib/libalpm,scripts}/po/POTFILES +rm -f {.,lib/libalpm,scripts}/po/stamp-po +rm -f {.,lib/libalpm,scripts}/po/*.gmo -- 1.7.5.4

2 2

[pacman-dev] [PATCH] repo-add: add new command, repo-elephant
by Dave Reisner 24 Jun '11

24 Jun '11

_ _ / \__/ \_____ / / \ \ `\ ) \''/ ( |\ `\__)/__/'_\ / ` //_|_|~|_|_| ^""'"' ""'"' Signed-off-by: Dave Reisner <d(a)falconindy.com> --- An elephant never forgets... or forgives... scripts/Makefile.am | 7 ++++++- scripts/repo-add.sh.in | 26 ++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletions(-) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 3b96c11..492eb0f 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -5,7 +5,8 @@ SUBDIRS = po bin_SCRIPTS = \ $(OURSCRIPTS) \ - repo-remove + repo-remove \ + repo-elephant OURSCRIPTS = \ makepkg \ @@ -97,4 +98,8 @@ repo-remove: $(srcdir)/repo-add.sh.in rm -f repo-remove $(LN_S) repo-add repo-remove +repo-elephant: $(srcdir)/repo-add.sh.in + rm -f repo-elephant + $(LN_S) repo-add repo-elephant + # vim:set ts=2 sw=2 noet: diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 9fdc750..0ccefc2 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -391,6 +391,27 @@ db_remove_entry() { return $notfound } # end db_remove_entry +elephant() { + cat <<EOF + __ + '. \ + '- \ + / /_ .---. + / | \\,.\/--.// ) + | \// )/ / + \ ' ^ ^ / )____.----.. 6 + '.____. .___/ \._) + .\/. ) + '\ / + _/ \/ ). ) ( + /# .! | /\ / + \ C// # /'-----''/ # / + . 'C/ | | | | |mrf , + \), .. .'OOO-'. ..'OOO'OOO-'. ..\(, +EOF + exit 0 +} + check_repo_db() { local repodir @@ -533,6 +554,11 @@ esac # figure out what program we are cmd=${0##*/} +if [[ $cmd == "repo-elephant" ]]; then + elephant + exit 0 +fi + if [[ $cmd != "repo-add" && $cmd != "repo-remove" ]]; then error "$(gettext "Invalid command name '%s' specified.")" "$cmd" exit 1 -- 1.7.5.4

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-323-ge06586c
by dan＠archlinux.org 24 Jun '11

24 Jun '11

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 e06586ceb49a0dc7e59996ae3a1483337d2ada05 (commit) via 61cb8e76c3f42bad318462e51bbfade752425023 (commit) via c45cfb17419a0bc56c1396febd83f455a0dcbad0 (commit) via 4f8ae2bab61c8fc678589c6840d44977c82d4cc2 (commit) via 7b8f8f69f14dac2bbcd7e96fc548aa084be7cd8e (commit) via 79e98316ea89486d107466858543e965bcfbb0a9 (commit) via 1150d9e15aaea2ae1f259995d11442f491ef0af7 (commit) via db3b86e7f34f4c3ccb42e98465f2069aa642a85f (commit) from 94d22f93096e210cd00d2e9c97c65f77d49ae387 (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 e06586ceb49a0dc7e59996ae3a1483337d2ada05 Author: Dave Reisner <d(a)falconindy.com> Date: Tue Jun 21 13:42:17 2011 -0400 pactree: carry a list of databases for dep resolution Declare an alpm_list which, for now, only holds our local database. walk_deps and walk_reverse_deps are refactored to account for this, and a helper function is added to wrap alpm_db_get_pkg for traversing a list. This is groundwork for letting pactree walk the sync DBs. Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 61cb8e76c3f42bad318462e51bbfade752425023 Author: Wieland Hoffmann <themineo(a)googlemail.com> Date: Fri Jun 24 12:59:20 2011 +0200 makepkg: Remove a lone quotation mark Allan broke it in 4bdb868. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c45cfb17419a0bc56c1396febd83f455a0dcbad0 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jun 24 17:19:32 2011 +1000 makepkg: remove the cleancache option This is a fairly useless feature given all it does is an "rm" on a directory. It is also unlikely that you would want to remove the entire SRCDEST anyway, but rather just the old files. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4f8ae2bab61c8fc678589c6840d44977c82d4cc2 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 24 04:11:38 2011 -0500 Don't require a transaction for sync DB updates Instead, just do the required locking directly in the backend in calls to alpm_db_update(). Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7b8f8f69f14dac2bbcd7e96fc548aa084be7cd8e Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 24 04:02:58 2011 -0500 Move locking functions to handle These operate on the handle, and the state is stored on the handle, so move them where they belong. Up until now only the transaction stuff calls them, but this will soon change and alpm_db_update() will handle locking all on its own. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 79e98316ea89486d107466858543e965bcfbb0a9 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 7 20:42:15 2011 -0500 Add a 'valid' flag to the database object Start by converting all of our flags to a 'status' bitmask (pkgcache status, grpcache status). Add a new 'valid' flag as well. This will let us keep track if the database itself has been marked valid in whatever fashion. For local databases at the moment we ensure there are no depends files; for sync databases we ensure the PGP signature is valid if required/requested. The loading of the pkgcache is prohibited if the database is invalid. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1150d9e15aaea2ae1f259995d11442f491ef0af7 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Apr 20 19:54:01 2011 -0500 Move database 'version' check to registration time This is another step toward doing both local database validation (ensuring we don't have depends files) and sync database validation (via signatures if present) when the database is registered. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit db3b86e7f34f4c3ccb42e98465f2069aa642a85f Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 7 17:29:55 2011 -0500 Do database signature checking at load time This is the ideal place to do it as all clients should be checking the return value and ensuring there are no errors. This is similar to pkg_load(). We also add an additional step of validation after we download a new database; a subsequent '-y' operation can potentially invalidate the original check at registration time. Note that this implementation is still a bit naive; if a signature is invalid it is currently impossible to refresh and re-download the file without manually deleting it first. Similarly, if one downloads a database and the check fails, the database object is still there and can be used. These shortcomings will be addressed in a future commit. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/makepkg.8.txt | 4 -- lib/libalpm/alpm.c | 2 +- lib/libalpm/alpm.h | 6 ++- lib/libalpm/be_local.c | 117 ++++++++++++++++++++++------------------ lib/libalpm/be_sync.c | 114 ++++++++++++++++++++++++++++++--------- lib/libalpm/db.c | 63 +++++++++------------ lib/libalpm/db.h | 18 ++++--- lib/libalpm/error.c | 2 + lib/libalpm/handle.c | 54 ++++++++++++++++++ lib/libalpm/handle.h | 3 + lib/libalpm/trans.c | 72 ++++--------------------- scripts/makepkg.sh.in | 38 +------------ src/pacman/conf.c | 19 ++----- src/pacman/sync.c | 7 --- src/pacman/util.c | 3 - src/util/cleanupdelta.c | 2 +- src/util/pactree.c | 37 +++++++++---- src/util/testdb.c | 2 +- test/pacman/tests/ignore007.py | 2 +- test/pacman/tests/sign001.py | 4 +- 20 files changed, 304 insertions(+), 265 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 0/9] repo-add cleanup
by Dave Reisner 24 Jun '11

24 Jun '11

Sigh. This started as a simple addition to the man page to document valid file extensions, and look what happened. The first 4 patches are a resend -- I've fixed the 2 blockers that Allan pointed out, the whitespace error I noticed, and a final tweak at Dan's suggestion to my terrible grammar in the man page. The other patches are a mix of cleanup, features, and a regression fix from an earlier patch I submitted. I wrote myself a little test suite for checking my work. It'll probably (eventually) end up as something more significant since, imo, repo-add deserves some test suite love. d Dave Reisner (9): repo-add: bashify reading of .PKGINFO file repo-add: store multi-value fields as arrays repo-add: use format_entry for all desc/depends fields repo-add.8.txt: document valid DB file extensions repo-add: enforce file extensions repo-add: fix path designation regression repo-add: avoid using ls to check for presence of files repo-add: move command invocation out of arg parsing loop repo-add: allow specifying symlink as repo file doc/repo-add.8.txt | 4 + scripts/repo-add.sh.in | 162 +++++++++++++++++++++++++---------------------- 2 files changed, 90 insertions(+), 76 deletions(-) -- 1.7.5.4

3 17

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-315-g94d22f9
by dan＠archlinux.org 24 Jun '11

24 Jun '11

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(a)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(a)archlinux.org> commit 4bdb868ac8d535a3818d519b16eff7d129fe6717 Author: Allan McRae <allan(a)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(a)archlinux.org> commit 624a87870164ab48bda485204d6fd49c86a0c354 Author: Dan McGee <dan(a)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(a)archlinux.org> commit 63335859d1b1c77222c31229fe499c031a76361d Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 22 15:11:56 2011 -0500 pactest: refactor install file creation Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f15cce1d414cb497ee804d50c25c6d3d717240bd Author: Dan McGee <dan(a)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(a)archlinux.org> commit 3ace8ceb2343621ada4a72fc60e8e03a570fd389 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 22 14:39:50 2011 -0500 pactest: make pmfile a bit more pythonic Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 11d8418737d9d9c12584c6eed83bc6cea46ef3e9 Author: Dan McGee <dan(a)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(a)archlinux.org> commit 763d638ca1d3f1f1d6a8276e36b837e82890f4ee Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 22 14:28:56 2011 -0500 pactest: clean up database section writing Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a8c3202836014908b95df7d294d2e309faf4b2a0 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 22 13:58:07 2011 -0500 pactest: add isize attribute, fix url attribute Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f12ead2cf278d4a9b330d0d320733960fc750e96 Author: Dan McGee <dan(a)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(a)archlinux.org> commit d589a7b5dbdfcf740d72aa4e9e8fcab9a3de0fbd Author: Dan McGee <dan(a)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(a)archlinux.org> commit e27a5c88514c5eb9480294374e98914ec27bf65d Author: Dave Reisner <d(a)falconindy.com> Date: Wed Jun 22 17:53:06 2011 -0400 parse-options: simplify unused-arg & parameter printing Signed-off-by: Dave Reisner <d(a)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

3 6

[pacman-dev] [PATCH] makepkg: Remove a lone quotation mark
by Wieland Hoffmann 24 Jun '11

24 Jun '11

Allan broke it in 4bdb868. --- 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..1043e44 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2245,7 +2245,7 @@ else if (( ! REPKG )); then tidy_install 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 fi -- 1.7.5.4

2 1

Re: [pacman-dev] Discussion about deprecating/removing the changelog feature from pacman.
by Marc - A. Dahlhaus 24 Jun '11

24 Jun '11

Am Donnerstag, den 23.06.2011, 15:48 -0500 schrieb Dan McGee: --8<-- > > We use changelogs quite extensively, and all should keep in mind that > > > > pacman -Qc PACKAGENAME > > > > will help any user that doesn't need to know where your PKGBUILD tree is > > managed / tracked / whatever... > > > > I would suggest that makepkg should be extended to have a way to add the > > output of a command (e.g. "svn log") as changelog to a package... > > > > That would make the life easier for any maintainer and would solve the > > problem even for the lazy arch package maintainers... :-P > > Agree with you here- this seems like it would be a useful addition. > Just calling out to a CHANGELOG_SCRIPT or something would be pretty > awesome. Arch Linux would use svn log --limit <date> of some sort, > other distros using git to track their repos could use git logs, etc. > > If you don't think you're interested in implementing this, I'd at > least suggest opening a feature request for it. Have some things to take care of for upstart first and will take a look at it when i'm done with it. Also have som cleanup work for pacman in my pipe but havn't had time to write down a mail for the list and for implementing it. (Mostly about a removal of '.d' suffix on /etc/pacman.d as its misnamed with respect to all other users of a '.d' suffix in etc and a rework of rate mirrors that would make a packages like "mirrors-{africa,asia,europe,{north,south}america}" possible without much of a hassle for pacman...) Marc

1 0

[pacman-dev] [PATCH] makepkg: remove the cleancache option
by Allan McRae 24 Jun '11

24 Jun '11

This is a fairly useless feature given all it does is an "rm" on a directory. It is also unlikely that you would want to remove the entire SRCDEST anyway, but rather just the old files. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/makepkg.8.txt | 4 ---- scripts/makepkg.sh.in | 36 +----------------------------------- 2 files changed, 1 insertions(+), 39 deletions(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index f15226a..e11e9b3 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -48,10 +48,6 @@ Options *-c, \--clean*:: Clean up leftover work files and directories after a successful build. -*-C, \--cleancache*:: - Removes all cached source files from the directory specified in `SRCDEST` - in linkman:makepkg.conf[5]. - *\--config* <file>:: Use an alternate config file instead of the +{sysconfdir}/makepkg.conf+ default. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e101a76..4a4d43c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -52,7 +52,6 @@ readonly -a packaging_options other_options splitpkg_overrides # Options ASROOT=0 CLEANUP=0 -CLEANCACHE=0 DEP_BIN=0 FORCE=0 INFAKEROOT=0 @@ -1661,7 +1660,6 @@ usage() { echo "$(gettext "Options:")" printf "$(gettext " -A, --ignorearch Ignore incomplete %s field in %s")\n" "arch" "$BUILDSCRIPT" echo "$(gettext " -c, --clean Clean up work files after build")" - echo "$(gettext " -C, --cleancache Clean up source files from the cache")" echo "$(gettext " -d, --nodeps Skip all dependency checks")" printf "$(gettext " -e, --noextract Do not extract source files (use existing %s dir)")\n" "src/" echo "$(gettext " -f, --force Overwrite existing package")" @@ -1719,7 +1717,7 @@ ARGLIST=("$@") # Parse Command Line Options. OPT_SHORT="AcCdefFghiLmop:rRsV" -OPT_LONG="allsource,asroot,ignorearch,check,clean,cleancache,nodeps" +OPT_LONG="allsource,asroot,ignorearch,check,clean,nodeps" OPT_LONG+=",noextract,force,forcever:,geninteg,help,holdver" OPT_LONG+=",install,key:,log,nocolor,nobuild,nocheck,nosign,pkg:,rmdeps" OPT_LONG+=",repackage,skipinteg,sign,source,syncdeps,version,config:" @@ -1744,7 +1742,6 @@ while true; do --asroot) ASROOT=1 ;; -A|--ignorearch) IGNOREARCH=1 ;; -c|--clean) CLEANUP=1 ;; - -C|--cleancache) CLEANCACHE=1 ;; --check) RUN_CHECK='y' ;; --config) shift; MAKEPKG_CONF=$1 ;; -d|--nodeps) NODEPS=1 ;; @@ -1876,37 +1873,6 @@ if (( HOLDVER )) && [[ -n $FORCE_VER ]]; then exit 1 fi -if (( CLEANCACHE )); then - #fix flyspray feature request #5223 - if [[ -n $SRCDEST && ! $SRCDEST -ef "${startdir}" ]]; then - msg "$(gettext "Cleaning up ALL files from %s.")" "$SRCDEST" - echo -n "$(gettext " Are you sure you wish to do this? ")" - echo -n "$(gettext "[y/N]")" - read answer - answer=$(tr '[:lower:]' '[:upper:]' <<< "$answer") - if [[ $answer = $(gettext YES) || $answer = $(gettext Y) ]]; then - rm "$SRCDEST"/* - if (( $? )); then - error "$(gettext "Problem removing files; you may not have correct permissions in %s")" "$SRCDEST" - exit 1 - else - # removal worked - msg "$(gettext "Source cache cleaned.")" - exit 0 - fi - else - # answer = no - msg "$(gettext "No files have been removed.")" - exit 0 - fi - else - # $SRCDEST is $startdir, two possibilities - error "$(gettext "Source destination must be defined in %s.")" "$MAKEPKG_CONF" - plain "$(gettext "In addition, please run %s outside of your cache directory.")" "makepkg -C" - exit 1 - fi -fi - if (( ! INFAKEROOT )); then if (( EUID == 0 && ! ASROOT )); then # Warn those who like to live dangerously. -- 1.7.5.4

2 1