- Pacman-dev - lists.archlinux.org

[pacman-dev] CVS update of pacman-lib/src/pacman (log.c util.c util.h)
by Dan McGee 13 Mar '07

13 Mar '07

Date: Tuesday, March 13, 2007 @ 12:15:38 Author: dan Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: log.c (1.33 -> 1.34) util.c (1.31 -> 1.32) util.h (1.17 -> 1.18) * Resizing terminal while progress bars were displayed caused some weird issues, this should fix it. Progress bars now go from displaying, to showing percent only, to not displaying at all. Changed unsigned -> signed to prevent wraparound errors in integer comparison. --------+ log.c | 2 - util.c | 76 ++++++++++++++++++++++++++++++++++----------------------------- util.h | 4 +-- 3 files changed, 45 insertions(+), 37 deletions(-) Index: pacman-lib/src/pacman/log.c diff -u pacman-lib/src/pacman/log.c:1.33 pacman-lib/src/pacman/log.c:1.34 --- pacman-lib/src/pacman/log.c:1.33 Wed Mar 7 02:45:31 2007 +++ pacman-lib/src/pacman/log.c Tue Mar 13 12:15:38 2007 @@ -134,7 +134,7 @@ fprintf(file, str); if(needpad == 1) { - unsigned int i, cols = getcols(); + int i, cols = getcols(); for(i=len; i < cols; ++i) { fprintf(file, " "); } Index: pacman-lib/src/pacman/util.c diff -u pacman-lib/src/pacman/util.c:1.31 pacman-lib/src/pacman/util.c:1.32 --- pacman-lib/src/pacman/util.c:1.31 Mon Mar 5 17:13:35 2007 +++ pacman-lib/src/pacman/util.c Tue Mar 13 12:15:38 2007 @@ -53,7 +53,7 @@ extern config_t *config; /* gets the current screen column width */ -unsigned int getcols() +int getcols() { if(!isatty(1)) { /* We will default to 80 columns if we're not a tty @@ -161,10 +161,10 @@ /* output a string, but wrap words properly with a specified indentation */ -void indentprint(const char *str, unsigned int indent) +void indentprint(const char *str, int indent) { const char *p = str; - unsigned int cidx = indent; + int cidx = indent; while(*p) { if(*p == ' ') { @@ -177,9 +177,9 @@ next = p + strlen(p); } len = next - p; - if(len > (getcols()-cidx-1)) { + if(len > (getcols() - cidx - 1)) { /* newline */ - unsigned int i; + int i; fprintf(stdout, "\n"); for(i = 0; i < indent; i++) { fprintf(stdout, " "); @@ -242,7 +242,7 @@ for(i = list, cols = len; i; i = alpm_list_next(i)) { char *str = alpm_list_getdata(i); int s = strlen(str) + 2; - unsigned int maxcols = getcols(); + int maxcols = getcols(); if(s + cols >= maxcols) { int i; cols = len; @@ -385,46 +385,55 @@ static unsigned int lasthash = 0, mouth = 0; unsigned int i; + /* printf("\ndebug: proglen: %i\n", proglen); DEBUG*/ + if(percent == 0) { lasthash = 0; mouth = 0; } - printf(" ["); - for(i = hashlen; i > 1; --i) { - /* if special progress bar enabled */ - if(chomp) { - if(i > hashlen - hash) { - printf("-"); - } else if(i == hashlen - hash) { - if(lasthash == hash) { - if(mouth) { - printf("\033[1;33mC\033[m"); + /* magic numbers, how I loathe thee */ + if(proglen > 8) { + printf(" ["); + for(i = hashlen; i > 1; --i) { + /* if special progress bar enabled */ + if(chomp) { + if(i > hashlen - hash) { + printf("-"); + } else if(i == hashlen - hash) { + if(lasthash == hash) { + if(mouth) { + printf("\033[1;33mC\033[m"); + } else { + printf("\033[1;33mc\033[m"); + } } else { - printf("\033[1;33mc\033[m"); + lasthash = hash; + mouth = mouth == 1 ? 0 : 1; + if(mouth) { + printf("\033[1;33mC\033[m"); + } else { + printf("\033[1;33mc\033[m"); + } } + } else if(i%3 == 0) { + printf("\033[0;37mo\033[m"); } else { - lasthash = hash; - mouth = mouth == 1 ? 0 : 1; - if(mouth) { - printf("\033[1;33mC\033[m"); - } else { - printf("\033[1;33mc\033[m"); - } + printf("\033[0;37m \033[m"); } - } else if(i%3 == 0) { - printf("\033[0;37mo\033[m"); + } /* else regular progress bar */ + else if(i > hashlen - hash) { + printf("#"); } else { - printf("\033[0;37m \033[m"); + printf("-"); } - } /* else regular progress bar */ - else if(i > hashlen - hash) { - printf("#"); - } else { - printf("-"); } + printf("]"); + } + /* print percent after progress bar */ + if(proglen > 5) { + printf(" %3d%%", percent); } - printf("] %3d%%", percent); if(percent == 100) { printf("\n"); @@ -434,5 +443,4 @@ fflush(stdout); } - /* vim: set ts=2 sw=2 noet: */ Index: pacman-lib/src/pacman/util.h diff -u pacman-lib/src/pacman/util.h:1.17 pacman-lib/src/pacman/util.h:1.18 --- pacman-lib/src/pacman/util.h:1.17 Mon Mar 5 20:21:42 2007 +++ pacman-lib/src/pacman/util.h Tue Mar 13 12:15:38 2007 @@ -50,10 +50,10 @@ #define UPDATE_SPEED_SEC 0.2f #define _(str) gettext(str) -unsigned int getcols(); +int getcols(); int makepath(char *path); int rmrf(char *path); -void indentprint(const char *str, unsigned int indent); +void indentprint(const char *str, int indent); char *strtoupper(char *str); char *strtrim(char *str); int reg_match(char *string, char *pattern);

1 0

[pacman-dev] CVS update of pacman-lib/scripts (repo-add)
by Aaron Griffin 13 Mar '07

13 Mar '07

Date: Tuesday, March 13, 2007 @ 11:01:15 Author: aaron Path: /home/cvs-pacman/pacman-lib/scripts Modified: repo-add (1.5 -> 1.6) * Sebastian Sareyko Fix repo-add filename addition (use basename) ----------+ repo-add | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/scripts/repo-add diff -u pacman-lib/scripts/repo-add:1.5 pacman-lib/scripts/repo-add:1.6 --- pacman-lib/scripts/repo-add:1.5 Thu Feb 22 20:29:14 2007 +++ pacman-lib/scripts/repo-add Tue Mar 13 11:01:15 2007 @@ -148,7 +148,7 @@ # create desc entry echo ":: creating 'desc' db entry" - echo -e "%FILENAME%\n$1\n" >> desc + echo -e "%FILENAME%\n$(basename $1)\n" >> desc echo -e "%NAME%\n$pkgname\n" >>desc echo -e "%VERSION%\n$pkgver\n" >>desc if [ -n "$pkgdesc" ]; then

3 2

[pacman-dev] CVS update of pacman-lib/lib/libalpm (server.c)
by Aaron Griffin 12 Mar '07

12 Mar '07

Date: Monday, March 12, 2007 @ 19:26:48 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: server.c (1.25 -> 1.26) * Missed a path when requiring that all paths end with / - this caused -U not to work (it was downloading files as .package-name) at all. ----------+ server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/lib/libalpm/server.c diff -u pacman-lib/lib/libalpm/server.c:1.25 pacman-lib/lib/libalpm/server.c:1.26 --- pacman-lib/lib/libalpm/server.c:1.25 Mon Mar 5 23:22:03 2007 +++ pacman-lib/lib/libalpm/server.c Mon Mar 12 19:26:47 2007 @@ -407,7 +407,7 @@ alpm_list_t *servers = alpm_list_add(NULL, server); alpm_list_t *files = alpm_list_add(NULL, filename); - if(_alpm_downloadfiles(servers, ".", files)) { + if(_alpm_downloadfiles(servers, "./", files)) { _alpm_log(PM_LOG_WARNING, _("failed to download %s"), target); return(NULL); }

1 0

[pacman-dev] pacman 3 RC1 bug roundup
by Aaron Griffin 12 Mar '07

12 Mar '07

This is just a note to everyone who reported issues with the pacman 3 RC. I believe Dan and I have killed everything reported, but, well, I get quite a bit of email so may have missed something. If you did not see your bug reported as "fixed" by Dan or myself, please reply and let us know, as we'd like to push out RC2 today/tomorrow (Monday) and we want to make sure we got it all. For future reference, the easiest way to make sure we cover all these bases is by adding a bug report at bugs.archlinux.org (Category: Pacman). Special thanks go out to all the testers! You guys make a huge difference. - phrak

2 1

Re: [pacman-dev] devtools and extrapkg
by Dan McGee 12 Mar '07

12 Mar '07

On 3/12/07, Jason Chu <jason(a)archlinux.org> wrote: > On Sun, 11 Mar 2007 23:21:48 -0400 > "Dan McGee" <dpmcgee(a)gmail.com> wrote: > > > On 3/9/07, Travis Willard <travisw(a)wmpub.ca> wrote: > > > On Thu, 8 Mar 2007 16:41:48 -0500 > > > "Dan McGee" <dpmcgee(a)gmail.com> wrote: > > > > > > > I didn't implement the above looping stuff, but I left a nice note > > > > right where it needs to be done. :) > > > > > > Here you go - incorporating Dan's cleanup patch as well. This is a > > > diff from the version of extrapkg patched with the minimal patch I > > > double-attached previously. > > > > > > In the (limited) tests I've done with this, it seems to do the job. > > > I've kept backward support for lack of -{$arch} suffix in for now, > > > but it's easily enough removed. > > > > > > I pulled msg(), warning(), and error() from makepkg for it too, for > > > consistency - I thought of this 'cause Dan's patch used 'error' in > > > one place (copy-pasta probably) and I thought to myself "Meh, why > > > not". If you'd rather the plain output I can put it back. :P > > > > I threw this patch up at the same place my old one was with all > > changes from the SVN copy (revision 223). Here it is: > > <http://www.archlinux.org/~dan/extrapkg.patch>. > > > > Xentac, I believe this is your SVN repo? I CC'ed you in on this if you > > want to check this in, correct me if I am wrong. > > > > -Dan > > Yeah, I have a copy of the patch. I'm waiting for pacman to become > official before applying it because the new -arch suffix isn't > supported on gerolde yet (or most users' pacmans). We should probably have a period where packages in the sync databases are still named in the old fashion (and the pacman package should probably always be named this way for the considerable future to not break that upgrade). Pacman 3 can deal with either naming scheme. This should not be a very hard change to make to the scripts on gerolde, which I know nothing about. :) -Dan

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (be_files.c)
by Dan McGee 12 Mar '07

12 Mar '07

Date: Monday, March 12, 2007 @ 11:41:33 Author: dan Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: be_files.c (1.37 -> 1.38) * Fix wrong filesize being recorded to local DB. Reported by Andreas Radke. ------------+ be_files.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: pacman-lib/lib/libalpm/be_files.c diff -u pacman-lib/lib/libalpm/be_files.c:1.37 pacman-lib/lib/libalpm/be_files.c:1.38 --- pacman-lib/lib/libalpm/be_files.c:1.37 Sun Mar 11 23:02:57 2007 +++ pacman-lib/lib/libalpm/be_files.c Mon Mar 12 11:41:33 2007 @@ -568,8 +568,9 @@ "%s\n\n", info->packager); } if(info->size) { + /* only write installed size, csize is irrelevant once installed */ fprintf(fp, "%%SIZE%%\n" - "%lu\n\n", info->size); + "%lu\n\n", info->isize); } if(info->reason) { fprintf(fp, "%%REASON%%\n"

1 0

[pacman-dev] Problems with pacman -Rs (pacman3)
by Jeff Bailes 12 Mar '07

12 Mar '07

I was just using pacman 3 (RC 1) and the -Rs option doesn't work as expected, the dependencies are not removed from the system, even though the pacman database believes they have. For example: I type 'pacman -S aalib' to install aalib Pacman informs me that both gpm-1.20.1-6 and aalib-1.4rc5-4 are to be installed I press enter to continue with the installation. I then type 'pacman -Rs aalib' to remove it and its dependency (gpm) Pacman informs me that both aalib and gpm are to be uninstalled I press enter to confirm and all I get is the following: (1/2) removing aalib [#####################] 100% jeff@jeff:~$ It does not mention removing gpm at all, apart from in the 'Targets' section This has removed aalib from the system and the database, but has not removed gpm from the system, only the database. To prove this I try to install gpm and it complains that all the files already exist in the filesystem and fails with errors. To remove the files I have to force-install, then remove each package manually, which is rather tedious when you do this for a package with many dependencies. Jeff

3 4

[pacman-dev] permission/location for var/abs and cache/src
by Andreas Radke 12 Mar '07

12 Mar '07

we still preset the values to /var/abs and /var/cache/pacman/{src,pkg} but recommend to use an unprivileged user for all that packaging stuff. this forces everybody to lower the directory permissions or raise the user up into a certain group or even give sudo permissions. i think adding a new group "packager" holding these directories could solve that. various options are possible. what's the best and most secure one? Andy

6 15

[pacman-dev] The real deal - pacman 3.0.0 RC1
by Dan McGee 12 Mar '07

12 Mar '07

Hey guys, We are really close to releasing pacman 3 to testing, but Aaron and I wanted to get you guys to do some serious testing for a few days before we do that. Both of us are now running pacman 3 exclusively, so have no fears. :) PLEASE read this first. This is no longer a side-by-side install, this will REPLACE pacman on your system. It is perfectly safe, but realize that you are upgrading, not simply installing another version. In addition, if you have pacman-rc installed currently, it is easiest to run a 'pacman -R pacman-rc' first to prevent weird things from happening. Here is the package: <http://www.archlinux.org/~dan/pacman/pacman-3.0.0-1-i686.pkg.tar.gz> And for those of you that want to build it on your own, I put the PKGBUILD and install file up as well. I recommend a bootstrap build- use your existing makepkg to build, upgrade, and then makepkg and upgrade again. However, you should have no problems along the way, so let us know of any. Here is that link: <http://www.archlinux.org/~dan/pacman/> Please report anything to us here on the list that you may find. We may not respond instantly but we will take a look at any possible bugs you guys point out. -Dan

11 42

[pacman-dev] CVS update of pacman-lib/lib/libalpm (deps.c)
by Aaron Griffin 12 Mar '07

12 Mar '07

Date: Monday, March 12, 2007 @ 01:55:14 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: deps.c (1.78 -> 1.79) * Fixed an error with 'cascade' removal due to creation of a new pmpkg_t struct (and thus not copying pertinent data w.r.t. reading package files) --------+ deps.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: pacman-lib/lib/libalpm/deps.c diff -u pacman-lib/lib/libalpm/deps.c:1.78 pacman-lib/lib/libalpm/deps.c:1.79 --- pacman-lib/lib/libalpm/deps.c:1.78 Sun Mar 11 17:10:03 2007 +++ pacman-lib/lib/libalpm/deps.c Mon Mar 12 01:55:14 2007 @@ -535,7 +535,7 @@ for(k = provides; k; k = k->next) { pmpkg_t *provpkg = k->data; if(can_remove_package(db, provpkg, newtargs)) { - pmpkg_t *pkg = _alpm_pkg_new(alpm_pkg_get_name(provpkg), alpm_pkg_get_version(provpkg)); + pmpkg_t *pkg = _alpm_pkg_dup(provpkg); _alpm_log(PM_LOG_DEBUG, _("adding '%s' to the targets"), alpm_pkg_get_name(pkg)); @@ -546,7 +546,7 @@ } FREELISTPTR(provides); } else if(can_remove_package(db, deppkg, newtargs)) { - pmpkg_t *pkg = _alpm_pkg_new(deppkg->name, deppkg->version); + pmpkg_t *pkg = _alpm_pkg_dup(deppkg); _alpm_log(PM_LOG_DEBUG, _("adding '%s' to the targets"), alpm_pkg_get_name(pkg));

1 0