author | andyq <andyq> | 2003-01-18 12:40:22 (UTC) |
---|---|---|
committer | andyq <andyq> | 2003-01-18 12:40:22 (UTC) |
commit | 2ad938f8470eb460ea5dae6ca3844c4dcc6cd991 (patch) (unidiff) | |
tree | 52235c5f9f4ecc469b1d0ae57f1482e1cf2c475a | |
parent | 1c9b38eaee495c13d5d3fcbd818965339cc6d0ce (diff) | |
download | opie-2ad938f8470eb460ea5dae6ca3844c4dcc6cd991.zip opie-2ad938f8470eb460ea5dae6ca3844c4dcc6cd991.tar.gz opie-2ad938f8470eb460ea5dae6ca3844c4dcc6cd991.tar.bz2 |
Fixed relinking of files when upgrade selected (now removes old links first and recreates them after), also cut down on spurious failed to link errors on linking
-rw-r--r-- | noncore/settings/aqpkg/ipkg.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp index 29bf40d..51eca8b 100644 --- a/noncore/settings/aqpkg/ipkg.cpp +++ b/noncore/settings/aqpkg/ipkg.cpp | |||
@@ -110,47 +110,47 @@ bool Ipkg :: runIpkg( ) | |||
110 | commands << "install"; | 110 | commands << "install"; |
111 | else | 111 | else |
112 | commands << option; | 112 | commands << option; |
113 | if ( package != "" ) | 113 | if ( package != "" ) |
114 | commands << package; | 114 | commands << package; |
115 | 115 | ||
116 | 116 | ||
117 | if ( package != "" ) | 117 | if ( package != "" ) |
118 | emit outputText( QString( "Dealing with package " ) + package ); | 118 | emit outputText( QString( "Dealing with package " ) + package ); |
119 | 119 | ||
120 | qApp->processEvents(); | 120 | qApp->processEvents(); |
121 | 121 | ||
122 | // If we are removing packages and make links option is selected | 122 | // If we are removing, reinstalling or upgrading packages and make links option is selected |
123 | // create the links | 123 | // create the links |
124 | if ( option == "remove" || option == "reinstall" ) | 124 | if ( option == "remove" || option == "reinstall" || option == "upgrade" ) |
125 | { | 125 | { |
126 | createLinks = false; | 126 | createLinks = false; |
127 | if ( flags & MAKE_LINKS ) | 127 | if ( flags & MAKE_LINKS ) |
128 | { | 128 | { |
129 | emit outputText( QString( "Removing symbolic links...\n" ) ); | 129 | emit outputText( QString( "Removing symbolic links...\n" ) ); |
130 | linkPackage( Utils::getPackageNameFromIpkFilename( package ), destination, destDir ); | 130 | linkPackage( Utils::getPackageNameFromIpkFilename( package ), destination, destDir ); |
131 | emit outputText( QString( " " ) ); | 131 | emit outputText( QString( " " ) ); |
132 | } | 132 | } |
133 | } | 133 | } |
134 | 134 | ||
135 | // Execute command | 135 | // Execute command |
136 | dependantPackages = new QList<QString>; | 136 | dependantPackages = new QList<QString>; |
137 | dependantPackages->setAutoDelete( true ); | 137 | dependantPackages->setAutoDelete( true ); |
138 | 138 | ||
139 | ret = executeIpkgCommand( commands, option ); | 139 | ret = executeIpkgCommand( commands, option ); |
140 | 140 | ||
141 | if ( aborted ) | 141 | if ( aborted ) |
142 | return false; | 142 | return false; |
143 | 143 | ||
144 | if ( option == "install" || option == "reinstall" ) | 144 | if ( option == "install" || option == "reinstall" || option == "upgrade" ) |
145 | { | 145 | { |
146 | // If we are not removing packages and make links option is selected | 146 | // If we are not removing packages and make links option is selected |
147 | // create the links | 147 | // create the links |
148 | createLinks = true; | 148 | createLinks = true; |
149 | if ( flags & MAKE_LINKS ) | 149 | if ( flags & MAKE_LINKS ) |
150 | { | 150 | { |
151 | emit outputText( " " ); | 151 | emit outputText( " " ); |
152 | emit outputText( QString( "Creating symbolic links for " )+ package ); | 152 | emit outputText( QString( "Creating symbolic links for " )+ package ); |
153 | 153 | ||
154 | linkPackage( Utils::getPackageNameFromIpkFilename( package ), destination, destDir ); | 154 | linkPackage( Utils::getPackageNameFromIpkFilename( package ), destination, destDir ); |
155 | 155 | ||
156 | // link dependant packages that were installed with this release | 156 | // link dependant packages that were installed with this release |
@@ -513,26 +513,26 @@ void Ipkg :: processLinkDir( const QString &file, const QString &destDir, const | |||
513 | { | 513 | { |
514 | // If this file is a directory (ends with a /) and it doesn't exist, | 514 | // If this file is a directory (ends with a /) and it doesn't exist, |
515 | // we need to create it | 515 | // we need to create it |
516 | if ( file.right(1) == "/" ) | 516 | if ( file.right(1) == "/" ) |
517 | { | 517 | { |
518 | QFileInfo f( linkFile ); | 518 | QFileInfo f( linkFile ); |
519 | if ( !f.exists() ) | 519 | if ( !f.exists() ) |
520 | { | 520 | { |
521 | emit outputText( QString( "Creating directory " ) + linkFile ); | 521 | emit outputText( QString( "Creating directory " ) + linkFile ); |
522 | QDir d; | 522 | QDir d; |
523 | d.mkdir( linkFile, true ); | 523 | d.mkdir( linkFile, true ); |
524 | } | 524 | } |
525 | else | 525 | // else |
526 | emit outputText( QString( "Directory " ) + linkFile + " already exists" ); | 526 | // emit outputText( QString( "Directory " ) + linkFile + " already exists" ); |
527 | 527 | ||
528 | } | 528 | } |
529 | else | 529 | else |
530 | { | 530 | { |
531 | int rc = symlink( sourceFile, linkFile ); | 531 | int rc = symlink( sourceFile, linkFile ); |
532 | text = (rc == 0 ? "Linked " : "Failed to link "); | 532 | text = (rc == 0 ? "Linked " : "Failed to link "); |
533 | text += sourceFile + " to " + linkFile; | 533 | text += sourceFile + " to " + linkFile; |
534 | emit outputText( text ); | 534 | emit outputText( text ); |
535 | } | 535 | } |
536 | } | 536 | } |
537 | else | 537 | else |
538 | { | 538 | { |
@@ -543,20 +543,23 @@ void Ipkg :: processLinkDir( const QString &file, const QString &destDir, const | |||
543 | { | 543 | { |
544 | QFile f( linkFile ); | 544 | QFile f( linkFile ); |
545 | bool rc = f.remove(); | 545 | bool rc = f.remove(); |
546 | 546 | ||
547 | text = (rc ? "Removed " : "Failed to remove "); | 547 | text = (rc ? "Removed " : "Failed to remove "); |
548 | text += linkFile; | 548 | text += linkFile; |
549 | emit outputText( text ); | 549 | emit outputText( text ); |
550 | } | 550 | } |
551 | else if ( f.isDir() ) | 551 | else if ( f.isDir() ) |
552 | { | 552 | { |
553 | QDir d; | 553 | QDir d; |
554 | bool rc = d.rmdir( linkFile, true ); | 554 | bool rc = d.rmdir( linkFile, true ); |
555 | if ( rc ) | ||
556 | { | ||
555 | text = (rc ? "Removed " : "Failed to remove "); | 557 | text = (rc ? "Removed " : "Failed to remove "); |
556 | text += linkFile; | 558 | text += linkFile; |
557 | emit outputText( text ); | 559 | emit outputText( text ); |
558 | } | 560 | } |
559 | } | 561 | } |
560 | } | 562 | } |
563 | } | ||
561 | 564 | ||
562 | } | 565 | } |