darktemplar/apt
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Apply apt-0.5.15cnc6-alt-rpm-fancypercent.patch

Browse Source 
Added in commit 3212342:
0.5.5cnc1-alt3

- Introduced APT::Ignore-dpkg support and set this flag by default,
  to address #0002119.
This commit is contained in:
Gleb Fotengauer-Malinovskiy 2014-05-16 21:04:20 +04:00
parent 9c683e8cd3
commit 7be75b2c02
2 changed files with 39 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
apt-0.5.15cnc6-alt-rpm-fancypercent.patch
View File

@ -1,130 +0,0 @@
2004-01-16 Dmitry V. Levin <ldv@altlinux.org>
* apt-pkg/rpm/rpmpm.cc(pkgRPMPM::ExecRPM,pkgRPMLibPM::Process):
Honor "quiet" config option.
Pass "fancypercent" option.
--- apt-0.5.15cnc5/apt-pkg/rpm/rpmpm.cc.orig 2004-05-11 15:08:07 +0400
+++ apt-0.5.15cnc5/apt-pkg/rpm/rpmpm.cc 2004-05-11 15:19:12 +0400
@@ -390,6 +390,7 @@
const char *operation;
unsigned int n = 0;
bool Interactive = _config->FindB("RPM::Interactive",true);
+ int quiet = _config->FindI("quiet",0);
Args[n++] = _config->Find("Dir::Bin::rpm","rpm").c_str();
@@ -398,18 +399,12 @@
switch (op)
{
case Item::RPMInstall:
- if (Interactive)
- operation = "-ivh";
- else
- operation = "-iv";
+ operation = "-i";
nodeps = true;
break;
case Item::RPMUpgrade:
- if (Interactive)
- operation = "-Uvh";
- else
- operation = "-Uv";
+ operation = "-U";
break;
case Item::RPMErase:
@@ -421,8 +416,22 @@
}
Args[n++] = operation;
- if (Interactive == false && op != Item::RPMErase)
- Args[n++] = "--percent";
+ if (quiet <= 2 && op != Item::RPMErase)
+ {
+ Args[n++] = "-v";
+ if (quiet <= 1)
+ {
+ if (Interactive)
+ {
+ Args[n++] = "-h";
+ if (quiet <= 0)
+ Args[n++] = "--fancypercent";
+ } else
+ {
+ Args[n++] = "--percent";
+ }
+ }
+ }
string rootdir = _config->Find("RPM::RootDir", "");
if (!rootdir.empty())
@@ -551,6 +560,7 @@
return true;
}
+ if (quiet <= 2)
cout << _("Executing RPM (")<<cmd<<")..." << endl;
cout << flush;
@@ -631,7 +641,7 @@
return _error->Error(_("Sub-process %s exited unexpectedly"),Args[0]);
}
- if (Interactive == true)
+ if (quiet <= 2)
cout << _("Done.") << endl;
return true;
@@ -749,6 +759,7 @@
bool Success = false;
bool Interactive = _config->FindB("RPM::Interactive",true);
string Dir = _config->Find("RPM::RootDir");
+ int quiet = _config->FindI("quiet",0);
rpmReadConfigFiles(NULL, NULL);
int probFilter = 0;
@@ -795,10 +806,21 @@
probFilter |= RPMPROB_FILTER_REPLACENEWFILES;
}
- if (Interactive == true)
- notifyFlags |= INSTALL_LABEL | INSTALL_HASH;
- else
- notifyFlags |= INSTALL_LABEL | INSTALL_PERCENT;
+ if (quiet <= 2)
+ notifyFlags |= INSTALL_LABEL;
+
+ if (quiet <= 1)
+ {
+ if (Interactive == true)
+ {
+ notifyFlags |= INSTALL_HASH;
+ extern int fancyPercents;
+ fancyPercents = (quiet <= 0) ? 1 : 0;
+ } else
+ {
+ notifyFlags |= INSTALL_PERCENT;
+ }
+ }
if (uninstall.empty() == false)
AddToTransaction(Item::RPMErase, uninstall);
@@ -854,6 +877,7 @@
goto exit;
}
+ if (quiet <= 2)
cout << _("Committing changes...") << endl << flush;
#if RPM_VERSION >= 0x040100
@@ -877,7 +901,7 @@
Success = true;
if (rc < 0)
_error->Warning(_("Some errors occurred while running transaction"));
- else if (Interactive == true)
+ else if (quiet <= 2)
cout << _("Done.") << endl;
}
rpmpsFree(probs);

55
apt/apt-pkg/rpm/rpmpm.cc
View File

@ -407,6 +407,7 @@ bool pkgRPMExtPM::ExecRPM(Item::RPMOps op, vector<const char*> &files)
const char *operation; const char *operation;
unsigned int n = 0; unsigned int n = 0;
bool Interactive = _config->FindB("RPM::Interactive",true); bool Interactive = _config->FindB("RPM::Interactive",true);
int quiet = _config->FindI("quiet",0);
Args[n++] = _config->Find("Dir::Bin::rpm","rpm").c_str(); Args[n++] = _config->Find("Dir::Bin::rpm","rpm").c_str();
@ -415,18 +416,12 @@ bool pkgRPMExtPM::ExecRPM(Item::RPMOps op, vector<const char*> &files)
switch (op) switch (op)
{ {
case Item::RPMInstall: case Item::RPMInstall:
if (Interactive) operation = "-i";
operation = "-ivh";
else
operation = "-iv";
nodeps = true; nodeps = true;
break; break;
case Item::RPMUpgrade: case Item::RPMUpgrade:
if (Interactive) operation = "-U";
operation = "-Uvh";
else
operation = "-Uv";
break; break;
case Item::RPMErase: case Item::RPMErase:
@ -438,8 +433,22 @@ bool pkgRPMExtPM::ExecRPM(Item::RPMOps op, vector<const char*> &files)
} }
Args[n++] = operation; Args[n++] = operation;
if (Interactive == false && op != Item::RPMErase) if (quiet <= 2 && op != Item::RPMErase)
Args[n++] = "--percent"; {
Args[n++] = "-v";
if (quiet <= 1)
{
if (Interactive)
{
Args[n++] = "-h";
if (quiet <= 0)
Args[n++] = "--fancypercent";
} else
{
Args[n++] = "--percent";
}
}
}
string rootdir = _config->Find("RPM::RootDir", ""); string rootdir = _config->Find("RPM::RootDir", "");
if (!rootdir.empty()) if (!rootdir.empty())
@ -568,6 +577,7 @@ bool pkgRPMExtPM::ExecRPM(Item::RPMOps op, vector<const char*> &files)
return true; return true;
} }
if (quiet <= 2)
cout << _("Executing RPM (")<<cmd<<")..." << endl; cout << _("Executing RPM (")<<cmd<<")..." << endl;
cout << flush; cout << flush;
@ -648,7 +658,7 @@ bool pkgRPMExtPM::ExecRPM(Item::RPMOps op, vector<const char*> &files)
return _error->Error(_("Sub-process %s exited unexpectedly"),Args[0]); return _error->Error(_("Sub-process %s exited unexpectedly"),Args[0]);
} }
if (Interactive == true) if (quiet <= 2)
cout << _("Done.") << endl; cout << _("Done.") << endl;
return true; return true;
@ -766,6 +776,7 @@ bool pkgRPMLibPM::Process(vector<const char*> &install,
bool Success = false; bool Success = false;
bool Interactive = _config->FindB("RPM::Interactive",true); bool Interactive = _config->FindB("RPM::Interactive",true);
string Dir = _config->Find("RPM::RootDir"); string Dir = _config->Find("RPM::RootDir");
int quiet = _config->FindI("quiet",0);
rpmReadConfigFiles(NULL, NULL); rpmReadConfigFiles(NULL, NULL);
int probFilter = 0; int probFilter = 0;
@ -828,10 +839,21 @@ bool pkgRPMLibPM::Process(vector<const char*> &install,
probFilter |= RPMPROB_FILTER_REPLACENEWFILES; probFilter |= RPMPROB_FILTER_REPLACENEWFILES;
} }
if (Interactive == true) if (quiet <= 2)
notifyFlags |= INSTALL_LABEL | INSTALL_HASH; notifyFlags |= INSTALL_LABEL;
else
notifyFlags |= INSTALL_LABEL | INSTALL_PERCENT; if (quiet <= 1)
{
if (Interactive == true)
{
notifyFlags |= INSTALL_HASH;
extern int fancyPercents;
fancyPercents = (quiet <= 0) ? 1 : 0;
} else
{
notifyFlags |= INSTALL_PERCENT;
}
}
if (uninstall.empty() == false) if (uninstall.empty() == false)
AddToTransaction(Item::RPMErase, uninstall); AddToTransaction(Item::RPMErase, uninstall);
@ -887,6 +909,7 @@ bool pkgRPMLibPM::Process(vector<const char*> &install,
goto exit; goto exit;
} }
if (quiet <= 2)
cout << _("Committing changes...") << endl << flush; cout << _("Committing changes...") << endl << flush;
#if RPM_VERSION >= 0x040100 #if RPM_VERSION >= 0x040100
@ -910,7 +933,7 @@ bool pkgRPMLibPM::Process(vector<const char*> &install,
Success = true; Success = true;
if (rc < 0) if (rc < 0)
_error->Warning(_("Some errors occurred while running transaction")); _error->Warning(_("Some errors occurred while running transaction"));
else if (Interactive == true) else if (quiet <= 2)
cout << _("Done.") << endl; cout << _("Done.") << endl;
} }
rpmpsFree(probs); rpmpsFree(probs);