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

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

Browse Source 
Added in commit 6e5c25c:
0.5.15cnc6-alt1

- Updated to 0.5.15cnc6
- New:
  + apt-0.5.15cnc6-alt-rpm-order (fix RPM::Order default value)
- Updated:
  + apt-0.5.15cnc6-alt-fixes
  + apt-0.5.15cnc6-alt-defaults
  + apt-0.5.15cnc6-alt-rpm-fancypercent
  + apt-0.5.15cnc6-alt-virtual_scores
- Merged upstream:
  + apt-0.5.15cnc6-alt-install_virtual
This commit is contained in:
Gleb Fotengauer-Malinovskiy 2014-05-16 21:04:21 +04:00
parent 763307181d
commit 01b39aea26
2 changed files with 3 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
apt-0.5.15cnc6-alt-rpm-order.patch
View File

@ -1,25 +0,0 @@
diff -upr apt-0.5.15cnc6.orig/apt-pkg/rpm/rpmpm.cc apt-0.5.15cnc6/apt-pkg/rpm/rpmpm.cc
--- apt-0.5.15cnc6/apt-pkg/rpm/rpmpm.cc.orig 2004-05-11 18:13:51 +0400
+++ apt-0.5.15cnc6/apt-pkg/rpm/rpmpm.cc 2004-05-13 16:06:47 +0400
@@ -496,7 +496,7 @@ bool pkgRPMExtPM::ExecRPM(Item::RPMOps o
}
}
- if (_config->FindB("RPM::Order", false) == false)
+ if (_config->FindB("RPM::Order", true) == false)
Args[n++] = "--noorder";
bool FilesInArgs = true;
@@ -864,10 +864,10 @@
rc = 0;
#if RPM_VERSION >= 0x040100
- if (_config->FindB("RPM::Order", false) == true)
+ if (_config->FindB("RPM::Order", true) == true)
rc = rpmtsOrder(TS);
#else
- if (_config->FindB("RPM::Order", false) == true)
+ if (_config->FindB("RPM::Order", true) == true)
rc = rpmdepOrder(TS);
#endif

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

@ -522,7 +522,7 @@ bool pkgRPMExtPM::ExecRPM(Item::RPMOps op, vector<const char*> &files)
}
}
if (_config->FindB("RPM::Order", false) == false)
if (_config->FindB("RPM::Order", true) == false)
Args[n++] = "--noorder";
string cmd;
@ -897,10 +897,10 @@ bool pkgRPMLibPM::Process(vector<const char*> &install,
rc = 0;
#if RPM_VERSION >= 0x040100
if (_config->FindB("RPM::Order", false) == true)
if (_config->FindB("RPM::Order", true) == true)
rc = rpmtsOrder(TS);
#else
if (_config->FindB("RPM::Order", false) == true)
if (_config->FindB("RPM::Order", true) == true)
rc = rpmdepOrder(TS);
#endif