Kaydet (Commit) 6b73f2b5 authored tarafından Your Name's avatar Your Name

add more usefull stuff

üst a8d31caa
......@@ -45,6 +45,7 @@ def exportFlags():
os.environ['MAKEFLAGS'] = values.build.makeflags
os.environ['LD_AS_NEEDED'] = "1"
os.environ['NOCONFIGURE'] = "1"
if os.environ['INARY_BUILD_TYPE'] == "emul32":
os.environ['CC'] = "{}-gcc -m32".format(values.build.host)
os.environ['CXX'] = "{}-g++ -m32".format(values.build.host)
......
......@@ -264,10 +264,11 @@ class Install(AtomicOperation):
file_conflicts_str += _(
"\"/{0}\" from \"{1}\" package\n").format(existing_file, pkg)
msg = _('File conflicts:\n\"{}\"').format(file_conflicts_str)
if self.ignore_file_conflicts:
ctx.ui.warning(msg)
else:
raise Error(msg)
ctx.ui.warning(msg)
if not self.ignore_file_conflicts:
if not ctx.ui.confirm(
_('Do you want to overwrite it?')):
raise Error(msg)
def check_operation(self):
......@@ -653,7 +654,7 @@ class Remove(AtomicOperation):
self.package), push_screen=False)
if not self.installdb.has_package(self.package_name):
raise Exception(_('Trying to remove nonexistent package ')
ctx.ui.status(_('Trying to remove nonexistent package ')
+ self.package_name)
self.check_dependencies()
......
......@@ -341,6 +341,11 @@ def plan_install_pkg_names(A, reinstall=False):
if packagedb.has_package(dep):
Bp.add(dep)
G_f.add_package(dep)
if ctx.config.values.general.allow_devel:
dep = x + ctx.const.devel_package_end
if packagedb.has_package(dep):
Bp.add(dep)
G_f.add_package(dep)
if ctx.config.values.general.allow_dbginfo:
dep = x + ctx.const.debug_name_suffix
if packagedb.has_package(dep):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment