Gentoo Archives: gentoo-commits

From: "Doug Goldstein (cardoe)" <cardoe@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo commit in users/antarus/projects/infra: use_desc_gen.sh
Date: Sat, 23 Aug 2008 06:53:28
Message-Id: E1KWn01-00017x-Mt@stork.gentoo.org
1 cardoe 08/08/23 06:53:25
2
3 Modified: use_desc_gen.sh
4 Log:
5 comment out support for partial tree conversions since the whole tree is done
6
7 Revision Changes Path
8 1.5 users/antarus/projects/infra/use_desc_gen.sh
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo/users/antarus/projects/infra/use_desc_gen.sh?rev=1.5&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo/users/antarus/projects/infra/use_desc_gen.sh?rev=1.5&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo/users/antarus/projects/infra/use_desc_gen.sh?r1=1.4&r2=1.5
13
14 Index: use_desc_gen.sh
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo/users/antarus/projects/infra/use_desc_gen.sh,v
17 retrieving revision 1.4
18 retrieving revision 1.5
19 diff -u -r1.4 -r1.5
20 --- use_desc_gen.sh 23 Aug 2008 06:35:27 -0000 1.4
21 +++ use_desc_gen.sh 23 Aug 2008 06:53:25 -0000 1.5
22 @@ -2,7 +2,7 @@
23 # Written by Douglas Goldstein <cardoe@g.o>
24 # This code is hereby placed into the public domain
25 #
26 -# $Id: use_desc_gen.sh,v 1.4 2008/08/23 06:35:27 cardoe Exp $
27 +# $Id: use_desc_gen.sh,v 1.5 2008/08/23 06:53:25 cardoe Exp $
28
29 usage() {
30 prog=$(basename $1)
31 @@ -26,24 +26,24 @@
32 pid=$(echo $$)
33
34 # make list of categories that we want to remove from current use.local.desc
35 -cat "${1}/profiles/use.local.desc" | sed '1,/# The following categories/d;/# End of metadata categories/,$d;s/^../^/' > /tmp/${pid}.grep
36 +#cat "${1}/profiles/use.local.desc" | sed '1,/# The following categories/d;/# End of metadata categories/,$d;s/^../^/' > /tmp/${pid}.grep
37
38 # we also want to remove comments and blank lines
39 -echo "^#" >> /tmp/${pid}.grep
40 -echo "^$" >> /tmp/${pid}.grep
41 +#echo "^#" >> /tmp/${pid}.grep
42 +#echo "^$" >> /tmp/${pid}.grep
43
44 # make list of categories to process with use_desc_gen (same as above without grep rule)
45 -cat "${1}/profiles/use.local.desc" | sed '1,/# The following categories/d;/# End of metadata categories/,$d;s/^..//' > /tmp/${pid}.categories
46 +#cat "${1}/profiles/use.local.desc" | sed '1,/# The following categories/d;/# End of metadata categories/,$d;s/^..//' > /tmp/${pid}.categories
47
48 # take comments from existing use.local.desc
49 grep '^#' "${1}/profiles/use.local.desc" > /tmp/${pid}.use.local.desc
50 echo "" >> /tmp/${pid}.use.local.desc
51
52 # use list from step #1 to filter current use.local.desc and add un-converted categories to new use.local.desc
53 -grep -v -f /tmp/${pid}.grep "${1}/profiles/use.local.desc" > /tmp/${pid}.new.use
54 +#grep -v -f /tmp/${pid}.grep "${1}/profiles/use.local.desc" > /tmp/${pid}.new.use
55
56 # the secret sauce, append to new use.local.desc
57 -./use_desc_gen --repo_path "${1}" --category_file "/tmp/${pid}.categories" >> /tmp/${pid}.new.use
58 +./use_desc_gen --repo_path "${1}" > /tmp/${pid}.new.use
59
60 # let's keep it sorted: use major category, minor category, and package name
61 # as primary, secondary, and tertiary sort keys, respectively
62 @@ -51,8 +51,8 @@
63 >> /tmp/${pid}.use.local.desc
64
65 # clean up
66 -rm -rf /tmp/${pid}.categories
67 -rm -rf /tmp/${pid}.grep
68 +#rm -rf /tmp/${pid}.categories
69 +#rm -rf /tmp/${pid}.grep
70 rm -rf /tmp/${pid}.new.use
71
72 echo "new use.local.desc at /tmp/${pid}.use.local.desc"