[gentoo-commits] dev/maekke:master commit in: scripts/

2015-10-03 Thread Markus Meier 
commit: 0605a75e3a426a1245900be171ae0f69fb743c7d
Author: Markus Meier  gentoo  org>
AuthorDate: Sat Oct  3 08:59:01 2015 +
Commit: Markus Meier  gentoo  org>
CommitDate: Sat Oct  3 08:59:01 2015 +
URL:https://gitweb.gentoo.org/dev/maekke.git/commit/?id=0605a75e

tweak pull push a bit and pull just before pushing to avoid conflicts

Signed-off-by: Markus Meier  gentoo.org>

 scripts/keyword.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/keyword.sh b/scripts/keyword.sh
index e18f3a5..59629bd 100755
--- a/scripts/keyword.sh
+++ b/scripts/keyword.sh
@@ -66,7 +66,6 @@ for pkg in ${pkgs} ; do
[[ -n "${revision}" ]] && version="${version}-${revision}"
 
cd "${REPODIR}/${cpn}" || die "package ${cpn} not found"
-   git pull --rebase=preserve || die "git pull failed"
[[ -e ${pn}-${version}.ebuild ]] || die "ebuild (${pn}-${version}) not 
found"
repoman full --include-arches "${arches//\~/}" || die "repoman full 
failed on non-modified tree"
 
@@ -91,6 +90,7 @@ for pkg in ${pkgs} ; do
repoman manifest || die "repoman manifest failed"
repoman full --include-arches "${arches//\~/}" || die "repoman 
full failed on modified tree"
repoman commit --include-arches "${arches//\~/}" -m "${msg}" || 
die "repoman commit failed"
+   git pull --rebase=preserve || die "git pull failed"
git push --signed || die "git push failed"
else
echo "nothing to do here"

[gentoo-commits] dev/maekke:master commit in: scripts/

2015-08-21 Thread Markus Meier 
commit: 169af14ceed55e018222f032c7ae85dd1976b76b
Author: Markus Meier maekke AT gentoo DOT org
AuthorDate: Fri Aug 21 16:43:59 2015 +
Commit: Markus Meier maekke AT gentoo DOT org
CommitDate: Fri Aug 21 16:43:59 2015 +
URL:https://gitweb.gentoo.org/dev/maekke.git/commit/?id=169af14c

fix commit message for stabilization

Signed-off-by: Markus Meier maekke AT gentoo.org

 scripts/keyword.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/keyword.sh b/scripts/keyword.sh
index bc64786..e18f3a5 100755
--- a/scripts/keyword.sh
+++ b/scripts/keyword.sh
@@ -82,7 +82,7 @@ for pkg in ${pkgs} ; do
if [[ ${arches:0:1} == ~ ]] ; then
msg=${cpn}: add ${arches// //}
else
-   msg=${cpn} ${tmparches// //} stable
+   msg=${cpn}: ${tmparches// //} stable
fi
[[ ${bugid} != 0 ]]  msg=${msg}, bug #${bugid}

[gentoo-commits] dev/maekke:master commit in: scripts/

2015-08-19 Thread Markus Meier 
commit: 70989003ffd70e95ff818a78baf8a1d9ac7af2fb
Author: Markus Meier maekke AT gentoo DOT org
AuthorDate: Wed Aug 19 17:09:10 2015 +
Commit: Markus Meier maekke AT gentoo DOT org
CommitDate: Wed Aug 19 17:09:10 2015 +
URL:https://gitweb.gentoo.org/dev/maekke.git/commit/?id=70989003

scripts: update keywording script to work with gentoo git repo

Signed-off-by: Markus Meier maekke AT gentoo.org

 scripts/keyword.sh | 15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/scripts/keyword.sh b/scripts/keyword.sh
index 912bba7..bc64786 100755
--- a/scripts/keyword.sh
+++ b/scripts/keyword.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # by {maekke,opfer}@gentoo.org
 
-REPODIR=${HOME}/cvs/gentoo-x86
+REPODIR=${HOME}/cvs/gentoo
 BUGZ_USER=mae...@gentoo.org
 BUGZ=bugz
 BUGZ_DEFAULT_OPTS=--base https://bugs.gentoo.org/xmlrpc.cgi --user 
${BUGZ_USER}
@@ -60,13 +60,13 @@ for pkg in ${pkgs} ; do
[[ ${qatom#}  2 ]]  die invalid atom ${pkg}
category=${qatom[0]/=}
pn=${qatom[1]}
+   cpn=${category}/${pn}
version=${qatom[2]}
revision=${qatom[3]}
[[ -n ${revision} ]]  version=${version}-${revision}
 
-   cd ${REPODIR}/${category}/${pn} || die package ${category}/${pn} not 
found
-   cvs up -C || die cvs up failed
-   find . -name '.#*' -delete || die removing .#* failed
+   cd ${REPODIR}/${cpn} || die package ${cpn} not found
+   git pull --rebase=preserve || die git pull failed
[[ -e ${pn}-${version}.ebuild ]] || die ebuild (${pn}-${version}) not 
found
repoman full --include-arches ${arches//\~/} || die repoman full 
failed on non-modified tree
 
@@ -80,9 +80,9 @@ for pkg in ${pkgs} ; do
 
# commit message
if [[ ${arches:0:1} == ~ ]] ; then
-   msg=add ${arches// //}
+   msg=${cpn}: add ${arches// //}
else
-   msg=${tmparches// //} stable
+   msg=${cpn} ${tmparches// //} stable
fi
[[ ${bugid} != 0 ]]  msg=${msg}, bug #${bugid}
 
@@ -90,9 +90,8 @@ for pkg in ${pkgs} ; do
ekeyword ${tmparches} ${pn}-${version}.ebuild || die ebuild 
not found
repoman manifest || die repoman manifest failed
repoman full --include-arches ${arches//\~/} || die repoman 
full failed on modified tree
-   echangelog ${msg} || die echangelog failed
-   repoman manifest || die repoman manifest failed
repoman commit --include-arches ${arches//\~/} -m ${msg} || 
die repoman commit failed
+   git push --signed || die git push failed
else
echo nothing to do here
fi

[gentoo-commits] dev/maekke:master commit in: scripts/

2015-08-18 Thread Markus Meier 
commit: 3da0a3aa5b75c5baeb049cdfa88b7dc7dcb673d2
Author: Markus Meier maekke AT gentoo DOT org
AuthorDate: Tue Aug 18 20:20:05 2015 +
Commit: Markus Meier maekke AT gentoo DOT org
CommitDate: Tue Aug 18 20:20:05 2015 +
URL:https://gitweb.gentoo.org/dev/maekke.git/commit/?id=3da0a3aa

update to git gentoo repo

Signed-off-by: Markus Meier maekke AT gentoo.org

 scripts/diff-gentoo-x86.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/diff-gentoo-x86.sh b/scripts/diff-gentoo-x86.sh
index 5bb21bc..8cb4e96 100755
--- a/scripts/diff-gentoo-x86.sh
+++ b/scripts/diff-gentoo-x86.sh
@@ -1,14 +1,14 @@
 #!/bin/sh
 
-CVS_DIR=${HOME}/cvs/gentoo-x86
+GENTOO=${HOME}/cvs/gentoo
 OVERLAY=${HOME}/cvs/maekke
 
 pushd ${OVERLAY}  /dev/null
 
 for pkg in *-*/* ; do
-   if [[ -d ${CVS_DIR}/${pkg} ]] ; then
+   if [[ -d ${GENTOO}/${pkg} ]] ; then
echo  ${pkg}
-   diff -ru -x CVS -x ChangeLog -x Manifest -I ^# \$Header: 
${CVS_DIR}/${pkg} ${pkg}
+   diff -ru -x Manifest ${GENTOO}/${pkg} ${pkg}
fi
 done

[gentoo-commits] dev/maekke:master commit in: scripts/

2015-08-18 Thread Markus Meier 
commit: e98540362a3aad55e0b3f0e64c76622334ebfd89
Author: Markus Meier maekke AT gentoo DOT org
AuthorDate: Tue Aug 18 20:20:46 2015 +
Commit: Markus Meier maekke AT gentoo DOT org
CommitDate: Tue Aug 18 20:20:46 2015 +
URL:https://gitweb.gentoo.org/dev/maekke.git/commit/?id=e9854036

update to git gentoo repo

Signed-off-by: Markus Meier maekke AT gentoo.org

 scripts/rdep | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/rdep b/scripts/rdep
index b2f9014..14c6f99 100755
--- a/scripts/rdep
+++ b/scripts/rdep
@@ -4,7 +4,7 @@
 # (with USE-dep syntax) out, so your arch-testing tool
 # can emerge them.
 
-REPODIR=${HOME}/cvs/gentoo-x86
+REPODIR=${HOME}/cvs/gentoo
 BASE_URL=http://qa-reports.gentoo.org/output/genrdeps/dindex/;
 
 if [[ $# -ne 2 ]]; then

[gentoo-commits] dev/maekke:master commit in: scripts/

2015-01-21 Thread Markus Meier 
commit: 374c0af14586f5d693463f1b9cc61636777cc322
Author: Markus Meier maekke AT gentoo DOT org
AuthorDate: Wed Jan 21 16:34:49 2015 +
Commit: Markus Meier maekke AT gentoo DOT org
CommitDate: Wed Jan 21 16:34:49 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=374c0af1

update assigned-to field name of pybugz/bugzilla output

---
 scripts/keyword.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/keyword.sh b/scripts/keyword.sh
index 3d96ed8..912bba7 100755
--- a/scripts/keyword.sh
+++ b/scripts/keyword.sh
@@ -107,7 +107,7 @@ fi
 tmpfile=$(mktemp)
 ${BUGZ} ${BUGZ_DEFAULT_OPTS} get ${bugid}  ${tmpfile}
 aliases=$(grep ^CC ${tmpfile} | awk '{ print $3 }')
-assignee=$(grep ^Assignee ${tmpfile} | awk '{ print $3 }')
+assignee=$(grep ^AssignedTo ${tmpfile} | awk '{ print $3 }')
 rm ${tmpfile}
 
 [[ -z ${assignee} ]]  die problem with bugz: assignee empty

[gentoo-commits] dev/maekke:master commit in: scripts/

2014-10-04 Thread Markus Meier 
commit: 77006a2b4eb2d57286756af22a3fc7b6ab01264a
Author: Markus Meier maekke AT gentoo DOT org
AuthorDate: Sat Oct  4 10:37:05 2014 +
Commit: Markus Meier maekke AT gentoo DOT org
CommitDate: Sat Oct  4 10:37:05 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=77006a2b

ignore cvs header

---
 scripts/diff-gentoo-x86.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/diff-gentoo-x86.sh b/scripts/diff-gentoo-x86.sh
index 8ec6452..5bb21bc 100755
--- a/scripts/diff-gentoo-x86.sh
+++ b/scripts/diff-gentoo-x86.sh
@@ -8,7 +8,7 @@ pushd ${OVERLAY}  /dev/null
 for pkg in *-*/* ; do
if [[ -d ${CVS_DIR}/${pkg} ]] ; then
echo  ${pkg}
-   diff -ru -x CVS -x ChangeLog -x Manifest ${CVS_DIR}/${pkg} 
${pkg}
+   diff -ru -x CVS -x ChangeLog -x Manifest -I ^# \$Header: 
${CVS_DIR}/${pkg} ${pkg}
fi
 done

[gentoo-commits] dev/maekke:master commit in: scripts/

2014-07-17 Thread Markus Meier 
commit: 98b9ccb2166a1278d5d211272626cb12326ab677
Author: Markus Meier maekke AT gentoo DOT org
AuthorDate: Thu Jul 17 18:06:28 2014 +
Commit: Markus Meier maekke AT gentoo DOT org
CommitDate: Thu Jul 17 18:06:28 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=98b9ccb2

show wget exit status

---
 scripts/rdep | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/rdep b/scripts/rdep
index 6157d8c..b2f9014 100755
--- a/scripts/rdep
+++ b/scripts/rdep
@@ -43,8 +43,9 @@ fi
 
 tmp=$(mktemp)
 wget -o /dev/null -O ${tmp} ${BASE_URL}/${pkg}
-if [[ $? -ne 0 ]] ; then
-   echo failed to fetch reverse deps
+res=$?
+if [[ ${res} -ne 0 ]] ; then
+   echo failed to fetch reverse deps (wget returned ${res})
rm ${tmp}
exit 1
 fi

[gentoo-commits] dev/maekke:master commit in: scripts/

2014-06-19 Thread Markus Meier 
commit: 3fe0defe8bd78b8be333a2a8453771cc29738a82
Author: Markus Meier maekke AT gentoo DOT org
AuthorDate: Thu Jun 19 18:54:24 2014 +
Commit: Markus Meier maekke AT gentoo DOT org
CommitDate: Thu Jun 19 18:54:24 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=3fe0defe

add script to diff overlay to gentoo-x86

---
 scripts/diff-gentoo-x86.sh | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/scripts/diff-gentoo-x86.sh b/scripts/diff-gentoo-x86.sh
new file mode 100755
index 000..8ec6452
--- /dev/null
+++ b/scripts/diff-gentoo-x86.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+CVS_DIR=${HOME}/cvs/gentoo-x86
+OVERLAY=${HOME}/cvs/maekke
+
+pushd ${OVERLAY}  /dev/null
+
+for pkg in *-*/* ; do
+   if [[ -d ${CVS_DIR}/${pkg} ]] ; then
+   echo  ${pkg}
+   diff -ru -x CVS -x ChangeLog -x Manifest ${CVS_DIR}/${pkg} 
${pkg}
+   fi
+done
+
+popd  /dev/null

[gentoo-commits] dev/maekke:master commit in: scripts/, /

2014-06-19 Thread Markus Meier 
commit: ff789b04838a22da75ec5510ba38c0f7ebeffbef
Author: Markus Meier maekke AT gentoo DOT org
AuthorDate: Thu Jun 19 19:45:43 2014 +
Commit: Markus Meier maekke AT gentoo DOT org
CommitDate: Thu Jun 19 19:45:43 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=ff789b04

merge .gitignore files

---
 .gitignore | 1 +
 scripts/.gitignore | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index a01ee28..a86a8d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .*.swp
+*.txt

diff --git a/scripts/.gitignore b/scripts/.gitignore
deleted file mode 100644
index 2211df6..000
--- a/scripts/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.txt

[gentoo-commits] dev/maekke:master commit in: scripts/

2014-06-01 Thread Markus Meier 
commit: 427435c8b5fc25f8510fcad576ff46fa3737e21d
Author: Markus Meier maekke AT gentoo DOT org
AuthorDate: Sun Jun  1 16:09:38 2014 +
Commit: Markus Meier maekke AT gentoo DOT org
CommitDate: Sun Jun  1 16:09:38 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=427435c8

fix getPackages param

---
 scripts/check-subslot-deps.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/check-subslot-deps.py b/scripts/check-subslot-deps.py
index 6a0984e..9250286 100755
--- a/scripts/check-subslot-deps.py
+++ b/scripts/check-subslot-deps.py
@@ -65,7 +65,9 @@ class CheckSubSlot:
m = re.search(:[0-9]*?=, pkg)
return m is not None
 
-   def getPackages(self, trees=[/usr/portage], categories=None):
+   def getPackages(self, trees=None, categories=None):
+   if trees is None:
+   trees = [/usr/portage]
return self.dbapi.cp_all(categories=categories, trees=trees)
 
def getPackageVersions(self, cp):

[gentoo-commits] dev/maekke:master commit in: scripts/

2014-06-01 Thread Markus Meier 
commit: c37580cd2ae38a5995a28a4e20f1867fb47d594a
Author: Markus Meier maekke AT gentoo DOT org
AuthorDate: Sun Jun  1 16:16:55 2014 +
Commit: Markus Meier maekke AT gentoo DOT org
CommitDate: Sun Jun  1 16:16:55 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=c37580cd

replace subslotted-packages.sh with a python version

---
 scripts/subslotted-packages.py | 15 +++
 scripts/subslotted-packages.sh | 16 
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/scripts/subslotted-packages.py b/scripts/subslotted-packages.py
new file mode 100755
index 000..7d660cd
--- /dev/null
+++ b/scripts/subslotted-packages.py
@@ -0,0 +1,15 @@
+#!/usr/bin/python
+
+from portage.dbapi.porttree import portdbapi
+import subprocess
+
+TREE = /usr/portage/
+
+dbapi = portdbapi()
+pkgs = dbapi.cp_all(categories=None, trees=[TREE])
+
+for pkg in pkgs:
+   res = subprocess.call(egrep -q \SLOT=\\\?[0-9]*\/\ %s/%s/*.ebuild 
% (TREE, pkg), shell=True)
+   if res == 0:
+   print(%s % pkg)
+

diff --git a/scripts/subslotted-packages.sh b/scripts/subslotted-packages.sh
deleted file mode 100755
index c34ced2..000
--- a/scripts/subslotted-packages.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# find packages with subslots
-
-PORTDIR=${HOME}/cvs/gentoo-x86
-
-pushd ${PORTDIR}  /dev/null
-
-for pkg in $(find . -mindepth 2 -maxdepth 2 -type d | sort) ; do
-   pushd ${pkg}  /dev/null
-   if [[ -n $(find . -name '*.ebuild') ]] ; then
-   [[ -n $(egrep SLOT=\?[0-9]*\/ *.ebuild) ]]  echo 
${pkg/\.\//}
-   fi
-   popd  /dev/null # ${pkg}
-done
-
-popd  /dev/null # ${PORTDIR}

[gentoo-commits] dev/maekke:master commit in: scripts/

2014-06-01 Thread Markus Meier 
commit: 7b8a518d7d5a87745e433b10ab307bead836dc4a
Author: Markus Meier maekke AT gentoo DOT org
AuthorDate: Sun Jun  1 16:10:10 2014 +
Commit: Markus Meier maekke AT gentoo DOT org
CommitDate: Sun Jun  1 16:10:10 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=7b8a518d

ignore all .txt files

---
 scripts/.gitignore | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/.gitignore b/scripts/.gitignore
index 06bb02a..2211df6 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -1,2 +1 @@
-subslotted-packages.txt
-missing-subslot.txt
+*.txt