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

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

[Markus Meier]

commit:     cda67f47e3460d13d30e8850f25fd9c3ee9d3777
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  9 12:40:20 2011 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sat Apr  9 12:40:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=cda67f47

be compatible with pybugz 0.9

---
 scripts/keyword.sh |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/scripts/keyword.sh b/scripts/keyword.sh
index 016cdba..8f34f83 100755
--- a/scripts/keyword.sh
+++ b/scripts/keyword.sh
@@ -4,6 +4,7 @@
 REPODIR="${HOME}/cvs/gentoo-x86"
 BUGZ_USER="maekke@gentoo.org"
 BUGZ="bugz"
+BUGZ_DEFAULT_OPTS="--base https://bugs.gentoo.org --user ${BUGZ_USER}"
 
 die() {
 	echo $@
@@ -104,7 +105,7 @@ fi
 [[ ${bugid} == 0 ]] && echo "done, as bug# is 0" && exit 0
 
 tmpfile="$(mktemp)"
-${BUGZ} get --base=https://bugs.gentoo.org ${bugid} > ${tmpfile}
+${BUGZ} ${BUGZ_DEFAULT_OPTS} get ${bugid} > ${tmpfile}
 aliases="$(grep ^CC ${tmpfile} | awk '{ print $3 }')"
 assignee="$(grep ^Assignee ${tmpfile} | awk '{ print $3 }')"
 rm ${tmpfile}
@@ -128,9 +129,9 @@ for bugarch in ${bugarches} ; do
 	[[ ${found} == 0 ]] && lastarch="0"
 done
 
-bugz_options="--base="https://bugs.gentoo.org" --user=${BUGZ_USER}"
+bugz_options=""
 for arch in ${arches} ; do
-	bugz_options="${bugz_options} --remove-cc=${arch}@gentoo.org"
+	bugz_options="${bugz_options} --remove-cc ${arch}@gentoo.org"
 done
 
 if [[ ${lastarch} == "1" ]] ; then
@@ -140,6 +141,7 @@ else
 	[[ -z ${bugz_message} ]] && bugz_message="${arches// //} stable"
 fi
 
-echo "running ${BUGZ} modify ${bugid} ${bugz_options} --comment=\"${bugz_message}\""
-${BUGZ} modify ${bugid} ${bugz_options} --comment="${bugz_message}" || die "bugz failed"
+echo "not running ${BUGZ} atm..."
+echo "running ${BUGZ} ${BUGZ_DEFAULT_OPTS} modify ${bugid} ${bugz_options} --comment \"${bugz_message}\""
+${BUGZ} ${BUGZ_DEFAULT_OPTS} modify ${bugid} ${bugz_options} --comment "${bugz_message}" || die "bugz failed"
 echo ">>> finished successfully"

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

[Markus Meier]

commit:     e12610188368601f75d6bff80682384fd5dd87f7
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 20:45:22 2011 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 20:45:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=e1261018

add support for unstable arch specific rdeps

---
 scripts/rdep |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/rdep b/scripts/rdep
index 38cbd18..936176a 100755
--- a/scripts/rdep
+++ b/scripts/rdep
@@ -29,7 +29,7 @@ if [[ ! -x $(which q) ]] ; then
 	exit 1
 fi
 
-if [[ $(egrep "\<${arch}\>" ${REPODIR}/profiles/arch.list | wc -l) == 0 ]]; then
+if [[ $(egrep "\<${arch/\~/}\>" ${REPODIR}/profiles/arch.list | wc -l) == 0 ]]; then
 	echo "invalid arch ${arch}"
 	exit 1
 fi
@@ -68,7 +68,9 @@ for p in $(grep -v '^[B]' ${tmp} | sort -r); do
 	# make sure that the file exists, as the local or remote tree
 	# may be out of date
 	ebuild="${REPODIR}/${category}/${pn}/${pn}-${version}.ebuild"
-	if [[ -e ${ebuild} && $(egrep -H "KEYWORDS=.*( |\")\<${arch}\>" \
+	[[ "${arch}" != "${arch/\~/}" ]] && expr="KEYWORDS=.*\<${arch/\~/}\>" \
+		|| expr="KEYWORDS=.*( |\")\<${arch}\>"
+	if [[ -e ${ebuild} && $(egrep -H "${expr}" \
 			${ebuild} | wc -l) == 1 ]]; then
 		if [[ ${last_pn} != ${category}/${pn} ]]; then
 			[[ -z ${use} ]] && echo "=${cpv}" || echo "=${cpv}[${use}]"

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

[Markus Meier]

commit:     3f71519f4356d25056ba07675b6130156f02fe2d
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 20:53:06 2011 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 20:53:06 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=3f71519f

remove wrong output

---
 scripts/keyword.sh |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/scripts/keyword.sh b/scripts/keyword.sh
index 8f34f83..2ac886d 100755
--- a/scripts/keyword.sh
+++ b/scripts/keyword.sh
@@ -141,7 +141,6 @@ else
 	[[ -z ${bugz_message} ]] && bugz_message="${arches// //} stable"
 fi
 
-echo "not running ${BUGZ} atm..."
 echo "running ${BUGZ} ${BUGZ_DEFAULT_OPTS} modify ${bugid} ${bugz_options} --comment \"${bugz_message}\""
 ${BUGZ} ${BUGZ_DEFAULT_OPTS} modify ${bugid} ${bugz_options} --comment "${bugz_message}" || die "bugz failed"
 echo ">>> finished successfully"

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

[Markus Meier]

commit:     99f831322ceee439ea2ffc6b5d278ea013958847
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  8 12:10:57 2011 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sat Oct  8 12:10:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=99f83132

use slots instead of versions (right now it's quite slow because of portageq usage for reading SLOT from metadata)

---
 scripts/rdep |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/rdep b/scripts/rdep
index 936176a..8013181 100755
--- a/scripts/rdep
+++ b/scripts/rdep
@@ -42,9 +42,8 @@ tmp="$(mktemp)"
 wget -o /dev/null -O "${tmp}" "${BASE_URL}/${pkg}"
 
 last_pn=""
-# we sort it reverse, that we have the latest version in most cases the first and
-# not print the "older ones". this has some room for improvement
-for p in $(grep -v '^[B]' ${tmp} | sort -r); do
+
+for p in $(grep -v '^[B]' ${tmp}); do
 	cpv="${p/:*/}"
 	use="${p/*:/}"
 	[[ ${use} == ${p} ]] && use=""
@@ -72,10 +71,11 @@ for p in $(grep -v '^[B]' ${tmp} | sort -r); do
 		|| expr="KEYWORDS=.*( |\")\<${arch}\>"
 	if [[ -e ${ebuild} && $(egrep -H "${expr}" \
 			${ebuild} | wc -l) == 1 ]]; then
-		if [[ ${last_pn} != ${category}/${pn} ]]; then
-			[[ -z ${use} ]] && echo "=${cpv}" || echo "=${cpv}[${use}]"
+		slot=$(portageq metadata / ebuild ${cpv} SLOT)
+		if [[ ${last_pn} != ${category}/${pn}:${slot} ]]; then
+			[[ -z ${use} ]] && echo "=${category}/${pn}:${slot}" || echo "=${category}/${pn}:${slot}[${use}]"
 		fi
-		last_pn="${category}/${pn}"
+		last_pn="${category}/${pn}:${slot}"
 	fi
 done
 rm "${tmp}"

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

[Markus Meier]

commit:     0143ad6398e2c037dd757c8609ea97509eed358e
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  8 23:05:00 2011 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sat Oct  8 23:05:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=0143ad63

remove leading = from package output

---
 scripts/rdep |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/rdep b/scripts/rdep
index 8013181..cc66630 100755
--- a/scripts/rdep
+++ b/scripts/rdep
@@ -73,7 +73,7 @@ for p in $(grep -v '^[B]' ${tmp}); do
 			${ebuild} | wc -l) == 1 ]]; then
 		slot=$(portageq metadata / ebuild ${cpv} SLOT)
 		if [[ ${last_pn} != ${category}/${pn}:${slot} ]]; then
-			[[ -z ${use} ]] && echo "=${category}/${pn}:${slot}" || echo "=${category}/${pn}:${slot}[${use}]"
+			[[ -z ${use} ]] && echo "${category}/${pn}:${slot}" || echo "${category}/${pn}:${slot}[${use}]"
 		fi
 		last_pn="${category}/${pn}:${slot}"
 	fi

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

[Markus Meier]

commit:     49d0de17cb97fe8b15e40a254a792d5d65c52026
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  8 23:25:20 2011 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sat Oct  8 23:25:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=49d0de17

strip the pkg argument (leading = and version numbers)

---
 scripts/rdep |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/scripts/rdep b/scripts/rdep
index cc66630..bf0688f 100755
--- a/scripts/rdep
+++ b/scripts/rdep
@@ -17,6 +17,8 @@ fi
 
 arch="${1}"
 pkg="${2}"
+pkg="${pkg/=/}"
+pkg="${pkg/-[0-9]*/}"
 
 if [[ ! -d ${REPODIR} ]]; then
 	echo "your \${REPODIR}='${REPODIR}' does not exist."
@@ -35,7 +37,8 @@ if [[ $(egrep "\<${arch/\~/}\>" ${REPODIR}/profiles/arch.list | wc -l) == 0 ]];
 fi
 
 if [[ ! -d ${REPODIR}/${pkg} ]]; then
-	echo "invalid package ${pkg} - do not use a version-number"
+	echo "package ${pkg} not found"
+	exit 1
 fi
 
 tmp="$(mktemp)"

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

[Markus Meier]

commit:     c2495a8d1603d5de8bbedb2cd27267ac1e083df9
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  8 23:32:16 2011 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sat Oct  8 23:32:16 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=c2495a8d

replace all negative use flags

---
 scripts/rdep |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/rdep b/scripts/rdep
index bf0688f..f7380b2 100755
--- a/scripts/rdep
+++ b/scripts/rdep
@@ -53,7 +53,7 @@ for p in $(grep -v '^[B]' ${tmp}); do
 	# negative use deps are !use and no -use
 	# multiple use-deps are separated by '+'
 	if [[ -n ${use} ]]; then
-		use="${use/!/-}"
+		use="${use//!/-}"
 		use="${use//+/,}"
 	fi
 

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

[Markus Meier]

commit:     33f53c6f1bb9f9b8c69a44a5b563f58b305ce753
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  8 23:58:04 2011 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sat Oct  8 23:58:04 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=33f53c6f

use qa-reports.g.o instead of tinderbox.g.o

---
 scripts/rdep |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/rdep b/scripts/rdep
index f7380b2..a11c1f0 100755
--- a/scripts/rdep
+++ b/scripts/rdep
@@ -5,7 +5,7 @@
 # can emerge them.
 
 REPODIR="${HOME}/cvs/gentoo-x86"
-BASE_URL="http://tinderbox.dev.gentoo.org/misc/dindex/"
+BASE_URL="http://qa-reports.gentoo.org/output/genrdeps/dindex/"
 
 if [[ $# -ne 2 ]]; then
 	echo "usage:"

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

[Markus Meier]

commit:     4da603f479892c83976768282f5875738da6beb8
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 15 12:40:20 2011 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sat Oct 15 12:40:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=4da603f4

check wget exit status when fetching reverse deps

---
 scripts/rdep |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/scripts/rdep b/scripts/rdep
index a11c1f0..db11e80 100755
--- a/scripts/rdep
+++ b/scripts/rdep
@@ -43,6 +43,11 @@ fi
 
 tmp="$(mktemp)"
 wget -o /dev/null -O "${tmp}" "${BASE_URL}/${pkg}"
+if [[ $? -ne 0 ]] ; then
+	echo "failed to fetch reverse deps"
+	rm "${tmp}"
+	exit 1
+fi
 
 last_pn=""
 

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

[Markus Meier]

commit:     bc0aa53a89642fc82efbfdba7f9467ae25c2b835
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sat May 26 10:08:32 2012 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sat May 26 10:08:32 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=bc0aa53a

use mlrpc.cgi for pybugz-10 compat

---
 scripts/keyword.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/keyword.sh b/scripts/keyword.sh
index 2ac886d..1ed5036 100755
--- a/scripts/keyword.sh
+++ b/scripts/keyword.sh
@@ -4,7 +4,7 @@
 REPODIR="${HOME}/cvs/gentoo-x86"
 BUGZ_USER="maekke@gentoo.org"
 BUGZ="bugz"
-BUGZ_DEFAULT_OPTS="--base https://bugs.gentoo.org --user ${BUGZ_USER}"
+BUGZ_DEFAULT_OPTS="--base https://bugs.gentoo.org/xmlrpc.cgi --user ${BUGZ_USER}"
 
 die() {
 	echo $@

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

[Markus Meier]

commit:     f37c87f9ef1422383773ea540cfa2cc834188881
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Thu May  9 13:35:11 2013 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Thu May  9 13:35:11 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=f37c87f9

pass the --include-arches parameter to repoman to speed up the script

---
 scripts/keyword.sh |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/keyword.sh b/scripts/keyword.sh
index 1ed5036..9e556ae 100755
--- a/scripts/keyword.sh
+++ b/scripts/keyword.sh
@@ -46,6 +46,8 @@ arches="${2}"
 shift 2
 pkgs="$@"
 
+REPOMAN_OPTS="--include-arches "${arches//\~/}""
+
 # check if arches are sane
 for arch in ${arches} ; do
 	[[ $(egrep "\<${arch/\~/}\>" ${REPODIR}/profiles/arch.list | wc -l) == 0 ]] && die "invalid arch (${arch})"
@@ -68,7 +70,7 @@ for pkg in ${pkgs} ; do
 	cvs up -C || die "cvs up failed"
 	find . -name '.#*' -delete || die "removing .#* failed"
 	[[ -e ${pn}-${version}.ebuild ]] || die "ebuild (${pn}-${version}) not found"
-	repoman full || die "repoman full failed on non-modified tree"
+	repoman full \${REPOMAN_OPTS} || die "repoman full failed on non-modified tree"
 
 	# detect which arches to commit (the ones w/o stable)
 	tmparches=""
@@ -89,10 +91,10 @@ for pkg in ${pkgs} ; do
 	if [[ -n ${tmparches} ]] ; then
 		ekeyword ${tmparches} ${pn}-${version}.ebuild || die "ebuild not found"
 		repoman manifest || die "repoman manifest failed"
-		repoman full || die "repoman full failed on modified tree"
+		repoman full \${REPOMAN_OPTS} || die "repoman full failed on modified tree"
 		echangelog "${msg}" || die "echangelog failed"
 		repoman manifest || die "repoman manifest failed"
-		repoman commit -m "${msg}" || die "repoman commit failed"
+		repoman commit \${REPOMAN_OPTS} -m "${msg}" || die "repoman commit failed"
 	else
 		echo "nothing to do here"
 	fi

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

[Markus Meier]

commit:     dc1e5e478c7035d4916d1ac2d4b3c2fcd43f9e7c
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Tue May 14 18:27:00 2013 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Tue May 14 18:27:00 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=dc1e5e47

fix --include-arches...

---
 scripts/keyword.sh |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/scripts/keyword.sh b/scripts/keyword.sh
index 9e556ae..208101c 100755
--- a/scripts/keyword.sh
+++ b/scripts/keyword.sh
@@ -46,8 +46,6 @@ arches="${2}"
 shift 2
 pkgs="$@"
 
-REPOMAN_OPTS="--include-arches "${arches//\~/}""
-
 # check if arches are sane
 for arch in ${arches} ; do
 	[[ $(egrep "\<${arch/\~/}\>" ${REPODIR}/profiles/arch.list | wc -l) == 0 ]] && die "invalid arch (${arch})"
@@ -70,7 +68,7 @@ for pkg in ${pkgs} ; do
 	cvs up -C || die "cvs up failed"
 	find . -name '.#*' -delete || die "removing .#* failed"
 	[[ -e ${pn}-${version}.ebuild ]] || die "ebuild (${pn}-${version}) not found"
-	repoman full \${REPOMAN_OPTS} || die "repoman full failed on non-modified tree"
+	repoman full --include-arches "${arches//\~/}" || die "repoman full failed on non-modified tree"
 
 	# detect which arches to commit (the ones w/o stable)
 	tmparches=""
@@ -91,10 +89,10 @@ for pkg in ${pkgs} ; do
 	if [[ -n ${tmparches} ]] ; then
 		ekeyword ${tmparches} ${pn}-${version}.ebuild || die "ebuild not found"
 		repoman manifest || die "repoman manifest failed"
-		repoman full \${REPOMAN_OPTS} || die "repoman full failed on modified tree"
+		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 \${REPOMAN_OPTS} -m "${msg}" || die "repoman commit failed"
+		repoman commit --include-arches "${arches//\~/}" -m "${msg}" || die "repoman commit failed"
 	else
 		echo "nothing to do here"
 	fi

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

[Markus Meier]

commit:     2ea9b8798ec3d10bacaa832a42508cdb789e9d3a
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 29 22:17:33 2013 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Mon Jul 29 22:17:33 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=2ea9b879

add script to run repoman LineChecks on eclasses

---
 scripts/repoman-checks-eclass.py | 45 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/scripts/repoman-checks-eclass.py b/scripts/repoman-checks-eclass.py
new file mode 100755
index 0000000..fd8b575
--- /dev/null
+++ b/scripts/repoman-checks-eclass.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+
+import io
+import os
+import sys
+from repoman.checks import run_checks
+
+class DummyPkg:
+	def __init__(self, name):
+		self.name = name
+		self.mtime = None
+		self.eapi = 0
+		self.inherited = ''
+
+class RepoClass:
+	def __init__(self):
+		self._repodir = None
+
+	def run(self, repodir=None):
+		self._repodir = repodir
+		eclasses = self._getEclasses()
+		self._runChecks(eclasses)
+
+	def _getEclasses(self):
+		eclasses = []
+		eclassdir = os.path.join(self._repodir, 'eclass')
+		for file in os.listdir(eclassdir):
+			if file.endswith('.eclass'):
+				eclasses.append(os.path.join(eclassdir, file))
+		eclasses.sort()
+		return eclasses
+
+	def _runChecks(self, eclasses):
+		for eclass in eclasses:
+			pkg = DummyPkg(eclass)
+			f = io.open(eclass, mode='r')
+			try:
+				for check_name, e in run_checks(f, pkg):
+					if not e.startswith('valid EAPI assignment must occur on or before line'):
+						print '%s --> %s: %s' % (os.path.basename(eclass), check_name, e)
+			finally:
+				f.close()
+
+rc = RepoClass()
+rc.run(repodir=sys.argv[1])

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

[Markus Meier]

commit:     5a42f3c5b51ecd5fff18a5556935f4cfc6b9b29d
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  1 19:09:09 2013 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Tue Oct  1 19:09:09 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=5a42f3c5

do not display subslot

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

diff --git a/scripts/rdep b/scripts/rdep
index db11e80..6157d8c 100755
--- a/scripts/rdep
+++ b/scripts/rdep
@@ -80,6 +80,7 @@ for p in $(grep -v '^[B]' ${tmp}); do
 	if [[ -e ${ebuild} && $(egrep -H "${expr}" \
 			${ebuild} | wc -l) == 1 ]]; then
 		slot=$(portageq metadata / ebuild ${cpv} SLOT)
+		slot=${slot/\/*/} # kill subslot
 		if [[ ${last_pn} != ${category}/${pn}:${slot} ]]; then
 			[[ -z ${use} ]] && echo "${category}/${pn}:${slot}" || echo "${category}/${pn}:${slot}[${use}]"
 		fi

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

[Markus Meier]

commit:     515a131312ac74492adb31606c916523c4a6c6c5
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  5 19:36:34 2013 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sat Oct  5 19:36:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=515a1313

remove '=' for qatom usage as it is appended to the output (and here interpreted as revision)

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

diff --git a/scripts/keyword.sh b/scripts/keyword.sh
index 208101c..3d96ed8 100755
--- a/scripts/keyword.sh
+++ b/scripts/keyword.sh
@@ -56,7 +56,7 @@ for pkg in ${pkgs} ; do
 	pkgno=$(( ${pkgno} + 1 ))
 	echo ">>> processing: ${pkg} (${pkgno}/$#)"
 	declare -a qatom
-	qatom=($(qatom ${pkg}))
+	qatom=($(qatom ${pkg/=/}))
 	[[ ${qatom#} < 2 ]] && die "invalid atom ${pkg}"
 	category=${qatom[0]/=}
 	pn=${qatom[1]}

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

[Markus Meier]

commit:     7b8a518d7d5a87745e433b10ab307bead836dc4a
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  1 16:10:10 2014 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sun Jun  1 16:10:10 2014 +0000
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

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

[Markus Meier]

commit:     c37580cd2ae38a5995a28a4e20f1867fb47d594a
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  1 16:16:55 2014 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sun Jun  1 16:16:55 2014 +0000
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 0000000..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..0000000
--- 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/

[Markus Meier]

commit:     427435c8b5fc25f8510fcad576ff46fa3737e21d
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  1 16:09:38 2014 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sun Jun  1 16:09:38 2014 +0000
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/

[Markus Meier]

commit:     3fe0defe8bd78b8be333a2a8453771cc29738a82
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 19 18:54:24 2014 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Thu Jun 19 18:54:24 2014 +0000
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 0000000..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/

[Markus Meier]

commit:     98b9ccb2166a1278d5d211272626cb12326ab677
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 17 18:06:28 2014 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Thu Jul 17 18:06:28 2014 +0000
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/

[Markus Meier]

commit:     77006a2b4eb2d57286756af22a3fc7b6ab01264a
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  4 10:37:05 2014 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sat Oct  4 10:37:05 2014 +0000
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/

[Markus Meier]

commit:     374c0af14586f5d693463f1b9cc61636777cc322
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 21 16:34:49 2015 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Wed Jan 21 16:34:49 2015 +0000
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/

[Markus Meier]

commit:     3da0a3aa5b75c5baeb049cdfa88b7dc7dcb673d2
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 18 20:20:05 2015 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 20:20:05 2015 +0000
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/

[Markus Meier]

commit:     e98540362a3aad55e0b3f0e64c76622334ebfd89
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 18 20:20:46 2015 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 20:20:46 2015 +0000
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/

[Markus Meier]

commit:     70989003ffd70e95ff818a78baf8a1d9ac7af2fb
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 19 17:09:10 2015 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Wed Aug 19 17:09:10 2015 +0000
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="maekke@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/

[Markus Meier]

commit:     169af14ceed55e018222f032c7ae85dd1976b76b
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 21 16:43:59 2015 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Fri Aug 21 16:43:59 2015 +0000
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/

[Markus Meier]

commit:     0605a75e3a426a1245900be171ae0f69fb743c7d
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  3 08:59:01 2015 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sat Oct  3 08:59:01 2015 +0000
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 <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 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"