[pacman-dev] [PATCH 1/3] makepkg: remove unused -C option from option list

newer
[pacman-dev] [PATCH] pacman-key:...

Dave Reisner

8 Jul 2011 8 Jul '11

3:42 p.m.

We nuke it from the completion file as well. Signed-off-by: Dave Reisner --- contrib/bash_completion.in | 2 +- scripts/makepkg.sh.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/bash_completion.in b/contrib/bash_completion.in index 7f47f4b..3093c02 100644 --- a/contrib/bash_completion.in +++ b/contrib/bash_completion.in @@ -35,7 +35,7 @@ _makepkg() { opts=('allsource asroot clean cleancache config force geninteg help holdver ignorearch install log nobuild nocolor noconfirm nodeps noextract noprogressbar pkg repackage rmdeps skipinteg source syncdeps' - 'A C L R c d e f g h i m o p r s') + 'A L R c d e f g h i m o p r s') _arch_ptr2comp opts fi true diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 1b132a9..cae6aa8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1747,7 +1747,7 @@ fi ARGLIST=("$@") # Parse Command Line Options. -OPT_SHORT="AcCdefFghiLmop:rRsV" +OPT_SHORT="AcdefFghiLmop:rRsV" 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" -- 1.7.6

Show replies by date

Dave Reisner

8 Jul 8 Jul

3:42 p.m.

New subject: [pacman-dev] [PATCH 2/3] contrib/bash_completion: update with new makepkg opts

Adds new options for signing on package creation, as well as the check() functionality. Signed-off-by: Dave Reisner --- contrib/bash_completion.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/bash_completion.in b/contrib/bash_completion.in index 3093c02..f656487 100644 --- a/contrib/bash_completion.in +++ b/contrib/bash_completion.in @@ -32,9 +32,9 @@ _makepkg() { COMPREPLY=() _get_comp_words_by_ref cur prev if [[ $cur = -* && ! $prev =~ ^-(-(cleancache|config|help)$|\w*[Chp]) ]]; then - opts=('allsource asroot clean cleancache config force geninteg help holdver - ignorearch install log nobuild nocolor noconfirm nodeps noextract - noprogressbar pkg repackage rmdeps skipinteg source syncdeps' + opts=('allsource asroot check clean cleancache config force geninteg help holdver + ignorearch install log nobuild nocheck nocolor noconfirm nodeps noextract + noprogressbar nosign pkg repackage rmdeps sign skipinteg source syncdeps' 'A L R c d e f g h i m o p r s') _arch_ptr2comp opts fi -- 1.7.6

Dave Reisner

3:42 p.m.

New subject: [pacman-dev] [PATCH 3/3] contrib/log2pkglist: new contribution

converts a pacman log file to a list of installed packages, which should match the output of `pacman -Q'. This isn't bullet proof, as testing has revealed that the log is not always precisely accurate, but it should be good enough for a user whom finds himself in a situation dire enough to need this. Signed-off-by: Dave Reisner --- We've had a similar script floating around on the wiki and some other places, so this should be a nice addition to our contrib package. It has the added bonus of providing version numbers. contrib/Makefile.am | 1 + contrib/log2pkglist | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-) create mode 100755 contrib/log2pkglist diff --git a/contrib/Makefile.am b/contrib/Makefile.am index cba2085..b1675f4 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -13,6 +13,7 @@ EXTRA_DIST = \ PKGBUILD.vim \ bacman.in \ bash_completion.in \ + log2pkglist \ pacdiff.in \ paclist.in \ pacscripts.in \ diff --git a/contrib/log2pkglist b/contrib/log2pkglist new file mode 100755 index 0000000..5da47ae --- /dev/null +++ b/contrib/log2pkglist @@ -0,0 +1,57 @@ +#!/bin/awk -f +# +# log2pkglist - Parse a log file into a list of currently installed packages +# +# Copyright (C) 2011 Dave Reisner +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. + +BEGIN { + if (ARGC < 2) { + printf "usage: log2pkglist <pacman log>\n" + printf "example: log2pkglist /var/log/pacman.log\n" + exit + } +} + +{ + action = $3 + pkgname = $4 + pkgver = $5 + upgver = $7 +} + +NF == 5 && action == "installed" { + gsub(/[()]/, "", pkgver) + pkg[pkgname] = pkgver + next +} + +NF == 7 && action == "upgraded" { + sub(/)/, "", upgver) + pkg[pkgname] = upgver + next +} + +NF == 5 && action == "removed" { + pkg[pkgname] = -1 +} + +END { + for (i in pkg) { + if (pkg[i] != -1) { + printf "%s %s\n",i,pkg[i] + } + } +} -- 1.7.6

Dan McGee

3:51 p.m.

New subject: [pacman-dev] [PATCH 3/3] contrib/log2pkglist: new contribution

On Fri, Jul 8, 2011 at 8:42 AM, Dave Reisner wrote:

...

converts a pacman log file to a list of installed packages, which should match the output of `pacman -Q'.

This isn't bullet proof, as testing has revealed that the log is not always precisely accurate, but it should be good enough for a user whom finds himself in a situation dire enough to need this.

Signed-off-by: Dave Reisner --- We've had a similar script floating around on the wiki and some other places, so this should be a nice addition to our contrib package. It has the added bonus of providing version numbers.

Looks good to me with some quick testing. I used an older version of gawk (3.1.5) and things seemed fine. Nothing immediately available to test on a non-GNU system though, anyone on OSX/BSD want to give this a quick spin? My only problem here would be the name- it looks great in contrib/, but not so good in /usr/bin. "log2x" is pretty damn generic and doesn't really signify "pacman log to package list". I can't come up with some short and sweet name though. "pacman-log-rescue"?

...

contrib/Makefile.am | 1 + contrib/log2pkglist | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-) create mode 100755 contrib/log2pkglist

diff --git a/contrib/Makefile.am b/contrib/Makefile.am index cba2085..b1675f4 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -13,6 +13,7 @@ EXTRA_DIST = \ PKGBUILD.vim \ bacman.in \ bash_completion.in \ + log2pkglist \ pacdiff.in \ paclist.in \ pacscripts.in \ diff --git a/contrib/log2pkglist b/contrib/log2pkglist new file mode 100755 index 0000000..5da47ae --- /dev/null +++ b/contrib/log2pkglist @@ -0,0 +1,57 @@ +#!/bin/awk -f +# +# log2pkglist - Parse a log file into a list of currently installed packages +# +# Copyright (C) 2011 Dave Reisner +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. + +BEGIN { + if (ARGC < 2) { + printf "usage: log2pkglist <pacman log>\n" + printf "example: log2pkglist /var/log/pacman.log\n" + exit + } +} + +{ + action = $3 + pkgname = $4 + pkgver = $5 + upgver = $7 +} + +NF == 5 && action == "installed" { + gsub(/[()]/, "", pkgver) + pkg[pkgname] = pkgver + next +} + +NF == 7 && action == "upgraded" { + sub(/)/, "", upgver) + pkg[pkgname] = upgver + next +} + +NF == 5 && action == "removed" { + pkg[pkgname] = -1 +} + +END { + for (i in pkg) { + if (pkg[i] != -1) { + printf "%s %s\n",i,pkg[i] + } + } +} -- 1.7.6

Lukas Fleischer

4:05 p.m.

New subject: [pacman-dev] [PATCH] contrib/log2pkglist: new contribution

From: Dave Reisner converts a pacman log file to a list of installed packages, which should match the output of `pacman -Q'. This isn't bullet proof, as testing has revealed that the log is not always precisely accurate, but it should be good enough for a user whom finds himself in a situation dire enough to need this. Signed-off-by: Dave Reisner Signed-off-by: Lukas Fleischer --- The bracket in the regular expression in line 42 needs to be escaped, otherwise OpenBSD's awk(1) fails with: ---- awk: illegal primary in regular expression ) at source line number 42 source file log2pkglist context is sub(/)/, "", >>> upgver) <<< ---- Apart from that, this works fine for me (OpenBSD 4.9, awk version 20100523). contrib/Makefile.am | 1 + contrib/log2pkglist | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-) create mode 100755 contrib/log2pkglist diff --git a/contrib/Makefile.am b/contrib/Makefile.am index cba2085..b1675f4 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -13,6 +13,7 @@ EXTRA_DIST = \ PKGBUILD.vim \ bacman.in \ bash_completion.in \ + log2pkglist \ pacdiff.in \ paclist.in \ pacscripts.in \ diff --git a/contrib/log2pkglist b/contrib/log2pkglist new file mode 100755 index 0000000..e9f27cd --- /dev/null +++ b/contrib/log2pkglist @@ -0,0 +1,57 @@ +#!/bin/awk -f +# +# log2pkglist - Parse a log file into a list of currently installed packages +# +# Copyright (C) 2011 Dave Reisner +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. + +BEGIN { + if (ARGC < 2) { + printf "usage: log2pkglist <pacman log>\n" + printf "example: log2pkglist /var/log/pacman.log\n" + exit + } +} + +{ + action = $3 + pkgname = $4 + pkgver = $5 + upgver = $7 +} + +NF == 5 && action == "installed" { + gsub(/[()]/, "", pkgver) + pkg[pkgname] = pkgver + next +} + +NF == 7 && action == "upgraded" { + sub(/\)/, "", upgver) + pkg[pkgname] = upgver + next +} + +NF == 5 && action == "removed" { + pkg[pkgname] = -1 +} + +END { + for (i in pkg) { + if (pkg[i] != -1) { + printf "%s %s\n",i,pkg[i] + } + } +} -- 1.7.6

Dave Reisner

4:17 p.m.

New subject: [pacman-dev] [PATCH 3/3] contrib/log2pkglist: new contribution

On Fri, Jul 08, 2011 at 08:51:51AM -0500, Dan McGee wrote:

...

On Fri, Jul 8, 2011 at 8:42 AM, Dave Reisner wrote:

...
converts a pacman log file to a list of installed packages, which should match the output of `pacman -Q'.

This isn't bullet proof, as testing has revealed that the log is not always precisely accurate, but it should be good enough for a user whom finds himself in a situation dire enough to need this.

Signed-off-by: Dave Reisner --- We've had a similar script floating around on the wiki and some other places, so this should be a nice addition to our contrib package. It has the added bonus of providing version numbers.

Looks good to me with some quick testing. I used an older version of gawk (3.1.5) and things seemed fine. Nothing immediately available to test on a non-GNU system though, anyone on OSX/BSD want to give this a quick spin?

It's POSIX compliant, but I know one of the BSDs ships with nawk as /bin/awk, so we're going to run into a small issue I've got fixed up (we ran into the same thing with makepkg -- lack of escaped paren in a regex).

...

My only problem here would be the name- it looks great in contrib/, but not so good in /usr/bin. "log2x" is pretty damn generic and doesn't really signify "pacman log to package list". I can't come up with some short and sweet name though. "pacman-log-rescue"?

Variations on a theme... paclog2pkglist paclog-rescue pac-log-rescue rmrfvarlibpacman d

...

...
contrib/Makefile.am | 1 + contrib/log2pkglist | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-) create mode 100755 contrib/log2pkglist

diff --git a/contrib/Makefile.am b/contrib/Makefile.am index cba2085..b1675f4 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -13,6 +13,7 @@ EXTRA_DIST = \ PKGBUILD.vim \ bacman.in \ bash_completion.in \ + log2pkglist \ pacdiff.in \ paclist.in \ pacscripts.in \ diff --git a/contrib/log2pkglist b/contrib/log2pkglist new file mode 100755 index 0000000..5da47ae --- /dev/null +++ b/contrib/log2pkglist @@ -0,0 +1,57 @@ +#!/bin/awk -f +# +# log2pkglist - Parse a log file into a list of currently installed packages +# +# Copyright (C) 2011 Dave Reisner +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. + +BEGIN { + if (ARGC < 2) { + printf "usage: log2pkglist <pacman log>\n" + printf "example: log2pkglist /var/log/pacman.log\n" + exit + } +} + +{ + action = $3 + pkgname = $4 + pkgver = $5 + upgver = $7 +} + +NF == 5 && action == "installed" { + gsub(/[()]/, "", pkgver) + pkg[pkgname] = pkgver + next +} + +NF == 7 && action == "upgraded" { + sub(/)/, "", upgver) + pkg[pkgname] = upgver + next +} + +NF == 5 && action == "removed" { + pkg[pkgname] = -1 +} + +END { + for (i in pkg) { + if (pkg[i] != -1) { + printf "%s %s\n",i,pkg[i] + } + } +} -- 1.7.6

Allan McRae

10:10 p.m.

New subject: [pacman-dev] [PATCH 3/3] contrib/log2pkglist: new contribution

On 09/07/11 00:17, Dave Reisner wrote:

...

On Fri, Jul 08, 2011 at 08:51:51AM -0500, Dan McGee wrote:

...
On Fri, Jul 8, 2011 at 8:42 AM, Dave Reisner wrote:

...
converts a pacman log file to a list of installed packages, which should match the output of `pacman -Q'.

This isn't bullet proof, as testing has revealed that the log is not always precisely accurate, but it should be good enough for a user whom finds himself in a situation dire enough to need this.

Signed-off-by: Dave Reisner --- We've had a similar script floating around on the wiki and some other places, so this should be a nice addition to our contrib package. It has the added bonus of providing version numbers.

Looks good to me with some quick testing. I used an older version of gawk (3.1.5) and things seemed fine. Nothing immediately available to test on a non-GNU system though, anyone on OSX/BSD want to give this a quick spin?

It's POSIX compliant, but I know one of the BSDs ships with nawk as /bin/awk, so we're going to run into a small issue I've got fixed up (we ran into the same thing with makepkg -- lack of escaped paren in a regex).

...
My only problem here would be the name- it looks great in contrib/, but not so good in /usr/bin. "log2x" is pretty damn generic and doesn't really signify "pacman log to package list". I can't come up with some short and sweet name though. "pacman-log-rescue"?

Variations on a theme...

paclog2pkglist paclog-rescue pac-log-rescue rmrfvarlibpacman

givemeapackagelistfrommypacmanlog But pacman-log-rescue sounds fine to me. Allan

Dieter Plaetinck

10:20 p.m.

New subject: [pacman-dev] [PATCH 3/3] contrib/log2pkglist: new contribution

On Sat, 09 Jul 2011 06:10:37 +1000 Allan McRae wrote:

...

On 09/07/11 00:17, Dave Reisner wrote:

...
On Fri, Jul 08, 2011 at 08:51:51AM -0500, Dan McGee wrote:

...
On Fri, Jul 8, 2011 at 8:42 AM, Dave Reisner wrote:

...
converts a pacman log file to a list of installed packages, which should match the output of `pacman -Q'.

This isn't bullet proof, as testing has revealed that the log is not always precisely accurate, but it should be good enough for a user whom finds himself in a situation dire enough to need this.

Signed-off-by: Dave Reisner --- We've had a similar script floating around on the wiki and some other places, so this should be a nice addition to our contrib package. It has the added bonus of providing version numbers.

Looks good to me with some quick testing. I used an older version of gawk (3.1.5) and things seemed fine. Nothing immediately available to test on a non-GNU system though, anyone on OSX/BSD want to give this a quick spin?

It's POSIX compliant, but I know one of the BSDs ships with nawk as /bin/awk, so we're going to run into a small issue I've got fixed up (we ran into the same thing with makepkg -- lack of escaped paren in a regex).

...
My only problem here would be the name- it looks great in contrib/, but not so good in /usr/bin. "log2x" is pretty damn generic and doesn't really signify "pacman log to package list". I can't come up with some short and sweet name though. "pacman-log-rescue"?

Variations on a theme...

paclog2pkglist paclog-rescue pac-log-rescue rmrfvarlibpacman

givemeapackagelistfrommypacmanlog

But pacman-log-rescue sounds fine to me.

Allan

get-packagelist-from-pacman-log-you-really-shouldnt-need-this-unless-you-fucked-up-badly-you-know-what-youre-doing-right-omglolwtfifyoureallyneedthisyouwereatleasttryingtodosomethingawesome j/k of course.. just don't name it `rmrfvarlibpacman`, that's a weird name. Dieter

4682

Age (days ago)

4682

Last active (days ago)

List overview

Download

7 comments

5 participants

participants (5)

Allan McRae
Dan McGee
Dave Reisner
Dieter Plaetinck
Lukas Fleischer

[pacman-dev] [PATCH 1/3] makepkg: remove unused -C option from option list

tags

participants (5)