- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Fix makepkg create_xdelta() and add warning
by Ash Milsted 02 Jun '07

02 Jun '07

Hi, This fixes a trivial bug that prevents create_xdelta() from finding any old package versions, cleans up its use of messages, and adds a warning stressing the importance of distributing the deltas with the tarball from the same makepkg run. There are no functionality changes. Please apply. Ash (aka thikasabrik) --- scripts/makepkg.in 2007-06-02 16:28:47.000000000 +0100 +++ scripts/makepkg.in.1 2007-06-02 16:46:47.000000000 +0100 @@ -608,12 +608,12 @@ local pkg_file=$1 local cache_dir="/var/cache/pacman/pkg" # TODO: autoconf me - local old_versions=( $(ls {"$cache_dir","$PKGDEST"}/${pkgname}-*-${CARCH}.${PKGEXT} 2>/dev/null) ) + local old_versions=( $(ls {"$cache_dir","$PKGDEST"}/${pkgname}-*-${CARCH}${PKGEXT} 2>/dev/null) ) # Check to see if we have any old versions to create deltas with local old_file old_version latest_version base_file for old_file in "${old_versions[@]}"; do - old_version=$(basename "${old_file%-$CARCH.$PKGEXT}") + old_version=$(basename "${old_file%-$CARCH$PKGEXT}") old_version=${old_version#$pkgname-} # old_version may include the target package, only use the old versions @@ -624,7 +624,7 @@ done if [ "$base_file" != "" ]; then - msg "Making delta from version $latest_version" + msg "$(gettext "Making delta from version $latest_version")" local delta_file="$PKGDEST/$pkgname-${old_version}_to_$pkgver-$pkgrel-$CARCH.delta" # xdelta will decompress base_file & pkg_file into TMP_DIR (or /tmp if TMP_DIR is unset) @@ -636,9 +636,11 @@ # # makepkg and pacman must use the same compression algorithm or the delta generated # package may not match, producing md5 checksum errors. + msg2 "$(gettext "Recreating package tarball from delta to match up md5 signatures")" + msg2 "$(gettext "NOTE: the delta should ONLY be distributed with this tarball")" xdelta patch "$delta_file" "$base_file" "$pkg_file" else - msg "No previous version found, skipping xdelta" + warning "$(gettext "No previous version found, skipping xdelta")" fi } -

2 1

[pacman-dev] pacman -Q broken
by Xavier 02 Jun '07

02 Jun '07

Hello, this commit broke pacman -Q : http://projects.archlinux.org/git/gitweb.cgi?p=pacman.git;a=commit;h=722db4… If the list of targets is empty, then it doesn't enter the loop, and no code is executed. Handling the case where there are no targets inside the loop visiting the targets is pretty funny in my opinion. So I tried to handle this case separately, but I find the whole function still very messy. Because this case is handled differently depending on the type of query. So what about making new function for each different query ? And not trying to handle all the cases in the same big for loop, but having a separate loop for each. Maybe it could be better that way.

2 2

[pacman-dev] [GIT] pacman branch, master now at R_3_0_0-163-gfb10e0c
by Dan McGee 02 Jun '07

02 Jun '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via fb10e0c797b649dc036bc0432dc77cffaabbc56d (commit) via 6f183cb9847082eab5aa4e27e25629aca31af05c (commit) via 7f153b729f90e9b7ce7924ae5e607aa333185c06 (commit) via 85fbf528bb1e7952abfd2fcd8c1d5dad2050c35e (commit) via 80237630af0b2241a8a756d7ed7d2be3f80cfec5 (commit) from cb9f046945b0365d7d29ee590a31a08bece1879c (commit) - Log ----------------------------------------------------------------- commit fb10e0c797b649dc036bc0432dc77cffaabbc56d Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 1 13:43:41 2007 -0400 Drop --usesudo option and add some checks related to ASROOT Drop the --usesudo option and use it by default if running as a non-root user. Check the usage of the --asroot option and do not allow it to be used as a normal user. A few other small fixes, including a typo in $confdir. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6f183cb9847082eab5aa4e27e25629aca31af05c Author: Andrew Fyfe <andrew(a)neptune-one.net> Date: Thu May 31 14:50:39 2007 +0100 scripts/makepkg.in: Clean up gen/check checksum code. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7f153b729f90e9b7ce7924ae5e607aa333185c06 Author: Andrew Fyfe <andrew(a)neptune-one.net> Date: Fri Jun 1 15:28:52 2007 +0100 scripts/makepkg.in: Various clean ups. * etc/makepkg.conf.in: Add description for xdelta. * doc/makepkg.conf.5: Add description for xdelta. * scripts/makepkg.in: Various clean ups. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 85fbf528bb1e7952abfd2fcd8c1d5dad2050c35e Author: Andrew Fyfe <andrew(a)neptune-one.net> Date: Wed May 30 17:47:47 2007 +0100 Cleaned up dependencies check functions in makepkg Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 80237630af0b2241a8a756d7ed7d2be3f80cfec5 Author: Nathan Jones <nathanj(a)insightbb.com> Date: Fri Jun 1 11:00:39 2007 -0400 Change -z|--showsize flag to ShowSize pacman.conf option Also cleaned up some duplicate printf lines related to the ShowSize option. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: doc/makepkg.8 | 10 +- doc/makepkg.conf.5 | 16 ++- doc/pacman.conf.5 | 4 + etc/makepkg.conf.in | 3 +- lib/libalpm/alpm.c | 3 + lib/libalpm/alpm.h | 3 + lib/libalpm/handle.c | 6 + lib/libalpm/handle.h | 1 + scripts/makepkg.in | 425 ++++++++++++++++++++++++-------------------------- src/pacman/conf.h | 1 - src/pacman/pacman.c | 4 - src/pacman/query.c | 12 +- src/pacman/sync.c | 15 +- src/pacman/util.c | 3 +- 14 files changed, 255 insertions(+), 251 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ cb9f046945b0365d7d29ee590a31a08bece1879c \ fb10e0c797b649dc036bc0432dc77cffaabbc56d

1 0

[pacman-dev] [patch] makepkg3 -- cleanup dep check functions
by Andrew Fyfe 01 Jun '07

01 Jun '07

Another patch :) This one targets the 3 dep check functions (handledeps, resolvedeps, removedeps). The bulk of the changes are whitespace and removing the repetitive if..then...else checks. Also some bits have been reordered to stop functions/external programs being called unnecessarily. This still includes the fakeroot hacks, if you need it rediffed without the fakeroot hacks, I'll post a new patch. Andrew ------------------------------------------------------------ revno: 3 committer: Andrew Fyfe <andrew(a)neptune-one.net> branch nick: feature_handledeps timestamp: Sat 2007-03-24 12:12:48 +0000 message: * cleaned up handledeps () resolvedeps () removedeps () === modified file 'scripts/makepkg' --- old/scripts/makepkg 2007-03-24 03:49:27 +0000 +++ new/scripts/makepkg 2007-03-24 12:12:35 +0000 @@ -191,91 +191,85 @@ } handledeps() { - local missingdeps=0 + local R_DEPS_SATISFIED=0 + local R_DEPS_MISSING=1 + + [ $# -eq 0 ] && return $R_DEPS_SATISFIED + local deplist="$*" - local depstrip="" - local striplist="" - local haveperm=0 - if [ $ "$EUID" = "0" -a "$INFAKEROOT" != "1" $ -o "$SUDO" = 1 ]; then - haveperm=1 - fi - + local striplist + local dep for dep in $deplist; do - depstrip=$(echo $dep | sed 's|=.*$||' | sed 's|>.*$||' | sed 's|<.*$||') - striplist="$striplist $depstrip" + striplist="$striplist $(echo $dep | sed -e 's|=.*$||' -e 's|>.&$||' -e 's|<.*$||')" done - if [ "$deplist" != "" -a $haveperm -eq 1 ]; then - if [ "$DEP_BIN" = "1" -a "$SUDO" = "1" ]; then - # install missing deps from binary packages (using pacman -S and sudo) - msg "Installing missing dependencies..." + if [ "$DEP_SRC" = "0" -a "$DEP_BIN" = "0" ]; then + return $R_DEPS_MISSING + elif [ "$SUDO" = 0 -a $EUID -gt 0 ]; then + warning "Cannot auto-install missing dependencies as a normal user without sudo!" + plain "Run makepkg as root or with -S to resolve dependencies automatically." + return $R_DEPS_MISSING + fi + + if [ "$DEP_BIN" = "1" ]; then + # install missing deps from binary packages (using pacman -S) + msg "Installing missing dependencies..." + local ret=0 + + if [ "$SUDO" = 1 ]; then if [ "$INFAKEROOT" = "1" ]; then # kinda hacky, but we need to make pacman think that we're NOT # in fakeroot so it will go ahead and install the dependencies. FAKEROOTKEY2=$FAKEROOTKEY unset FAKEROOTKEY fi - sudo pacman $PACMAN_OPTS -S $striplist - if [ $? -eq 1 ]; then - error "Pacman failed to install missing dependencies." - exit 1 - fi + sudo pacman $PACMAN_OPTS -S $striplist || ret=$? if [ "$INFAKEROOT" = "1" ]; then export FAKEROOTKEY=$FAKEROOTKEY2 unset FAKEROOTKEY2 fi - elif [ "$DEP_BIN" = "1" ]; then - # install missing deps from binary packages (using pacman -S) - msg "Installing missing dependencies..." - pacman $PACMAN_OPTS -S $striplist - if [ $? -eq 1 ]; then - error "Pacman failed to install missing dependencies." - exit 1 - fi - elif [ "$DEP_SRC" = "1" ]; then - # install missing deps by building them from source. - # we look for each package name in $SRCROOT and build it. - if [ "$SRCROOT" = "" ]; then - error "Source root cannot be found - please make sure it is specified in /etc/makepkg.conf" - exit 1 - fi - # TODO: handle version comparators (eg, glibc>=2.2.5) - msg "Building missing dependencies..." - for dep in $striplist; do - candidates=$(find $SRCROOT -type d -name "$dep") - if [ "$candidates" = "" ]; then - error "Could not find \"$dep\" under $SRCROOT" - exit 1 - fi - success=0 - for pkgdir in $candidates; do - if [ -f "$pkgdir/$BUILDSCRIPT" ]; then - cd "$pkgdir" - if [ "$RMDEPS" = "1" ]; then - makepkg -i -c -b -r -w $PKGDEST - else - makepkg -i -c -b -w $PKGDEST - fi - if [ $? -eq 0 ]; then - success=1 - break - fi - fi - done - if [ "$success" = "0" ]; then - error "Failed to build \"$dep\"" - exit 1 + else + pacman $PACMAN_OPTS -S $striplist || ret=$? + fi + + if [ $ret -ne 0 ]; then + error "Pacman failed to install missing dependencies." + exit 1 # TODO: error code + fi + elif [ "$DEP_SRC" = "1" ]; then + msg "Building missing dependencies..." + + # install missing deps by building them from source. + # we look for each package name in $SRCROOT and build it. + if [ "$SRCROOT" = "" ]; then + error "Source root cannot be found - please make sure it is specified in /etc/makepkg.conf" + exit 1 # TODO: error code + fi + + # TODO: handle version comparators (eg, glibc>=2.2.5) + for dep in $striplist; do + local candidates="$(find "$SRCROOT" -type d -name "$dep")" + if [ "$candidates" = "" ]; then + error "Could not find \"$dep\" under $SRCROOT" + exit 1 # TODO: error code + fi + + local makepkg_opts='-i -c -b' + [ "$RMDEPS" = "1" ] && makepkg_opts="$makepkg_opts -r" + local ret + local pkgdir + for pkgdir in $candidates; do + if [ -f "$pkgdir/$BUILDSCRIPT" ]; then + cd "$pkgdir" + ret=0 + PKGDEST="$PKGDEST" makepkg $makepkg_opts || ret=$? + [ $ret -eq 0 ] && continue 2 fi done - else - missingdeps=1 - fi - elif [ "$deplist" != "" -a $haveperm -eq 0 ]; then - if [ "$DEP_SRC" = "1" -o "$DEP_BIN" = "1" ]; then - warning "Cannot auto-install missing dependencies as a normal user without sudo!" - plain "Run makepkg as root or with -S to resolve dependencies automatically." - fi - missingdeps=1 + + error "Failed to build \"$dep\"" + exit 1 # TODO: error code + done fi # rerun any additional sh scripts found in /etc/profile.d/ @@ -286,53 +280,51 @@ fi done - return $missingdeps + return $R_DEPS_SATISFIED } resolvedeps() { - deplist="" - newdeplist="" - - deplist=$(checkdeps $*) - if [ -n "${deplist}" ]; then - handledeps $deplist - if [ $? -eq 0 ]; then - # check deps again to make sure they were resolved - newdeplist=$(checkdeps $*) - if [ -n "${newdeplist}" ]; then - error "Failed to install all missing dependencies." - fi - else - newdeplist="$deplist" - fi - fi - - # if new dep list is not empty, print the list - if [ -n "${newdeplist}" ]; then - msg "Missing Dependencies:" - for dep in ${newdeplist}; do - msg2 "${dep}" - done - return 1 - else - return 0 - fi + local R_DEPS_SATISFIED=0 + local R_DEPS_MISSING=0 + + deplist="$(checkdeps $*)" + [ "$deplist" = "" ] && return $R_DEPS_SATISFIED + + if handledeps $deplist; then + # check deps again to make sure they were resolved + deplist="$(checkdeps $*)" + [ "$deplist" = "" ] && return $R_DEPS_SATISFIED + elif [ "$DEP_BIN" = "1" -o "$DEP_SRC" = "1" ]; then + error "Failed to install all missing dependencies." + fi + + msg "Missing Dependencies:" + local dep + for dep in $deplist; do + msg2 "$dep" + done + + return $R_DEPS_MISSING } # fix flyspray bug #5923 removedeps() { + [ "$RMDEPS" = "0" ] && return + [ "$SUDO" = "0" -a $EUID -gt 0 ] && return + # runtimedeps and buildtimedeps are set when resolving deps local deplist="$runtimedeps $buildtimedeps" - local depstrip="" - local striplist="" - + local striplist + + [ "$deplist" = "" ] && return + + local dep for dep in $deplist; do - depstrip=$(echo $dep | sed 's|=.*$||' | sed 's|>.*$||' | sed 's|<.*$||') - striplist="$striplist $depstrip" + striplist="$striplist $(echo $dep | sed -e 's|=.*$||' -e 's|>.*$||' -e 's|<.*$||')" done - if [ "$RMDEPS" = "1" -a "$SUDO" = "1" -a -n "$deplist" ]; then - msg "Removing installed dependencies..." + msg "Removing installed dependencies..." + if [ "$SUDO" = "1" ]; then if [ "$INFAKEROOT" = "1" ]; then export FAKEROOTKEY2=$FAKEROOTKEY unset FAKEROOTKEY @@ -342,8 +334,7 @@ export FAKEROOTKEY=$FAKEROOTKEY2 unset FAKEROOTKEY2 fi - elif [ "$RMDEPS" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" -a -n "$deplist" ]; then - msg "Removing installed dependencies..." + else pacman $PACMAN_OPTS -Rs $striplist fi }

4 18

Re: [pacman-dev] Config file handling (was: [PATCH] Change -z|--showsize flag to ShowSize pacman.conf option)
by Dan McGee 01 Jun '07

01 Jun '07

On 6/1/07, Aaron Griffin <aaronmgriffin(a)gmail.com> wrote: > On 6/1/07, Dan McGee <dpmcgee(a)gmail.com> wrote: > > Aaron and I both want to move this config file parsing to the front > > end; any objections to this? It will be quite a change, but we can > > make it much more robust while moving it. Is anyone familiar with how > > config file parsing is done by other programs? It seems like a very > > manual process currently, and a malformed config file brings pacman > > down. I also think we should try to continue when we encounter an > > unrecognized option. > > What do you mean "other programs"? As in, an elegant parsing system? > Or how other apps parse pacman.conf? How other C-coded apps parse their config files in general. I don't do it often in C, so I have no idea how it is usually done. -Dan

3 3

[pacman-dev] Do we need a pacman-3.0.5 release?
by Andrew Fyfe 01 Jun '07

01 Jun '07

Do we need a 3.0.5 release with the following fixes?: FS7323: http://tinyurl.com/28wraj - libarchive not setting permissions FS7300: http://tinyurl.com/23uyp5 - add -mtune=generic to CFLAGS Most of the other bug fixes are big and/or mixed in with 3.1.0 features so they're not to easy to backport. Andrew

3 3

[pacman-dev] [PATCH] Change -z|--showsize flag to ShowSize pacman.conf option
by Nathan Jones 01 Jun '07

01 Jun '07

Also, some duplicate printf lines related to the ShowSize option were cleaned up. Dan, I created this diff against your tree not the official one, if it makes a difference when applying. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> --- doc/pacman.conf.5 | 4 ++++ lib/libalpm/alpm.c | 3 +++ lib/libalpm/alpm.h | 3 +++ lib/libalpm/handle.c | 6 ++++++ lib/libalpm/handle.h | 1 + src/pacman/conf.h | 1 - src/pacman/pacman.c | 4 ---- src/pacman/query.c | 12 +++++------- src/pacman/sync.c | 15 ++++++--------- src/pacman/util.c | 3 ++- 10 files changed, 30 insertions(+), 22 deletions(-) diff --git a/doc/pacman.conf.5 b/doc/pacman.conf.5 index 15f7b95..f7304aa 100644 --- a/doc/pacman.conf.5 +++ b/doc/pacman.conf.5 @@ -85,6 +85,10 @@ Log action messages through \fBsyslog()\fP. This will insert log entries into .TP .B LogFile = \fI/path/to/file\fP Log actions directly to a file. Default is \fI/var/log/pacman.log\fP. +.TP +.B ShowSize +Display the size of individual packages for \fB--sync\fP and \fB--query\fP +modes. .SH REPOSITORY SECTIONS Each repository section defines a section name and at least one location where diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 4239430..db66092 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -959,6 +959,9 @@ int SYMEXPORT alpm_parse_config(char *file, alpm_cb_db_register callback, const } else if(strcmp(origkey, "UseColor") == 0 || strcmp(key, "USECOLOR") == 0) { alpm_option_set_usecolor(1); _alpm_log(PM_LOG_DEBUG, _("config: usecolor")); + } else if(strcmp(origkey, "ShowSize") == 0 || strcmp(key, "SHOWSIZE") == 0) { + alpm_option_set_showsize(1); + _alpm_log(PM_LOG_DEBUG, _("config: showsize")); } else { RET_ERR(PM_ERR_CONF_BAD_SYNTAX, -1); } diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index e2d2b0e..047048c 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -144,6 +144,9 @@ void alpm_option_set_needles(alpm_list_t *needles); unsigned short alpm_option_get_usecolor(); void alpm_option_set_usecolor(unsigned short usecolor); +unsigned short alpm_option_get_showsize(); +void alpm_option_set_showsize(unsigned short showsize); + pmdb_t *alpm_option_get_localdb(); alpm_list_t *alpm_option_get_syncdbs(); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 47abcb3..39caaa9 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -137,6 +137,7 @@ const char *alpm_option_get_xfercommand() { return handle->xfercommand; } unsigned short alpm_option_get_nopassiveftp() { return handle->nopassiveftp; } unsigned short SYMEXPORT alpm_option_get_chomp() { return handle->chomp; } unsigned short alpm_option_get_usecolor() { return handle->use_color; } +unsigned short SYMEXPORT alpm_option_get_showsize() { return handle->showsize; } pmdb_t SYMEXPORT *alpm_option_get_localdb() { return handle->db_local; } alpm_list_t SYMEXPORT *alpm_option_get_syncdbs() @@ -297,4 +298,9 @@ void alpm_option_set_usecolor(unsigned short usecolor) handle->use_color = usecolor; } +void alpm_option_set_showsize(unsigned short showsize) +{ + handle->showsize = showsize; +} + /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 0790ad1..b80f751 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -65,6 +65,7 @@ typedef struct _pmhandle_t { unsigned short nopassiveftp; /* Don't use PASV ftp connections */ unsigned short chomp; /* I Love Candy! */ unsigned short use_color; /* enable colorful output */ + unsigned short showsize; /* Show individual package sizes */ } pmhandle_t; extern pmhandle_t *handle; diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 11aa41b..4fff0ab 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -54,7 +54,6 @@ typedef struct __config_t { pmtransflag_t flags; unsigned short noask; unsigned int ask; - unsigned short showsize; } config_t; config_t *config_new(void); diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index fe70ea1..50265e4 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -131,7 +131,6 @@ static void usage(int op, char *myname) printf(_(" -p, --file <package> query a package file instead of the database\n")); printf(_(" -s, --search <regex> search locally-installed packages for matching strings\n")); printf(_(" -u, --upgrades list all packages that can be upgraded\n")); - printf(_(" -z, --showsize display installed size of each package\n")); } else if(op == PM_OP_SYNC) { printf("%s: %s {-S --sync} [%s] [%s]\n", str_usg, myname, str_opt, str_pkg); printf("%s:\n", str_opt); @@ -147,7 +146,6 @@ static void usage(int op, char *myname) printf(_(" -u, --sysupgrade upgrade all packages that are out of date\n")); printf(_(" -w, --downloadonly download packages but do not install/upgrade anything\n")); printf(_(" -y, --refresh download fresh package databases from the server\n")); - printf(_(" -z, --showsize display download size of each package\n")); printf(_(" --ignore <pkg> ignore a package upgrade (can be used more than once)\n")); } printf(_(" --config <path> set an alternate configuration file\n")); @@ -293,7 +291,6 @@ static int parseargs(int argc, char *argv[]) {"verbose", no_argument, 0, 'v'}, {"downloadonly", no_argument, 0, 'w'}, {"refresh", no_argument, 0, 'y'}, - {"showsize", no_argument, 0, 'z'}, {"noconfirm", no_argument, 0, 1000}, {"config", required_argument, 0, 1001}, {"ignore", required_argument, 0, 1002}, @@ -426,7 +423,6 @@ static int parseargs(int argc, char *argv[]) config->flags |= PM_TRANS_FLAG_NOCONFLICTS; break; case 'y': (config->op_s_sync)++; break; - case 'z': config->showsize = 1; break; case '?': return(1); default: return(1); } diff --git a/src/pacman/query.c b/src/pacman/query.c index bb4cfb9..aa360f1 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -146,16 +146,14 @@ int pacman_query(alpm_list_t *targets) alpm_list_t *grp; pmpkg_t *pkg = alpm_list_getdata(i); - /* print the package size with the output if -z option passed */ - if(config->showsize) { + printf("local/%s %s", alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg)); + + /* print the package size with the output if ShowSize option set */ + if(alpm_option_get_showsize()) { /* Convert byte size to MB */ double mbsize = alpm_pkg_get_size(pkg) / (1024.0 * 1024.0); - printf("local/%s %s [%.2f MB]", alpm_pkg_get_name(pkg), - alpm_pkg_get_version(pkg), mbsize); - } else { - printf("local/%s %s", alpm_pkg_get_name(pkg), - alpm_pkg_get_version(pkg)); + printf(" [%.2f MB]", mbsize); } if((grp = alpm_pkg_get_groups(pkg)) != NULL) { diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 4f11bb4..bb2b977 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -251,18 +251,15 @@ static int sync_search(alpm_list_t *syncs, alpm_list_t *targets) alpm_list_t *grp; pmpkg_t *pkg = alpm_list_getdata(j); - /* print the package size with the output if -z option passed */ - if(config->showsize) { + printf("%s/%s %s", alpm_db_get_name(db), alpm_pkg_get_name(pkg), + alpm_pkg_get_version(pkg)); + + /* print the package size with the output if ShowSize option set */ + if(alpm_option_get_showsize()) { /* Convert byte size to MB */ double mbsize = alpm_pkg_get_size(pkg) / (1024.0 * 1024.0); - printf("%s/%s %s [%.2f MB]", alpm_db_get_name(db), - alpm_pkg_get_name(pkg), - alpm_pkg_get_version(pkg), mbsize); - } else { - printf("%s/%s %s", alpm_db_get_name(db), - alpm_pkg_get_name(pkg), - alpm_pkg_get_version(pkg)); + printf(" [%.2f MB]", mbsize); } if((grp = alpm_pkg_get_groups(pkg)) != NULL) { diff --git a/src/pacman/util.c b/src/pacman/util.c index f38be60..7b7ec0b 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -294,7 +294,8 @@ void display_targets(alpm_list_t *syncpkgs) size += dispsize; isize += alpm_pkg_get_isize(pkg); - if(config->showsize) { + /* print the package size with the output if ShowSize option set */ + if(alpm_option_get_showsize()) { /* Convert byte size to MB */ mbdispsize = dispsize / (1024.0 * 1024.0); -- 1.5.1.3

4 4

[pacman-dev] [GIT] pacman branch, master now at R_3_0_0-158-gcb9f046
by Dan McGee 01 Jun '07

01 Jun '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via cb9f046945b0365d7d29ee590a31a08bece1879c (commit) from 6d6910388e972d47df6a7a4268cd319e0aaba6d4 (commit) - Log ----------------------------------------------------------------- commit cb9f046945b0365d7d29ee590a31a08bece1879c Author: Juan Pablo González T <lord_jotape(a)yahoo.com.ar> Date: Fri Jun 1 10:30:22 2007 -0400 Updated Spanish Translation Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: src/pacman/po/es.po | 468 +++++++++++++++++---------------------------------- 1 files changed, 151 insertions(+), 317 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 6d6910388e972d47df6a7a4268cd319e0aaba6d4 \ cb9f046945b0365d7d29ee590a31a08bece1879c

1 0

[pacman-dev] french man pages for pacman 3
by marc[i1] 01 Jun '07

01 Jun '07

Hello, I translate pacman man pages, I make a PKGBUILD in AUR for french people who does not want to read in english. http://aur.archlinux.org/packages.php?do_Details=1&ID=11180 I ask here if some dev wants to add those man pages on pacman. Thanks. -- + - - - - - - - - - - - - - - - - - - - + + (o< -! marc[i1] #363392 + + //\ http://poiroud.free.fr/dotclear + + \\/_ Linux for Free Generation + + - - - - - - - - - - - - - - - - - - - +

2 1

[pacman-dev] [GIT] pacman branch, master now at R_3_0_0-157-g6d69103
by Dan McGee 31 May '07

31 May '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via 6d6910388e972d47df6a7a4268cd319e0aaba6d4 (commit) via 6d649473fa62726d783081025318f5add307b2d6 (commit) via af888c534b7c106ba89069ef6b11ea63d9f24975 (commit) from e422b71a48c9f7637595c510d8766f0f38b1114e (commit) - Log ----------------------------------------------------------------- commit 6d6910388e972d47df6a7a4268cd319e0aaba6d4 Author: Dan McGee <dan(a)archlinux.org> Date: Thu May 31 18:44:53 2007 -0400 Add Andrew to the authors list Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6d649473fa62726d783081025318f5add307b2d6 Author: Andrew Fyfe <andrew(a)neptune-one.net> Date: Thu May 31 18:44:00 2007 -0400 FS7319: Add option to disable the inclusion of abs script. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit af888c534b7c106ba89069ef6b11ea63d9f24975 Author: VMiklos <vmiklos(a)frugalware.org> Date: Thu May 31 15:21:33 2007 -0400 alpm_parse_config(): ignore #.*$, not just ^#.*$ Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: AUTHORS | 1 + configure.ac | 16 ++++++++++++++++ etc/Makefile.am | 6 +++++- lib/libalpm/alpm.c | 3 +++ scripts/Makefile.am | 5 ++++- 5 files changed, 29 insertions(+), 2 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ e422b71a48c9f7637595c510d8766f0f38b1114e \ 6d6910388e972d47df6a7a4268cd319e0aaba6d4

1 0