- Pacman-dev - lists.archlinux.org

[pacman-dev] $startdir in PKGBUILDs
by Allan McRae 05 Jun '10

05 Jun '10

Can anyone think of an actual use of $startdir in PKGBUILDs? A change I am planning post 3.4 is to completely break $startdir/pkg == $pkgdir for single packages. I want all packaging to occur in $startdir/pkg/$pkgname as is currently done in split packages as this will make it a lot easier to split of debug symbols into a separate package. We have discouraged the use of $startdir for at least a couple of releases now, so people should be prepared... [1] So I would like to remove mention of $startdir from the PKGBUILD man page. Can anybody see a reason for keeping it? Allan [1] well, even some of the pacman devs still use it in PKGBUILDs... *cough* libarchive *cough* ;)

4 7

[pacman-dev] [translation] Turkish translation update
by Samed Beyribey 05 Jun '10

05 Jun '10

Hello, I've attached Turkish translation for libalpm and pacman. Regards, Samed.

2 1

[pacman-dev] [PATCH] NEWS: add some flyspray bug numbers
by Dan McGee 04 Jun '10

04 Jun '10

Also add a note about bash completion improvements. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- NEWS | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/NEWS b/NEWS index bf265e7..9711103 100644 --- a/NEWS +++ b/NEWS @@ -7,33 +7,35 @@ VERSION DESCRIPTION select the correct architecture - Installing packages with -U can handle installing dependencies, conflict resolution and replacing packages + (FS#3492, FS#5798) - can upgrade the system and install a new package using - "pacman -Syu <pkg>" + "pacman -Syu <pkg>" (FS#15581) - new -D/--database operation for modifying package install - reasons + reasons (FS#12950) - new --print and --print-format options to output information - in suitable format for wrapper scripts + in suitable format for wrapper scripts (FS#14208) - only extract new entries when updating a repo database - - show "Required by" in -Sii output + - show "Required by" in -Sii output (FS#16244) - -U and -R options always ask for confirmation - - allow -Qo to perform a functional 'which' + - allow -Qo to perform a functional 'which' (FS#8798) - cache cleaning cleans all directories, not just first - cleanupdelta: new utility to help remove unused deltas from a repo database + - bash completion: rewrite for size and performance (FS#16630) - repo-add: handle removing the final package from a repo - rankmirrors: rewrite using bash - vercmp: does not link to libalpm to prevent upgrade issues - makepkg: - automatically aborts on any errors during packaging - changelogs are now included via the "changelog" variable - - can override pkgver, pkgrel and arch in split packages + - override pkgver, pkgrel and arch in split packages (FS#15955) - repackaging without a package() function is deprecated - stricter syntax checking for backup and optdepends entries - file stripping options are configurable - New --pkg flag to allow building specific package(s) from - split PKGBUILDs. - - build() function is now optional - - warns about reference to the build root in a package + split PKGBUILDs (FS#15956) + - build() function is now optional (FS#15147) + - warn about reference to build root in a package (FS#14751) - configure source package destination with SRCPKGDEST - major internal refactoring of handling tests ("[" to "[[") - contrib/pactree: print reverse dependency tree -- 1.7.1

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-209-gf60db58
by dan＠archlinux.org 04 Jun '10

04 Jun '10

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 f60db581a7676dc0d2341177216fccb566dfb3d0 (commit) via a8a6eed9e8d3be200ddbe193b2c80640b5d81f6c (commit) from d8d5d482707539a4185a7639be2a7f76955c6408 (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 f60db581a7676dc0d2341177216fccb566dfb3d0 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 4 13:36:38 2010 -0500 translation: update pot/po files for libalpm in prep for release Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a8a6eed9e8d3be200ddbe193b2c80640b5d81f6c Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 4 13:35:57 2010 -0500 translation: update pot/po files for pacman in prep for release Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/po/ca.po | 162 ++++++------- lib/libalpm/po/cs.po | 136 ++++++----- lib/libalpm/po/de.po | 140 ++++++----- lib/libalpm/po/el.po | 137 ++++++----- lib/libalpm/po/en_GB.po | 136 ++++++----- lib/libalpm/po/es.po | 154 ++++++------ lib/libalpm/po/fr.po | 139 ++++++----- lib/libalpm/po/hu.po | 136 ++++++----- lib/libalpm/po/it.po | 148 ++++++------ lib/libalpm/po/kk.po | 138 ++++++----- lib/libalpm/po/libalpm.pot | 83 ++----- lib/libalpm/po/nb_NO.po | 136 ++++++----- lib/libalpm/po/pl.po | 142 ++++++----- lib/libalpm/po/pt_BR.po | 141 ++++++----- lib/libalpm/po/ro.po | 140 ++++++----- lib/libalpm/po/ru.po | 144 ++++++------ lib/libalpm/po/sv_SE.po | 136 ++++++----- lib/libalpm/po/tr.po | 136 ++++++----- lib/libalpm/po/uk.po | 136 ++++++----- lib/libalpm/po/zh_CN.po | 136 ++++++----- po/ca.po | 588 ++++++++++++++++++++++++++++---------------- po/cs.po | 456 ++++++++++++++++++++++------------ po/de.po | 473 +++++++++++++++++++++++------------ po/el.po | 460 ++++++++++++++++++++++------------ po/en_GB.po | 453 ++++++++++++++++++++++------------ po/es.po | 477 +++++++++++++++++++++++------------- po/fr.po | 491 ++++++++++++++++++++++++------------- po/hu.po | 465 +++++++++++++++++++++++------------ po/it.po | 479 +++++++++++++++++++++++------------- po/kk.po | 451 ++++++++++++++++++++++------------ po/nb_NO.po | 463 ++++++++++++++++++++++------------ po/pacman.pot | 287 ++++++++++++---------- po/pl.po | 460 ++++++++++++++++++++++------------ po/pt_BR.po | 464 +++++++++++++++++++++++------------ po/ro.po | 469 +++++++++++++++++++++++------------ po/ru.po | 468 +++++++++++++++++++++++------------ po/sv_SE.po | 461 ++++++++++++++++++++++------------ po/tr.po | 469 +++++++++++++++++++++++------------ po/uk.po | 463 ++++++++++++++++++++++------------ po/zh_CN.po | 462 ++++++++++++++++++++++------------ 40 files changed, 7390 insertions(+), 4625 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-207-gd8d5d48
by dan＠archlinux.org 03 Jun '10

03 Jun '10

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 d8d5d482707539a4185a7639be2a7f76955c6408 (commit) via 5cddcc901beb3643f80f401fe9b6384081ea96eb (commit) via 3739fe9913af24ea24efc2c0c15c1ca234353fdf (commit) via 756e49259d1dcdd604b6db0b968cb81782597eca (commit) from 0ac96d94ec3a8a2f3a3857810dbd9109c5cd3235 (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 d8d5d482707539a4185a7639be2a7f76955c6408 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jun 3 14:20:44 2010 +1000 NEWS update for pacman-3.4 Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5cddcc901beb3643f80f401fe9b6384081ea96eb Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Thu Jun 3 17:32:50 2010 +0200 makepkg: refactor absolute filename detection Move the absolute filename detection to a new function to reduce code duplication. This patch also fixes the --allsource option that did not include remote source files if they reside in $startdir instead of $SRCDEST. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3739fe9913af24ea24efc2c0c15c1ca234353fdf Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Thu Jun 3 17:33:08 2010 +0200 makepkg: print only base filename of install/changelog files The complete file path of a temporary symlink is really useless information. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 756e49259d1dcdd604b6db0b968cb81782597eca Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 3 14:07:48 2010 -0500 contrib: kill gensync/updatesync These are old and have outlived their usefulness at this point. Kill them. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 37 +++++++++++++ contrib/Makefile.am | 2 - contrib/README | 4 -- contrib/gensync | 134 ----------------------------------------------- contrib/updatesync | 137 ------------------------------------------------- scripts/makepkg.sh.in | 95 ++++++++++++++++----------------- 6 files changed, 83 insertions(+), 326 deletions(-) delete mode 100755 contrib/gensync delete mode 100755 contrib/updatesync hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: print only base filename of install/changelog files
by Cedric Staniewski 03 Jun '10

03 Jun '10

The complete file path of a temporary symlink is really useless information. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- 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 c5ce2a2..13feab1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1112,7 +1112,7 @@ create_srcpackage() { # evaluate any bash variables used eval file='${srclinks}/${pkgbase}/'${file} if [[ ! -f $file ]]; then - msg2 "$(gettext "Adding %s file (%s)...")" "$i" "$file" + msg2 "$(gettext "Adding %s file (%s)...")" "$i" "${file##*/}" ln -s "${startdir}/$file" "${srclinks}/${pkgbase}/" fi done -- 1.7.1

4 6

[pacman-dev] [PATCH] makepkg: refactor absolute filename detection
by Cedric Staniewski 03 Jun '10

03 Jun '10

Move the absolute filename detection to a new function to reduce code duplication. This patch also fixes the --allsource option that did not include remote source files if they reside in $startdir instead of $SRCDEST. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- Changes: - renamed error_source_file_not_found to missing_source_exit - removed differentiation in download_sources: now it prints "Found %s" instead of "Found %s in build dir" and "Using cached copy of %s" scripts/makepkg.sh.in | 99 ++++++++++++++++++++++++------------------------- 1 files changed, 48 insertions(+), 51 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8c0da8b..00167f7 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -179,6 +179,33 @@ trap 'trap_exit "$(gettext "An unknown error has occurred. Exiting...")"' ERR # 1) "filename::http://path/to/file" # 2) "http://path/to/file" +# Return the absolute filename of a source entry +# +# This function accepts a source entry or the already extracted filename of a +# source entry as input +get_absolute_filename() { + local file="$(get_filename "$1")" + + if [[ -f "$startdir/$file" ]] ; then + file="$startdir/$file" + else + if [[ -f "$SRCDEST/$file" ]] ; then + file="$SRCDEST/$file" + else + return 1 + fi + fi + + echo "$file" +} + +# Print 'source not found' error message and exit makepkg +missing_source_exit() { + error "$(gettext "Unable to find source file %s.")" "$(get_filename "$1")" + plain "$(gettext "Aborting...")" + exit 1 # $E_MISSING_FILE +} + # extract the filename from a source entry get_filename() { # if a filename is specified, use it @@ -458,20 +485,16 @@ download_sources() { local netfile for netfile in "${source[@]}"; do - local file=$(get_filename "$netfile") - local url=$(get_url "$netfile") - if [[ -f $startdir/$file ]]; then - msg2 "$(gettext "Found %s in build dir")" "$file" - rm -f "$srcdir/$file" - ln -s "$startdir/$file" "$srcdir/" - continue - elif [[ -f $SRCDEST/$file ]]; then - msg2 "$(gettext "Using cached copy of %s")" "$file" - rm -f "$srcdir/$file" - ln -s "$SRCDEST/$file" "$srcdir/" + local file + if file=$(get_absolute_filename "$netfile"); then + msg2 "$(gettext "Found %s")" "${file##*/}" + ln -sf "$file" "$srcdir/" continue fi + file=$(get_filename "$netfile") + local url=$(get_url "$netfile") + # if we get here, check to make sure it was a URL, else fail if [[ $file = $url ]]; then error "$(gettext "%s was not found in the build directory and is not a URL.")" "$file" @@ -553,18 +576,7 @@ generate_checksums() { local netfile for netfile in "${source[@]}"; do - local file="$(get_filename "$netfile")" - - if [[ ! -f $file ]] ; then - if [[ ! -f $SRCDEST/$file ]] ; then - error "$(gettext "Unable to find source file %s to generate checksum.")" "$file" - plain "$(gettext "Aborting...")" - exit 1 - else - file="$SRCDEST/$file" - fi - fi - + local file="$(get_absolute_filename "$netfile")" || missing_source_exit "$netfile" local sum="$(openssl dgst -${integ} "$file")" sum=${sum##* } (( ct )) && echo -n "$indent" @@ -600,14 +612,10 @@ check_checksums() { file="$(get_filename "$file")" echo -n " $file ... " >&2 - if [[ ! -f $file ]] ; then - if [[ ! -f $SRCDEST/$file ]] ; then - echo "$(gettext "NOT FOUND")" >&2 - errors=1 - found=0 - else - file="$SRCDEST/$file" - fi + if ! file="$(get_absolute_filename "$file")"; then + echo "$(gettext "NOT FOUND")" >&2 + errors=1 + found=0 fi if (( $found )) ; then @@ -645,25 +653,17 @@ extract_sources() { msg "$(gettext "Extracting Sources...")" local netfile for netfile in "${source[@]}"; do - file=$(get_filename "$netfile") + absfile="$(get_absolute_filename "$netfile")" || missing_source_exit "$netfile" + file=${absfile##*/} if in_array "$file" ${noextract[@]}; then #skip source files in the noextract=() array # these are marked explicitly to NOT be extracted continue fi - if [[ ! -f $file ]] ; then - if [[ ! -f $SRCDEST/$file ]] ; then - error "$(gettext "Unable to find source file %s for extraction.")" "$file" - plain "$(gettext "Aborting...")" - exit 1 - else - file="$SRCDEST/$file" - fi - fi # fix flyspray #6246 - local file_type=$(file -bizL "$file") + local file_type=$(file -bizL "$absfile") local ext=${file##*.} local cmd='' case "$file_type" in @@ -693,10 +693,10 @@ extract_sources() { local ret=0 msg2 "$(gettext "Extracting %s with %s")" "$file" "$cmd" if [[ $cmd = bsdtar ]]; then - $cmd -xf "$file" || ret=$? + $cmd -xf "$absfile" || ret=$? else rm -f "${file%.*}" - $cmd -dcf "$file" > "${file%.*}" || ret=$? + $cmd -dcf "$absfile" > "${file%.*}" || ret=$? fi if (( ret )); then error "$(gettext "Failed to extract %s")" "$file" @@ -1097,13 +1097,10 @@ create_srcpackage() { local netfile for netfile in "${source[@]}"; do - local file=$(get_filename "$netfile") - if [[ -f $netfile ]]; then - msg2 "$(gettext "Adding %s...")" "$netfile" - ln -s "${startdir}/$netfile" "${srclinks}/${pkgbase}" - elif (( SOURCEONLY == 2 )) && [[ -f $SRCDEST/$file ]]; then - msg2 "$(gettext "Adding %s...")" "$file" - ln -s "$SRCDEST/$file" "${srclinks}/${pkgbase}/" + if [[ -f $netfile ]] || (( SOURCEONLY == 2 )); then + local file=$(get_absolute_filename "$netfile") || missing_source_exit "$netfile" + msg2 "$(gettext "Adding %s...")" "${file##*/}" + ln -s "$file" "${srclinks}/${pkgbase}" fi done -- 1.7.1

2 4

[pacman-dev] [PATCH] NEWS update for pacman-3.4
by Allan McRae 03 Jun '10

03 Jun '10

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- NEWS | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index 743028c..2fdada6 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,42 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +3.4.0 - new "Architecture" option that will restrict pacman to + installing only packages from the given architecture. Can be + set to "auto" in which case the output of "uname -m" is used + - use "$arch" when specifing a mirror url to automatically + select the correct architecture + - Installing packages with -U can handle installing + dependencies, confict resolution and replacing packages + - can upgrage the system and install a new package using + "pacman -Syu <pkg>" + - new -D/--database operation for modifying package install + reasons + - new --print and --print-format options to output information + in suitable format for wrapper scripts + - only extract new entries when updating a repo database + - show "Required by" in -Sii output + - -U and -R options always ask for confirmation + - allow -Qo to perform a functional 'which' + - cache cleaning cleans all directories, not just first + - cleanupdelta: new utility to help remove unused deltas from + a repo database + - repo-add: handle removing the final package from a repo + - rankmirrors: rewrite using bash + - vercmp: does not link to libalpm to prevent upgrade issues + - makepkg: + - automatically aborts of any errors during packaging + - changelogs are now included via the "changelog" variable + - can override pkgver, pkgrel and arch in split packages + - repackaging without a package() function is depricated + - stricter syntax checking for backup and optdepends entries + - file stripping options are configurable + - New --pkg flag to allow building specific package(s) from + split PKGBUILDs. + - build() function is now optional + - warns about reference to the build root in a package + - configure source package destination with SRCPKGDEST + - major internal refactor of handling tests ("[" to "[[") + - contrib/pactree: print reverse dependency tree 3.3.3 - correctly check the return code from opendir() - fix possible infinite loop in alpm_list_remove() - makepkg: -- 1.7.1

3 5

[pacman-dev] Any reason to keep gensync/updatesync?
by Dan McGee 03 Jun '10

03 Jun '10

gensync and updatesync are two scripts that have been rotting in contrib/ for a few years now. For those that haven't been around as long, they were the predecessors of repo-add/repo-remove. At this point I think they have outlived their usefulness and I can't even claim to know if they work anymore. Any reason to keep them? If no one objects I'll patch them dead before the 3.4 release. -Dan

2 1

[pacman-dev] [PATCH] Remove DBEXT usage
by Allan McRae 03 Jun '10

03 Jun '10

With commit 5dffef78, the repo database always has a symlink of the form reponame.db. Use that filename and let libarchive determine the compression type. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Definitely not for the 3.4 release configure.ac | 9 --------- lib/libalpm/be_files.c | 8 ++++---- scripts/Makefile.am | 1 - scripts/rankmirrors.sh.in | 2 +- test/pacman/pmdb.py | 2 +- test/pacman/pmtest.py | 2 +- test/pacman/util.py | 1 - 7 files changed, 7 insertions(+), 18 deletions(-) diff --git a/configure.ac b/configure.ac index 3e11f8c..37881e6 100644 --- a/configure.ac +++ b/configure.ac @@ -83,11 +83,6 @@ AC_ARG_WITH(src-ext, AS_HELP_STRING([--with-src-ext=ext], [set the file extension used by source packages]), [SRCEXT=$withval], [SRCEXT=.src.tar.gz]) -# Help line for database extension -AC_ARG_WITH(db-ext, - AS_HELP_STRING([--with-db-ext=ext], [set the file extension used by the database]), - [DBEXT=$withval], [DBEXT=.db.tar.gz]) - # Help line for buildscript filename AC_ARG_WITH(buildscript, AS_HELP_STRING([--with-buildscript=name], [set the build script name used by makepkg]), @@ -337,9 +332,6 @@ AC_DEFINE_UNQUOTED([PKGEXT], "$PKGEXT", [The file extension used by pacman packa # Set source package file extension AC_SUBST(SRCEXT) AC_DEFINE_UNQUOTED([SRCEXT], "$SRCEXT", [The file extension used by pacman source packages]) -# Set database file extension -AC_SUBST(DBEXT) -AC_DEFINE_UNQUOTED([DBEXT], "$DBEXT", [The file extension used by pacman databases]) # Set makepkg build script name AC_SUBST(BUILDSCRIPT) AC_DEFINE_UNQUOTED([BUILDSCRIPT], "$BUILDSCRIPT", [The build script name used by makepkg]) @@ -391,7 +383,6 @@ ${PACKAGE_NAME}: root working directory : ${ROOTDIR} package extension : ${PKGEXT} source pkg extension : ${SRCEXT} - database extension : ${DBEXT} build script name : ${BUILDSCRIPT} Compilation options: diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 877bc50..c26bef2 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -231,9 +231,9 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) RET_ERR(PM_ERR_DB_NOT_FOUND, -1); } - len = strlen(db->treename) + strlen(DBEXT) + 1; + len = strlen(db->treename) + 4; MALLOC(dbfile, len, RET_ERR(PM_ERR_MEMORY, -1)); - sprintf(dbfile, "%s" DBEXT, db->treename); + sprintf(dbfile, "%s.db", db->treename); dbpath = alpm_option_get_dbpath(); @@ -253,9 +253,9 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) syncdbpath = _alpm_db_path(db); /* form the path to the db location */ - len = strlen(dbpath) + strlen(db->treename) + strlen(DBEXT) + 1; + len = strlen(dbpath) + strlen(db->treename) + 4; MALLOC(dbfilepath, len, RET_ERR(PM_ERR_MEMORY, -1)); - sprintf(dbfilepath, "%s%s" DBEXT, dbpath, db->treename); + sprintf(dbfilepath, "%s%s.db", dbpath, db->treename); if(force) { /* if forcing update, remove the old dir and extract the db */ diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 330acb9..0197d9e 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -38,7 +38,6 @@ edit = sed \ -e 's|@PACKAGE_VERSION[@]|$(REAL_PACKAGE_VERSION)|g' \ -e 's|@PACKAGE_BUGREPORT[@]|$(PACKAGE_BUGREPORT)|g' \ -e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \ - -e 's|@DBEXT[@]|$(DBEXT)|g' \ -e 's|@BUILDSCRIPT[@]|$(BUILDSCRIPT)|g' \ -e 's|@SIZECMD[@]|$(SIZECMD)|g' \ -e 's|@SEDINPLACE[@]|$(SEDINPLACE)|g' \ diff --git a/scripts/rankmirrors.sh.in b/scripts/rankmirrors.sh.in index 9b4e973..28c3a7c 100644 --- a/scripts/rankmirrors.sh.in +++ b/scripts/rankmirrors.sh.in @@ -85,7 +85,7 @@ getfetchurl() { if [[ -z $reponame || $reponame = $replacedurl ]]; then echo "fail" else - local fetchurl="${replacedurl}/$reponame@DBEXT@" + local fetchurl="${replacedurl}/$reponame.db" echo "$fetchurl" fi } diff --git a/test/pacman/pmdb.py b/test/pacman/pmdb.py index 8cb1b83..41bd738 100755 --- a/test/pacman/pmdb.py +++ b/test/pacman/pmdb.py @@ -344,7 +344,7 @@ def gensync(self, path): # Generate database archive mkdir(path) - archive = os.path.join(path, "%s%s" % (self.treename, PM_EXT_DB)) + archive = os.path.join(path, "%s.db" % (self.treename)) tar = tarfile.open(archive, "w:gz") for root, dirs, files in os.walk('.'): for d in dirs: diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py index f2b9676..b1d778e 100755 --- a/test/pacman/pmtest.py +++ b/test/pacman/pmtest.py @@ -149,7 +149,7 @@ def generate(self): vprint(" Creating sync database archives") for key, value in self.db.iteritems(): if key == "local": continue - archive = value.treename + PM_EXT_DB + archive = value.treename + ".db" vprint("\t" + os.path.join(SYNCREPO, archive)) value.gensync(os.path.join(syncdir, value.treename)) diff --git a/test/pacman/util.py b/test/pacman/util.py index e01a3b8..657230e 100755 --- a/test/pacman/util.py +++ b/test/pacman/util.py @@ -28,7 +28,6 @@ PM_LOCK = "var/lib/pacman/db.lck" PM_CACHEDIR = "var/cache/pacman/pkg" PM_EXT_PKG = ".pkg.tar.gz" -PM_EXT_DB = ".db.tar.gz" PM_PACNEW = ".pacnew" PM_PACORIG = ".pacorig" PM_PACSAVE = ".pacsave" -- 1.7.1

3 4