Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 110443
Collapse All | Expand All

(-)bin/repoman (-1 / +34 lines)
Lines 104-109 Link Here
104
"--commitmsg"      : "Adds a commit message via the command line",
104
"--commitmsg"      : "Adds a commit message via the command line",
105
"--commitmsgfile"  : "Adds a commit message from the specified file",
105
"--commitmsgfile"  : "Adds a commit message from the specified file",
106
"--help"           : "Show this screen",
106
"--help"           : "Show this screen",
107
"--force"          : "Force commit to proceed, regardless of QA issues",
107
"--ignore-arches"  : "Ignore arch-specific failures (where arch != host)",
108
"--ignore-arches"  : "Ignore arch-specific failures (where arch != host)",
108
"--ignore-masked"  : "Ignore masked packages (not allowed with commit mode)",
109
"--ignore-masked"  : "Ignore masked packages (not allowed with commit mode)",
109
"--pretend"        : "Don't commit or fix anything; just show what would be done",
110
"--pretend"        : "Don't commit or fix anything; just show what would be done",
Lines 148-153 Link Here
148
	"file.name":"File/dir name must be composed of only the following chars: %s " % allowed_filename_chars,
149
	"file.name":"File/dir name must be composed of only the following chars: %s " % allowed_filename_chars,
149
	"file.UTF8":"File is not UTF8 compliant",
150
	"file.UTF8":"File is not UTF8 compliant",
150
	"KEYWORDS.missing":"Ebuilds that have a missing or empty KEYWORDS variable",
151
	"KEYWORDS.missing":"Ebuilds that have a missing or empty KEYWORDS variable",
152
	"KEYWORDS.stable":"Ebuilds that have been added directly with stable KEYWORDS",
151
	"KEYWORDS.stupid":"Ebuilds that use KEYWORDS=-* instead of package.mask", 
153
	"KEYWORDS.stupid":"Ebuilds that use KEYWORDS=-* instead of package.mask", 
152
	"LICENSE.missing":"Ebuilds that have a missing or empty LICENSE variable",
154
	"LICENSE.missing":"Ebuilds that have a missing or empty LICENSE variable",
153
	"DESCRIPTION.missing":"Ebuilds that have a missing or empty DESCRIPTION variable",
155
	"DESCRIPTION.missing":"Ebuilds that have a missing or empty DESCRIPTION variable",
Lines 779-784 Link Here
779
elif quiet < 1:
781
elif quiet < 1:
780
	print green("\nRepoMan scours the neighborhood...")
782
	print green("\nRepoMan scours the neighborhood...")
781
783
784
new_ebuilds = set()
785
if isCvs:
786
	mycvstree = cvstree.getentries("./", recursive=1)
787
	mynew = cvstree.findnew(mycvstree, recursive=1, basedir="./")
788
	new_ebuilds.update(x for x in mynew if x.endswith(".ebuild"))
789
	del mycvstree, mynew
790
782
dofail = 0
791
dofail = 0
783
arch_caches={}
792
arch_caches={}
784
arch_xmatch_caches = {}
793
arch_xmatch_caches = {}
Lines 1097-1102 Link Here
1097
				stats[myqakey]=stats[myqakey]+1
1106
				stats[myqakey]=stats[myqakey]+1
1098
				fails[myqakey].append(x+"/"+y+".ebuild")
1107
				fails[myqakey].append(x+"/"+y+".ebuild")
1099
1108
1109
		keywords = myaux["KEYWORDS"].split()
1110
		stable_keywords = []
1111
		for keyword in keywords:
1112
			if not keyword.startswith("~") and \
1113
				not keyword.startswith("-"):
1114
				stable_keywords.append(keyword)
1115
		if stable_keywords:
1116
			ebuild_path = y + ".ebuild"
1117
			if repolevel < 3:
1118
				ebuild_path = os.path.join(pkgdir, ebuild_path)
1119
			if repolevel < 2:
1120
				ebuild_path = os.path.join(catdir, ebuild_path)
1121
			ebuild_path = os.path.join(".", ebuild_path)
1122
			if ebuild_path in new_ebuilds:
1123
				stable_keywords.sort()
1124
				stats["KEYWORDS.stable"] += 1
1125
				fails["KEYWORDS.stable"].append(
1126
					x + "/" + y + ".ebuild added with stable keywords: %s" % \
1127
						" ".join(stable_keywords))
1128
1100
		# KEYWORDS="-*" is a stupid replacement for package.mask and screws general KEYWORDS semantics
1129
		# KEYWORDS="-*" is a stupid replacement for package.mask and screws general KEYWORDS semantics
1101
		if "-*" in myaux["KEYWORDS"].split():
1130
		if "-*" in myaux["KEYWORDS"].split():
1102
			haskeyword = False
1131
			haskeyword = False
Lines 1549-1555 Link Here
1549
	if quiet < 1:
1578
	if quiet < 1:
1550
		print
1579
		print
1551
else:
1580
else:
1552
	if dofail:
1581
	if dofail and "--force" in myoptions and "--pretend" not in myoptions:
1582
		print green("RepoMan sez:") + \
1583
			" \"You want commit even with these QA issues?\n" + \
1584
			"              I'll take it this time, but I'm not happy.\"\n"
1585
	elif dofail:
1553
		print turquoise("Please fix these important QA issues first.")
1586
		print turquoise("Please fix these important QA issues first.")
1554
		print green("RepoMan sez:"),"\"Make your QA payment on time and you'll never see the likes of me.\"\n"
1587
		print green("RepoMan sez:"),"\"Make your QA payment on time and you'll never see the likes of me.\"\n"
1555
		sys.exit(1)
1588
		sys.exit(1)

Return to bug 110443