################################################################################
-import os, pg, sys, time, errno, fcntl, tempfile, pwd
+import os, pg, sys, time, errno, fcntl, tempfile, pwd, re
import apt_pkg
import daklib.database
import daklib.utils
Options = None
projectB = None
+re_broken_package = re.compile(r"[a-zA-Z]\w+\s+\-.*")
+
################################################################################
#####################################
if type(t[key]) != list:
print "ERROR: Unknown type %s for packages in transition %s." % (type(t[key]), test)
failure = True
-
try:
for package in t["packages"]:
if type(package) != str:
print "ERROR: Packages list contains invalid type %s (as %s) in transition %s" % (type(package), package, test)
failure = True
+ if re_broken_package.match(package):
+ # Someone had a space too much (or not enough), we have something looking like
+ # "package1 - package2" now.
+ print "ERROR: Invalid indentation of package list in transition %s, around package(s): %s" % (test, package)
+ failure = True
except TypeError:
# In case someone has an empty packages list
print "ERROR: No packages defined in transition %s" % (test)
"""We have a file we think is valid; if we're using sudo, we invoke it
here, otherwise we just parse the file and call write_transitions"""
+ # Lets check if from_file is in the directory we expect it to be in
+ if not os.path.abspath(from_file).startswith(Cnf["Transitions::TempPath"]):
+ print "Will not accept transitions file outside of %s" % (Cnf["Transitions::TempPath"])
+ sys.exit(3)
+
if Options["sudo"]:
os.spawnl(os.P_WAIT, "/usr/bin/sudo", "/usr/bin/sudo", "-u", "dak", "-H",
"/usr/local/bin/dak", "transitions", "--import", from_file)
# We need the chmod, as the file is (most possibly) copied from a
# sudo-ed script and would be unreadable if it has default mkstemp mode
- (fd, path) = tempfile.mkstemp("","transitions")
+ (fd, path) = tempfile.mkstemp("", "transitions", Cnf["Transitions::TempPath"])
os.chmod(path, 0644)
f = open(path, "w")
syck.dump(transitions, f)
daklib.utils.warn("ReleaseTransitions file, %s, not found." %
(Cnf["Dinstall::Reject::ReleaseTransitions"]))
sys.exit(1)
+ # Also check if our temp directory is defined and existant
+ temppath = Cnf.get("Transitions::TempPath", "")
+ if temppath == "":
+ daklib.utils.warn("Transitions::TempPath not defined")
+ sys.exit(1)
+ if not os.path.exists(temppath):
+ daklib.utils.warn("Temporary path %s not found." %
+ (Cnf["Transitions::TempPath"]))
+ sys.exit(1)
if Options["import"]:
try: