kpriv/pkgsrc-wip
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Version 0.58.4

Browse source 
pkg_summary2deps:
    - Mode -cs now works correctly with patterns like
      "py*-dbus<0.71". A few regression test for this case were added.
This commit is contained in:
Aleksey Cheusov 2012-09-07 14:52:27 +00:00 committed by Thomas Klausner
parent 2e95a9b4fc
commit 5288f29d41
6 changed files with 56 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkg_summary-utils/files/NEWS
View file

@ -1,3 +1,10 @@
----------------------------------------------------------------------
Version 0.58.4, by Aleksey Cheusov, Fri, 7 Sep 2012 17:49:14 +0300
pkg_summary2deps:
- Mode -cs now works correctly with patterns like
"py*-dbus<0.71". A few regression test for this case were added.
----------------------------------------------------------------------
Version 0.58.3, by Aleksey Cheusov, Sat, 1 Sep 2012 11:59:16 +0300

19
pkg_summary-utils/files/pkg_summary2deps.in
View file

@ -287,21 +287,28 @@ function print_nodep_node (node){
print node
}
function find_by_glob (pattern, strict, base_i,i){
function find_by_glob (pattern, ver, base_i,i,pair){
for (base_i in allbases){
if (glob(base_i, pattern)){
# found [++foundcnt] = base_i
for (i=1; i <= g_basecnt2path_cnt [base_i]; ++i)
found [++foundcnt] = g_basecnt2path [base_i, i]
for (i=1; i <= g_basecnt2path_cnt [base_i]; ++i){
pair = g_basecnt2path [base_i, i]
if (!mode_strict ||
pattern_match(pkgname2version(pair), ver))
{
found [++foundcnt] = pair
}
}
}
}
}
function find_pkg (pattern, base,basecnt,j,curr){
function find_pkg (pattern, base,basecnt,ver,j,curr){
base = pkgname2pkgbase(pattern)
ver = pkgname2version(pattern)
if (base ~ /[*?\[\]]/){
# glob pattern
find_by_glob(base, 0)
find_by_glob(base, ver)
}else if (base in allbases){
# plain PKGBASE
basecnt = g_basecnt2path_cnt [base]

10
pkg_summary-utils/files/tests/src_summary9.txt
View file

@ -59,3 +59,13 @@ DEPENDS= perl>=5.0:../../lang/perl5 jpeg>=8nb1:../../graphics/jpeg tiff>=3.6.1
PKGPATH=editors/emacs22
CONFLICTS=elisp-manual-[0-9]* emacs-[0-9]* emacs-nox11-[0-9]* mule-[0-9]*
PKGNAME=py27-dbus-0.83.1nb3
COMMENT=Python bindings for the D-BUS message bus system
PKGPATH=sysutils/py-dbus
CONFLICTS=dbus-glib<0.71
CONFLICTS=py*-dbus<0.71
PKGNAME=dbus-1.2.4.6nb4
COMMENT=Message bus system
PKGPATH=sysutils/dbus

19
pkg_summary-utils/files/tests/test_pkg_summary2deps.sh
View file

@ -934,8 +934,7 @@ d: not_found pkg_online-server-0.5.0nb2 <- wip/pkg_online pkg_online-0.5.0nb2
pkg_summary2deps -dlns src_summary9.txt 2>&1 | sort |
cmp 'pkg_summary2deps #27' \
'd: not_found dbus>=0.91 <- editors/emacs emacs-23.2nb2
d: not_found desktop-file-utils>=0.10nb1 <- editors/emacs emacs-23.2nb2
'd: not_found desktop-file-utils>=0.10nb1 <- editors/emacs emacs-23.2nb2
d: not_found desktop-file-utils>=0.8 <- editors/emacs emacs-23.2nb2
d: not_found dict-client>=1.9.14 <- textproc/dictem dictem-1.0.2nb1
d: not_found fontconfig>=2.1nb2 <- editors/emacs emacs-23.2nb2
@ -995,6 +994,7 @@ d: not_found tiff>=3.6.1 <- editors/emacs22 emacs-22.3nb10
d: not_found tiff>=3.9.2nb1 <- editors/emacs emacs-23.2nb2
d: not_found tiff>=3.9.2nb1 <- editors/emacs21 emacs-21.4anb19
d: not_found tiff>=3.9.2nb1 <- editors/emacs22 emacs-22.3nb10
dbus emacs
digest distbb
emacs dictem
libmaa
@ -1002,6 +1002,7 @@ pipestatus pkg_status
pipestatus pkg_summary-utils
pipestatus pkgnih
pkg_status pkgnih
py27-dbus
runawk paexec
'
@ -1009,12 +1010,26 @@ pkg_summary2deps -c src_summary9.txt 2>&1 | sort |
cmp 'pkg_summary2deps #28' \
'editors/emacs22 (emacs-22.3nb10) conflicts (emacs-[0-9]*) with editors/emacs (emacs-23.2nb2)
editors/emacs22 (emacs-22.3nb10) conflicts (emacs-[0-9]*) with editors/emacs21 (emacs-21.4anb19)
sysutils/dbus (dbus-1.2.4.6nb4) conflicts (py*-dbus<0.71) with sysutils/py-dbus (py27-dbus-0.83.1nb3)
'
pkg_summary2deps -cs src_summary9.txt 2>&1 | sort |
cmp 'pkg_summary2deps #28.1' \
'editors/emacs22 (emacs-22.3nb10) conflicts (emacs-[0-9]*) with editors/emacs (emacs-23.2nb2)
editors/emacs22 (emacs-22.3nb10) conflicts (emacs-[0-9]*) with editors/emacs21 (emacs-21.4anb19)
'
pkg_summary2deps -cl src_summary9.txt 2>&1 | sort |
cmp 'pkg_summary2deps #29' \
'c: conflict emacs-[0-9]* editors/emacs emacs-23.2nb2 <- editors/emacs22 emacs-22.3nb10
c: conflict emacs-[0-9]* editors/emacs21 emacs-21.4anb19 <- editors/emacs22 emacs-22.3nb10
c: conflict py*-dbus<0.71 sysutils/py-dbus py27-dbus-0.83.1nb3 <- sysutils/dbus dbus-1.2.4.6nb4
'
pkg_summary2deps -cls src_summary9.txt 2>&1 | sort |
cmp 'pkg_summary2deps #29.1' \
'c: conflict emacs-[0-9]* editors/emacs emacs-23.2nb2 <- editors/emacs22 emacs-22.3nb10
c: conflict emacs-[0-9]* editors/emacs21 emacs-21.4anb19 <- editors/emacs22 emacs-22.3nb10
'
pkg_summary2deps -cl src_summary12.txt 2>&1 >/dev/null | sort |

8
pkg_summary-utils/files/tests/test_pkg_uniq_summary.sh
View file

@ -149,6 +149,10 @@ PKGNAME=emacs-21.4anb19
PKGNAME=emacs-22.3nb10
PKGNAME=py27-dbus-0.83.1nb3
PKGNAME=dbus-1.2.4.6nb4
'
pkg_uniq_summary -Fb src_summary9.txt |
@ -176,6 +180,10 @@ PKGNAME=dictem-1.0.2nb1
PKGNAME=emacs-23.2nb2
PKGNAME=py27-dbus-0.83.1nb3
PKGNAME=dbus-1.2.4.6nb4
'
pkg_uniq_summary -Fpa src_summary7.txt |

2
pkg_summary-utils/files/version.mk
View file

@ -1 +1 @@
VERSION= 0.58.3
VERSION= 0.58.4